Merge pull request #6010 from nhsuk/dismiss-important-notice-when-patient-moves-back-into-team-nil-school

Fix bugs with school moves across teams

Author: murugapl

app/components/app_import_review_school_moves_summary_component.html.erb

@@ -37,10 +37,11 @@
             <%= destination_school_name(changeset) %>
           </span>
           <% if school_move_across_teams?(changeset) %>
+            <% source_team = changeset.patient.teams_via_patient_locations.first %>
             <div class="nhsuk-u-margin-top-1">
               <%= render(
                     AppStatusComponent.new(
-                      text: "This child is moving in from #{changeset.patient.school.teams.first.name}'s area",
+                      text: "This child is moving in from #{source_team.name}'s area",
                       small: true,
                       classes: "nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-0",
                     )

app/components/app_import_review_school_moves_summary_component.rb

@@ -30,10 +30,13 @@ def destination_school(changeset)
   end
 
   def school_move_across_teams?(changeset)
-    patient = changeset.patient
     dest_school = destination_school(changeset)
 
-    dest_school && patient.school && patient.school.teams.any? &&
-      (dest_school.teams & patient.school.teams).empty?
+    current_teams = changeset.patient.teams_via_patient_locations
+    return false if current_teams.empty?
+
+    new_teams = dest_school&.teams || [changeset.import.team]
+
+    (new_teams & current_teams).empty?
   end
 end

app/components/app_patient_card_component.rb

@@ -92,15 +92,13 @@ def gillick_no_notify_notices
   end
 
   def team_changed_notices
-    return unless patient.school
-
     valid_notices =
       patient
         .important_notices
         .team_changed
         .includes(:school_move_log_entry)
         .where(team: current_team)
-        .where.not(team: patient.school.teams)
+        .where.not(team: patient.teams_via_patient_locations)
 
     valid_notices.map(&:message)
   end

app/jobs/important_notice_generator_job.rb

@@ -107,9 +107,13 @@ def collect_notices_for_patient(
 
       team_changed_notices = patient.important_notices.team_changed
       if team_changed_notices.any?
-        notice_ids_to_dismiss.concat(
-          team_changed_notices.where(team: patient.school&.teams).ids
-        )
+        current_teams = patient.teams_via_patient_locations
+
+        if current_teams.any?
+          notice_ids_to_dismiss.concat(
+            team_changed_notices.where(team_id: current_teams).ids
+          )
+        end
       end
 
       unless patient.invalidated?

app/models/concerns/patient_import_concern.rb

@@ -128,6 +128,8 @@ def increment_column_counts!(import, counts, changesets)
   end
 
   def has_auto_confirmable_school_move?(school_move, import)
+    return false if school_move.from_another_team?
+
     patient = school_move.patient
     team = import.team
 

app/models/patient.rb

@@ -710,6 +710,18 @@ def not_in_team?(team:, academic_year:)
     end
   end
 
+  def teams_via_patient_locations
+    Team
+      .joins(team_locations: { location: :patient_locations })
+      .merge(
+        PatientLocation.active.where(
+          patient_id: id,
+          academic_year: AcademicYear.current
+        )
+      )
+      .distinct
+  end
+
   def dup_for_pending_changes
     dup.tap do |new_patient|
       new_patient.nhs_number = nil

app/models/patient_location.rb

@@ -37,6 +37,8 @@ class PatientLocation < ApplicationRecord
   scope :current, -> { where(academic_year: AcademicYear.current) }
   scope :pending, -> { where(academic_year: AcademicYear.pending) }
 
+  scope :active, -> { where("date_range @> ?::date", Date.current) }
+
   scope :joins_team_locations, -> { references(:teams_locations).joins(<<-SQL) }
     INNER JOIN team_locations
     ON team_locations.location_id = patient_locations.location_id

app/models/school_move.rb

@@ -87,10 +87,13 @@ def confirm!(user: nil)
       update_locations!
 
       log_entry = create_log_entry!(user:)
-      create_important_notice!(log_entry) if move_across_teams
 
       update_patient_teams!
       update_patient_statuses!
+      if move_across_teams
+        create_important_notice!(log_entry)
+        update_important_notices!
+      end
 
       destroy! if persisted?
     end
@@ -101,12 +104,7 @@ def ignore!
   end
 
   def from_another_team?
-    current_teams =
-      patient
-        .patient_teams
-        .includes(:team)
-        .select { it.sources.include?("patient_location") }
-        .map(&:team)
+    current_teams = patient.teams_via_patient_locations
 
     return false if current_teams.empty?
 
@@ -231,4 +229,8 @@ def update_patient_teams!
   def update_patient_statuses!
     PatientStatusUpdater.call(patient:)
   end
+
+  def update_important_notices!
+    ImportantNoticeGeneratorJob.perform_later([patient.id])
+  end
 end

app/views/school_moves/show.html.erb

@@ -19,8 +19,9 @@
       <% card.with_heading(level: 2) { "#{@school_move.human_enum_name(:source)} record" } %>
       <% if @school_move.from_another_team? %>
         <div class="nhsuk-u-margin-top-1">
+          <% source_team = @school_move.patient.teams_via_patient_locations.first %>
           <%= render AppStatusComponent.new(text: "Confirming this school move will bring #{@school_move.patient.given_name} " \
-                                            "into your area from #{@school_move.patient.school.teams.first.name}") %>
+                                            "into your area from #{source_team.name}") %>
         </div>
       <% end %>
       <%= render AppChildSummaryComponent.new(@patient_with_changes) %>

spec/components/app_import_review_component_spec.rb

@@ -124,6 +124,14 @@
       ]
     end
 
+    before do
+      create(
+        :patient_location,
+        patient: inter_team_patient,
+        location: other_location
+      )
+    end
+
     include_examples "section with details",
                      title:
                        "Children moving from another SAIS team's area - resolve after import",
@@ -155,6 +163,14 @@
       ]
     end
 
+    before do
+      create(
+        :patient_location,
+        patient: inter_team_patient,
+        location: other_location
+      )
+    end
+
     it "renders separate expander for close matches" do
       expect(rendered).to have_css(
         ".nhsuk-details__summary-text",