Merge pull request #6402 from NHSDigital/enable_dismiss_important_notices_for_archived_patients

Enable dismiss important notices for archived patients

Author: CodeCorvin

app/models/concerns/patient_import_concern.rb

@@ -149,7 +149,8 @@ def school_move_does_not_move_patient?(school_move:, patient:)
   end
 
   def patient_archived_and_not_in_another_team?(patient:, team:)
-    patient.archived?(team:) && patient.teams.where.not(id: team.id).empty?
+    patient.archived?(team_id: team.id) &&
+      patient.teams.where.not(id: team.id).empty?
   end
 
   def reset_counts(import)

app/models/important_notice.rb

@@ -90,6 +90,7 @@ def message
   end
 
   def can_dismiss?
-    type.in?(%w[deceased restricted gillick_no_notify team_changed])
+    type.in?(%w[deceased restricted gillick_no_notify team_changed]) ||
+      patient.archived?(team_id:)
   end
 end

app/models/patient.rb

@@ -511,11 +511,11 @@ def sessions
       .distinct
   end
 
-  def archived?(team:)
+  def archived?(team_id:)
     if archive_reasons.loaded?
-      archive_reasons.any? { it.team_id == team.id }
+      archive_reasons.any? { it.team_id == team_id }
     else
-      archive_reasons.exists?(team:)
+      archive_reasons.exists?(team_id:)
     end
   end
 

app/models/patient_changeset.rb

@@ -277,7 +277,7 @@ def school_move
 
         if patient.new_record? || patient.school != school ||
              patient.not_in_team?(team:, academic_year:) ||
-             patient.archived?(team:) || patient.school_moves.any?
+             patient.archived?(team_id: team.id) || patient.school_moves.any?
           school_move =
             patient.school_moves.includes(:teams).first ||
               SchoolMove.new(patient:)

app/views/patients/_header.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= render AppActionListComponent.new do |action_list| %>
-  <% if @patient.archived?(team: current_team) && !current_team.has_national_reporting_access? %>
+  <% if @patient.archived?(team_id: current_team.id) && !current_team.has_national_reporting_access? %>
     <% action_list.with_item do %>
       <%= govuk_tag(text: "Archived", colour: "grey") %>
     <% end %>

spec/features/import_vaccination_records_national_reporting_spec.rb

@@ -270,12 +270,12 @@ def and_the_patients_should_now_be_associated_with_the_team
 
   def and_the_newly_created_patients_should_be_archived
     new_patient = Patient.find_by(nhs_number: "9999075320")
-    expect(new_patient.archived?(team: @team)).to be true
+    expect(new_patient.archived?(team_id: @team.id)).to be true
     expect(new_patient.archive_reasons.first.type).to eq "immunisation_import"
   end
 
   def and_the_existing_patients_should_not_be_archived
-    expect(@existing_patient.archived?(team: @team)).to be false
+    expect(@existing_patient.archived?(team_id: @team.id)).to be false
   end
 
   def and_the_vaccination_records_are_sent_to_the_imms_api

spec/features/import_vaccination_records_point_of_care_spec.rb

@@ -164,12 +164,12 @@ def and_the_patients_should_now_be_associated_with_the_team
 
   def and_the_newly_created_patients_should_be_archived
     new_patient = Patient.find_by(nhs_number: "7420180008")
-    expect(new_patient.archived?(team: @team)).to be true
+    expect(new_patient.archived?(team_id: @team.id)).to be true
     expect(new_patient.archive_reasons.first.type).to eq "immunisation_import"
   end
 
   def and_the_existing_patients_should_not_be_archived
-    expect(@existing_patient.archived?(team: @team)).to be false
+    expect(@existing_patient.archived?(team_id: @team.id)).to be false
   end
 
   def when_i_go_back

spec/lib/patient_merger_spec.rb

@@ -346,7 +346,7 @@
 
       it "removes the archive reasons from the patient" do
         expect { call }.to change(ArchiveReason, :count).by(-1)
-        expect(patient_to_keep.archived?(team:)).to be(false)
+        expect(patient_to_keep.archived?(team_id: team.id)).to be(false)
       end
     end
 
@@ -362,7 +362,7 @@
 
       it "removes the archive reason from the patient" do
         expect { call }.to change(ArchiveReason, :count).by(-1)
-        expect(patient_to_keep.archived?(team:)).to be(false)
+        expect(patient_to_keep.archived?(team_id: team.id)).to be(false)
       end
     end
 
@@ -405,7 +405,7 @@
 
       it "keeps the archive reason on the merged patient" do
         expect { call }.to change(ArchiveReason, :count).by(-1)
-        expect(patient_to_keep.archived?(team:)).to be(true)
+        expect(patient_to_keep.archived?(team_id: team.id)).to be(true)
       end
     end
 

spec/models/important_notice_spec.rb

@@ -88,4 +88,22 @@
       end
     end
   end
+
+  describe "#can_dismiss?" do
+    subject(:can_dismiss) { important_notice.can_dismiss? }
+
+    let(:important_notice) do
+      create(:important_notice, :invalidated, team_id: team.id, patient:)
+    end
+
+    context "important notices for invalidated patients cannot be dismissed" do
+      it { should be(false) }
+    end
+
+    context "important notices for invalidated patients can be dismissed when archived" do
+      before { create(:archive_reason, :moved_out_of_area, team:, patient:) }
+
+      it { should be(true) }
+    end
+  end
 end

spec/models/patient_spec.rb

@@ -730,7 +730,7 @@
     end
 
     context "without preloading" do
-      subject(:archived?) { patient.archived?(team:) }
+      subject(:archived?) { patient.archived?(team_id: team.id) }
 
       include_examples "archived? behavior"
     end
@@ -740,7 +740,7 @@
         described_class
           .includes(:archive_reasons)
           .find(patient.id)
-          .archived?(team:)
+          .archived?(team_id: team.id)
       end
 
       include_examples "archived? behavior"