Stop using requestable state

We're going to remove this field as it's no longer necessary so we need
to first stop using it.

app/controllers/personas_controller.rb

@@ -8,11 +8,6 @@ class PersonasController < ApplicationController
 
   def index
     @staff = Staff.all
-
-    @reference_requests =
-      ReferenceRequest.states.values.filter_map do |state|
-        ReferenceRequest.find_by(state:)
-      end
   end
 
   def eligible_sign_in

app/controllers/teacher_interface/reference_requests_controller.rb

@@ -16,7 +16,7 @@ def show
       @reference_request =
         ReferenceRequest
           .joins(:application_form)
-          .received
+          .where.not(received_at: nil)
           .or(ReferenceRequest.respondable)
           .includes(:work_history, :application_form)
           .find_by!(slug: params[:slug])

app/jobs/expire_requestable_job.rb

@@ -2,8 +2,12 @@
 
 class ExpireRequestableJob < ApplicationJob
   def perform(requestable)
-    if requestable.requested? && requestable.expires_at.present? &&
-         Time.zone.now > requestable.expires_at
+    if requestable.received? || requestable.expired? ||
+         !requestable.requested? || requestable.expires_at.nil?
+      return
+    end
+
+    if Time.zone.now > requestable.expires_at
       ExpireRequestable.call(requestable:, user: "Expirer")
     end
   end

app/jobs/expire_requestables_job.rb

@@ -2,8 +2,12 @@
 
 class ExpireRequestablesJob < ApplicationJob
   def perform(requestable_class_name)
-    requestable_class_name.constantize.requested.find_each do |requestable|
-      ExpireRequestableJob.perform_later(requestable)
-    end
+    requestable_class_name
+      .constantize
+      .where(expired_at: nil, received_at: nil)
+      .where.not(requested_at: nil)
+      .find_each do |requestable|
+        ExpireRequestableJob.perform_later(requestable)
+      end
   end
 end

app/lib/application_form_status_updater.rb

@@ -266,7 +266,7 @@ def overdue?(requestables:)
   end
 
   def waiting_on?(requestables:)
-    requestables.reject(&:reviewed?).any?(&:requested?)
+    requestables.reject(&:reviewed?).reject(&:received?).any?(&:requested?)
   end
 
   def received?(requestables:)

app/models/concerns/expirable.rb

@@ -9,6 +9,14 @@ def expires_at
     requested_at + expires_after
   end
 
+  def expired!
+    update!(expired_at: Time.zone.now)
+  end
+
+  def expired?
+    expired_at != nil
+  end
+
   def after_expired(user:)
     # implement logic after an expiration of this object
   end

app/models/concerns/requestable.rb

@@ -8,32 +8,28 @@ module Requestable
   included do
     belongs_to :assessment
 
-    enum :state,
-         { requested: "requested", received: "received", expired: "expired" },
-         default: "requested"
-
-    validates :state, presence: true, inclusion: { in: states.values }
-
-    validates :requested_at, presence: true, if: :requested?
-    validates :received_at, presence: true, if: :received?
-    validates :expired_at, presence: true, if: :expired?
     validates :reviewed_at, presence: true, unless: -> { passed.nil? }
 
-    scope :respondable, -> { not_received.merge(ApplicationForm.assessable) }
+    scope :respondable,
+          -> { where(received_at: nil).merge(ApplicationForm.assessable) }
 
-    define_method :requested! do
-      update!(state: "requested", requested_at: Time.zone.now)
-    end
+    has_one :application_form, through: :assessment
+  end
 
-    define_method :received! do
-      update!(state: "received", received_at: Time.zone.now)
-    end
+  def requested!
+    update!(requested_at: Time.zone.now)
+  end
 
-    define_method :expired! do
-      update!(state: "expired", expired_at: Time.zone.now)
-    end
+  def requested?
+    requested_at != nil
+  end
 
-    has_one :application_form, through: :assessment
+  def received!
+    update!(received_at: Time.zone.now)
+  end
+
+  def received?
+    received_at != nil
   end
 
   def reviewed!(passed)
@@ -44,19 +40,23 @@ def reviewed?
     passed != nil
   end
 
-  def overdue?
-    expired? || (received? && expires_at.present? && received_at > expires_at)
-  end
-
   def failed
     return nil if passed.nil?
     passed == false
   end
 
   def status
-    return state if passed.nil?
-
-    passed ? "accepted" : "rejected"
+    if reviewed_at.present?
+      passed ? "accepted" : "rejected"
+    elsif received_at.present?
+      "received"
+    elsif expired_at.present?
+      "overdue"
+    elsif requested_at.present?
+      "waiting_on"
+    else
+      "not_started"
+    end
   end
 
   def after_requested(user:)

app/models/further_information_request.rb

@@ -32,9 +32,9 @@ class FurtherInformationRequest < ApplicationRecord
 
   scope :remindable,
         -> do
-          requested.joins(assessment: :application_form).merge(
-            ApplicationForm.assessable,
-          )
+          where(received_at: nil, expired_at: nil).joins(
+            assessment: :application_form,
+          ).merge(ApplicationForm.assessable)
         end
 
   FOUR_WEEK_COUNTRY_CODES = %w[AU CA GI NZ US].freeze

app/models/reference_request.rb

@@ -58,9 +58,9 @@ class ReferenceRequest < ApplicationRecord
 
   scope :remindable,
         -> do
-          requested.joins(assessment: :application_form).merge(
-            ApplicationForm.assessable,
-          )
+          where(received_at: nil, expired_at: nil).joins(
+            assessment: :application_form,
+          ).merge(ApplicationForm.assessable)
         end
 
   with_options if: :received? do

app/services/expire_requestable.rb

@@ -9,7 +9,7 @@ def initialize(requestable:, user:)
   end
 
   def call
