Merge pull request #6577 from NHSDigital/fix-consent-status-after-session-add

Handle past consent request dates for active sessions

Author: jhenderson

app/lib/status_generator/consent.rb

@@ -177,16 +177,23 @@ def parents_contactable? = parents.any?(&:contactable?)
 
   def status_should_be_request_scheduled?
     parents_contactable? && consent_notifications.empty? &&
-      sessions.any? do
-        # Not using send_consent_requests_at.future?
-        # because it doesn't work with Timecop.
-        it.send_consent_requests_at &&
-          it.send_consent_requests_at > Time.current
-      end
+      sessions.any? { consent_request_scheduled_in_future?(it) }
   end
 
   def status_should_be_request_not_scheduled?
     parents_contactable? && consent_notifications.empty? &&
-      (sessions.empty? || sessions.any? { it.send_consent_requests_at.nil? })
+      (sessions.empty? || sessions.any? { consent_request_not_scheduled?(it) })
+  end
+
+  def consent_request_scheduled_in_future?(session)
+    send_at = session.send_consent_requests_at
+
+    # Not using future? because it doesn't work with Timecop
+    send_at.present? && send_at > Time.current
+  end
+
+  def consent_request_not_scheduled?(session)
+    send_at = session.send_consent_requests_at
+    send_at.nil? || send_at < Time.current
   end
 end

spec/components/app_patient_session_consent_component_spec.rb

@@ -15,7 +15,7 @@
     it { should_not have_content(/Consent (given|refused)/) }
     it { should_not have_css("details", text: /Consent (given|refused) by/) }
     it { should_not have_css("details", text: "Responses to health questions") }
-    it { should have_css("p", text: "No requests have been sent.") }
+    it { should have_css("p", text: "No consent request is scheduled") }
     it { should have_css("button", text: "Record a new consent response") }
 
     context "when session is not in progress" do

spec/features/invalidate_consent_spec.rb

@@ -159,7 +159,7 @@ def when_i_click_back
   end
 
   def and_i_am_not_able_to_record_a_vaccination
-    expect(page).to have_content("No response")
+    expect(page).to have_content("Request not scheduled")
     expect(page).not_to have_content("ready for their HPV vaccination?")
   end
 

spec/features/vaccination_programmes_spec.rb

@@ -110,7 +110,10 @@ def and_the_table_shows_other_eligible_vaccinations
         "td.nhsuk-table__cell",
         text: "Needs consent"
       )
-      expect(row).to have_selector("td.nhsuk-table__cell", text: "No response")
+      expect(row).to have_selector(
+        "td.nhsuk-table__cell",
+        text: "Request not scheduled"
+      )
     end
 
     expect(page).to have_selector(
@@ -121,7 +124,10 @@ def and_the_table_shows_other_eligible_vaccinations
         "td.nhsuk-table__cell",
         text: "Needs consent"
       )
-      expect(row).to have_selector("td.nhsuk-table__cell", text: "No response")
+      expect(row).to have_selector(
+        "td.nhsuk-table__cell",
+        text: "Request not scheduled"
+      )
     end
   end
 

spec/lib/patient_programme_status_resolver_spec.rb

@@ -125,7 +125,7 @@
             prefix: "MMR",
             text: "Needs consent",
             colour: "blue",
-            details_text: "No response"
+            details_text: "Request not scheduled"
           }
         )
       end

spec/lib/status_generator/consent_spec.rb

@@ -48,6 +48,12 @@
       context "with consent requests not scheduled" do
         it { should be(:request_not_scheduled) }
       end
+
+      context "when consent requests scheduled date has already passed" do
+        let(:send_consent_requests_at) { 1.day.ago.to_date }
+
+        it { should be(:request_not_scheduled) }
+      end
     end
 
     context "with no contactable parents" do