Merge pull request #5239 from nhsuk/improved_patient_archived_check

MAV-2633: Replace (not_)arcived check with patient_teams check

Author: TheOneFromNorway

app/models/patient.rb

@@ -96,15 +96,6 @@ class Patient < ApplicationRecord
   # https://www.datadictionary.nhs.uk/attributes/person_gender_code.html
   enum :gender_code, { not_known: 0, male: 1, female: 2, not_specified: 9 }
 
-  scope :joins_archive_reasons,
-        ->(team:) do
-          joins(
-            "LEFT OUTER JOIN archive_reasons " \
-              "ON archive_reasons.patient_id = patients.id " \
-              "AND archive_reasons.team_id = #{team.id}"
-          )
-        end
-
   scope :joins_sessions, -> { joins(:patient_locations).joins(<<-SQL) }
     INNER JOIN sessions
     ON sessions.location_id = patient_locations.location_id
@@ -122,12 +113,26 @@ class Patient < ApplicationRecord
 
   scope :archived,
         ->(team:) do
-          joins_archive_reasons(team:).where("archive_reasons.id IS NOT NULL")
+          joins(:patient_teams).where(
+            patient_teams: {
+              team_id: team.id
+            }
+          ).where(
+            "patient_teams.sources @> ARRAY[?]::integer[]",
+            PatientTeam.sources.fetch("archive_reason")
+          )
         end
 
   scope :not_archived,
         ->(team:) do
-          joins_archive_reasons(team:).where("archive_reasons.id IS NULL")
+          joins(:patient_teams).where(
+            patient_teams: {
+              team_id: team.id
+            }
+          ).where(
+            "NOT patient_teams.sources @> ARRAY[?]::integer[]",
+            PatientTeam.sources.fetch("archive_reason")
+          )
         end
 
   scope :with_pending_changes_for_team,

spec/factories/patient_teams.rb

@@ -22,8 +22,33 @@
 #
 FactoryBot.define do
   factory :patient_team do
+    # Required associations – these will be created automatically if not overridden
     patient
     team
     sources { %i[patient_location] }
+
+    trait :patient_location do
+      sources { %i[patient_location] }
+    end
+
+    trait :archive_reason do
+      sources { %i[archive_reason] }
+    end
+
+    trait :vaccination_record_session do
+      sources { %i[vaccination_record_session] }
+    end
+
+    trait :vaccination_record_organisation do
+      sources { %i[vaccination_record_organisation] }
+    end
+
+    trait :school_move_team do
+      sources { %i[school_move_team] }
+    end
+
+    trait :school_move_school do
+      sources { %i[school_move_school] }
+    end
   end
 end

spec/models/patient_spec.rb

@@ -77,17 +77,22 @@
       let(:team) { create(:team) }
 
       context "without an archive reason" do
+        before { create(:patient_team, team:, patient:) }
+
         it { should_not include(patient) }
       end
 
       context "with an archive reason for the team" do
-        before { create(:archive_reason, :moved_out_of_area, team:, patient:) }
+        before { create(:patient_team, :archive_reason, team:, patient:) }
 
         it { should include(patient) }
       end
 
       context "with an archive reason for a different team" do
-        before { create(:archive_reason, :imported_in_error, patient:) }
+        before do
+          create(:patient_team, team:, patient:)
+          create(:patient_team, :archive_reason, team: create(:team), patient:)
+        end
 
         it { should_not include(patient) }
       end
@@ -100,17 +105,22 @@
       let(:team) { create(:team) }
 
       context "without an archive reason" do
+        before { create(:patient_team, team:, patient:) }
+
         it { should include(patient) }
       end
 
       context "with an archive reason for the team" do
-        before { create(:archive_reason, :moved_out_of_area, team:, patient:) }
+        before { create(:patient_team, :archive_reason, team:, patient:) }
 
         it { should_not include(patient) }
       end
 
       context "with an archive reason for a different team" do
-        before { create(:archive_reason, :imported_in_error, patient:) }
+        before do
+          create(:patient_team, team:, patient:)
+          create(:patient_team, :archive_reason, team: create(:team), patient:)
+        end
 
         it { should include(patient) }
       end
@@ -122,6 +132,8 @@
       let(:team) { create(:team) }
       let(:patient) { create(:patient) }
 
+      before { create(:patient_team, team:, patient:) }
+
       context "without pending changes" do
         it { should_not include(patient) }
       end