-    raise NotRequested unless requestable.requested?
+    raise NotRequested if requestable.requested_at.nil?
 
     ActiveRecord::Base.transaction do
       requestable.expired!

app/services/send_reminder_email.rb

@@ -19,7 +19,6 @@ def call
   attr_reader :remindable
 
   def send_reminder?
-    return false if remindable.try(:expired_at).present?
     return false unless remindable.expires_at
 
     remindable.should_send_reminder_email?(

app/view_objects/assessor_interface/further_information_request_view_object.rb

@@ -9,7 +9,7 @@ def further_information_request
     @further_information_request ||=
       FurtherInformationRequest
         .joins(assessment: :application_form)
-        .received
+        .where.not(received_at: nil)
         .where(
           assessment_id: params[:assessment_id],
           assessment: {

app/view_objects/teacher_interface/application_form_show_view_object.rb

@@ -119,6 +119,12 @@ def show_professional_standing_request_expired_content?
     professional_standing_request&.expired? || false
   end
 
+  def request_further_information?
+    further_information_request.present? &&
+      further_information_request.requested? &&
+      !further_information_request.received?
+  end
+
   def request_professional_standing_certificate?
     teaching_authority_provides_written_statement &&
       professional_standing_request&.requested? &&

app/view_objects/teacher_interface/further_information_request_view_object.rb

@@ -11,8 +11,7 @@ def further_information_request
       @further_information_request ||=
         FurtherInformationRequest
           .joins(:assessment)
-          .requested
-          .where(assessments: { application_form: })
+          .where(received_at: nil, assessments: { application_form: })
           .find(params[:id])
     end
 
@@ -74,7 +73,7 @@ def item_value(item)
         item.document
       elsif item.work_history_contact?
         "Contact name: #{item.contact_name}<br/>
-         Contact job: #{item.contact_job}<br/> 
+         Contact job: #{item.contact_job}<br/>
          Contact email: #{item.contact_email}".html_safe
       end
     end

app/views/personas/index.html.erb

@@ -147,37 +147,3 @@
     end %>
   <% end %>
 </section>
-
-<section id="app-personas-references" class="app-personas">
-  <h2 class="govuk-heading-l">References</h2>
-
-  <% if @reference_requests.empty? %>
-    <p class="govuk-body">No reference requests.</p>
-  <% else %>
-    <%= govuk_table do |table|
-      table.with_head do |head|
-        head.with_row do |row|
-          row.with_cell(header: true, text: "Teacher email")
-          row.with_cell(header: true, text: "State")
-          row.with_cell(header: true, text: "Actions", numeric: true)
-        end
-      end
-
-      table.with_body do |body|
-        @reference_requests.each do |reference_request|
-          body.with_row do |row|
-            row.with_cell(text: reference_request.application_form.teacher.email)
-
-            row.with_cell(width: "one-third") do
-              render(StatusTag::Component.new(status: reference_request.state))
-            end
-
-            row.with_cell(numeric: true) do
-              govuk_button_link_to "Sign&nbsp;in".html_safe, teacher_interface_reference_request_path(slug: reference_request.slug)
-            end
-          end
-        end
-      end
-    end %>
-  <% end %>
-</section>

app/views/teacher_interface/application_forms/show.html.erb

@@ -8,7 +8,7 @@
   <%= render "teacher_interface/application_forms/show/declined", view_object: @view_object %>
 <% elsif @view_object.application_form.awarded? %>
   <%= render "teacher_interface/application_forms/show/awarded", view_object: @view_object %>
-<% elsif @view_object.further_information_request&.requested? %>
+<% elsif @view_object.request_further_information? %>
   <%= render "teacher_interface/application_forms/show/further_information_requested", view_object: @view_object %>
 <% elsif @view_object.request_professional_standing_certificate? %>
   <%= render "teacher_interface/application_forms/show/request_professional_standing_certificate", view_object: @view_object %>

lib/tasks/example_data.rake

@@ -174,10 +174,9 @@ def create_application_forms
         end
       elsif (work_history = application_form.work_histories.first) &&
             rand(2).zero?
-        reference_request_trait = ReferenceRequest.states.keys.sample
         FactoryBot.create(
           :reference_request,
-          reference_request_trait,
+          %i[requested received expired].sample,
           assessment:,
           work_history:,
         )

spec/factories/further_information_requests.rb

@@ -27,34 +27,32 @@
   factory :further_information_request do
     association :assessment
 
-    requested
-
     trait :requested do
-      state { "requested" }
       requested_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 
     trait :received do
-      state { "received" }
       received_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 
     trait :expired do
-      state { "expired" }
       expired_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 
+    trait :reviewed do
+      received
+      reviewed_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
+    end
+
     trait :passed do
+      reviewed
       passed { true }
-      reviewed_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
-      received
     end
 
     trait :failed do
+      reviewed
       passed { false }
-      reviewed_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
       failure_assessor_note { "Notes." }
-      received
     end
 
     trait :with_items do

spec/factories/professional_standing_requests.rb

@@ -30,21 +30,16 @@
   factory :professional_standing_request do
     association :assessment
 
-    requested
-
     trait :requested do
-      state { "requested" }
       requested_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 
     trait :received do
-      state { "received" }
       received_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
       receivable
     end
 
     trait :expired do
-      state { "expired" }
       expired_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 

spec/factories/qualification_requests.rb

@@ -33,21 +33,16 @@
     association :assessment
     association :qualification, :completed
 
-    requested
-
     trait :requested do
-      state { "requested" }
       requested_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end
 
     trait :received do
-      state { "received" }
       received_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
       receivable
     end
 
     trait :expired do
-      state { "expired" }
       expired_at { Faker::Time.between(from: 1.month.ago, to: Time.zone.now) }
     end