Merge pull request #6276 from NHSDigital/hide-archived-from-invite-to-clinic

Hide archived from invite to clinic

Author: thomasleese

app/controllers/schools/invite_to_clinic_controller.rb

@@ -4,7 +4,7 @@ class Schools::InviteToClinicController < Schools::BaseController
   before_action :check_can_send_clinic_invitations
   before_action :set_back_link_path
   before_action :set_programme_statuses
-  before_action :set_eligible_patients_not_vaccinated
+  before_action :set_patients_to_invite
   before_action :set_invitations_count_by_programme_type
 
   layout "two_thirds"
@@ -22,7 +22,7 @@ def update
 
     if @form.valid?
       clinic_notifcations =
-        @eligible_patients_not_vaccinated.filter_map do |patient|
+        @patients_to_invite.filter_map do |patient|
           patient.notifier.send_clinic_invitation(
             Programme.find_all(@form.programme_types),
             team: current_team,
@@ -60,8 +60,8 @@ def set_programme_statuses
         Patient::ProgrammeStatus::VACCINATED_STATUSES.keys
   end
 
-  def set_eligible_patients_not_vaccinated
-    @eligible_patients_not_vaccinated =
+  def set_patients_to_invite
+    @patients_to_invite =
       Patient
         .joins(:patient_locations)
         .where(
@@ -71,6 +71,7 @@ def set_eligible_patients_not_vaccinated
           }
         )
         .where(school_id: @location.school_id)
+        .not_archived(team: current_team)
         .includes_statuses
         .has_programme_status(
           @programme_statuses,
@@ -82,7 +83,7 @@ def set_eligible_patients_not_vaccinated
   def set_invitations_count_by_programme_type
     @invitations_count_by_programme_type =
       current_team.programmes.index_with do |programme|
-        @eligible_patients_not_vaccinated
+        @patients_to_invite
           .includes(:clinic_notifications)
           .has_programme_status(
             @programme_statuses,

app/views/schools/invite_to_clinic/edit.html.erb

@@ -12,7 +12,7 @@
 
   <p><%= link_to "Return to school", school_patients_path(Location::URN_UNKNOWN) %></p>
 <% else %>
-  <p><%= I18n.t("children_be", count: @eligible_patients_not_vaccinated.count) %> due a vaccination for at least 1 programme.</p>
+  <p><%= I18n.t("children_be", count: @patients_to_invite.count) %> due a vaccination for at least 1 programme.</p>
 
   <p>You can now send clinic booking invitations to their parents.</p>
 

spec/features/schools_spec.rb

@@ -172,6 +172,8 @@ def given_a_team_with_no_known_school_children
       end
 
     # We create these to ensure these children aren't invited.
+
+    # No parent contact details
     create(
       :patient,
       :consent_no_response,
@@ -181,6 +183,8 @@ def given_a_team_with_no_known_school_children
       location: @generic_clinic,
       academic_year: AcademicYear.pending
     )
+
+    # Refused consent
     create(
       :patient,
       :consent_refused,
@@ -190,6 +194,8 @@ def given_a_team_with_no_known_school_children
       location: @generic_clinic,
       academic_year: AcademicYear.pending
     )
+
+    # Conflicting consent
     create(
       :patient,
       :consent_conflicting,
@@ -200,6 +206,19 @@ def given_a_team_with_no_known_school_children
       academic_year: AcademicYear.pending
     )
 
+    # Archived
+    create(
+      :patient,
+      :consent_no_response,
+      :archived,
+      school: nil,
+      parents: [build(:parent)],
+      programmes:,
+      location: @generic_clinic,
+      academic_year: AcademicYear.pending,
+      team: @team
+    )
+
     @nurse = create(:nurse, team: @team)
   end