Merge pull request #6049 from nhsuk/next

v6.20.0

Author: misaka

.github/workflows/create_dockerized_db.yml

@@ -63,7 +63,7 @@ jobs:
         run: |
           bin/rails db:setup
           bin/rails feature_flags:enable_for_development
-          bin/mavis gias import
+          bin/mavis gias import --input-file=spec/fixtures/dfe-schools.zip
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v6
         with:
@@ -81,4 +81,4 @@ jobs:
         run: |
           docker commit database "${{ steps.login-ecr.outputs.registry }}/mavis/development/postgres_db:${{ steps.github-ref.outputs.ref }}"
       - name: Push image
-        run: docker push "${{ steps.login-ecr.outputs.registry }}/mavis/development/postgres_db:${{ steps.github-ref.outputs.ref }}"
+        run: docker push "${{ steps.login-ecr.outputs.registry }}/mavis/development/postgres_db:${{ steps.github-ref.outputs.ref }}"

.gitignore

@@ -85,3 +85,8 @@ public/ref
 
 # Redis
 dump.rdb
+
+
+# Data that gets downloaded by CLI tools
+db/data/dfe-schools.zip
+db/data/nhs-gp-practices.zip

Gemfile.lock

@@ -134,19 +134,19 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1210.0)
+    aws-partitions (1.1213.0)
     aws-sdk-accessanalyzer (1.85.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.241.4)
+    aws-sdk-core (3.242.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.597.0)
+    aws-sdk-ec2 (1.598.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.119.0)
@@ -158,7 +158,7 @@ GEM
     aws-sdk-kms (1.121.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.306.0)
+    aws-sdk-rds (1.307.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.213.0)
@@ -258,7 +258,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.6.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -334,7 +334,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.18.0)
+    json (2.18.1)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -451,7 +451,7 @@ GEM
     pagy (9.4.0)
     paint (2.3.0)
     parallel (1.27.0)
-    parallel_tests (5.5.0)
+    parallel_tests (5.6.0)
       parallel
     parser (3.3.10.1)
       ast (~> 2.4.1)

README.md

@@ -226,7 +226,7 @@ This runs tests in the `end_to_end` rails environment which will not interfere w
 ```shell
 RAILS_ENV=end_to_end bin/rails db:setup
 RAILS_ENV=end_to_end bin/rails feature_flags:enable_for_development
-RAILS_ENV=end_to_end bin/mavis gias import
+RAILS_ENV=end_to_end bin/mavis gias import --input-file=spec/fixtures/dfe-schools.zip
 RAILS_ENV=end_to_end bin/rails assets:precompile
 ```
 

app/components/app_activity_log_component.rb

@@ -69,6 +69,9 @@ def initialize(team:, patient:, session: nil)
           session ? scope.where(location: session.location) : scope
         end
 
+    @patient_merge_log_entries =
+      @patient.patient_merge_log_entries.includes(:user)
+
     @patient_specific_directions =
       @patient
         .patient_specific_directions
@@ -105,6 +108,7 @@ def initialize(team:, patient:, session: nil)
               :notify_log_entries,
               :patient,
               :patient_locations,
+              :patient_merge_log_entries,
               :patient_specific_directions,
               :pre_screenings,
               :attendance_records,
@@ -124,6 +128,7 @@ def all_events
       gillick_assessment_events,
       note_events,
       notify_events,
+      patient_merge_events,
       patient_specific_direction_events,
       pre_screening_events,
       session_events,
@@ -309,6 +314,21 @@ def notify_events
     end
   end
 
+  def patient_merge_events
+    patient_merge_log_entries.map do |patient_merge_log_entry|
+      {
+        title: "Child record merged",
+        body:
+          "The record for #{patient_merge_log_entry.merged_patient_name} (date of birth " \
+            "#{patient_merge_log_entry.merged_patient_dob.to_fs(:long)}) was merged with the record for " \
+            "#{patient.full_name} (date of birth #{patient.date_of_birth.to_fs(:long)}) because they have the same " \
+            "NHS number (#{patient_merge_log_entry.merged_patient_nhs_number}).",
+        at: patient_merge_log_entry.created_at,
+        by: patient_merge_log_entry.user
+      }
+    end
+  end
+
   def patient_specific_direction_events
     patient_specific_directions.flat_map do |patient_specific_direction|
       events = []

app/components/app_import_statistics_component.rb

@@ -2,11 +2,11 @@
 
 class AppImportStatisticsComponent < ViewComponent::Base
   erb_template <<-ERB
-    <p><strong>Out of <%= pluralize(@import.records_count, "record") %> found in the file:</strong></p>
+    <p><strong><%= pluralize(@import.records_count, "record") %> found in the file:</strong></p>
     <ul>
       <li><%= pluralize(@import.new_record_count, "new record") %> imported</li>
       <li><%= pluralize(@import.exact_duplicate_record_count, "duplicate") %> not imported</li>
-      <li><%= pluralize(@import.ignored_record_count, "'not vaccinated' record") %> not imported</li>
+      <li><%= pluralize(@import.ignored_record_count, "‘not vaccinated’ record") %> not imported</li>
     </ul>
   ERB
 

app/components/app_patient_summary_component.rb

@@ -27,7 +27,11 @@ def initialize(patient)
            to: :helpers
 
   def rows
-    [nhs_number_row, date_of_birth_row, address_row]
+    [
+      nhs_number_row,
+      date_of_birth_row,
+      (address_row unless patient.restricted?)
+    ].compact
   end
 
   def classes

app/components/app_vaccination_record_summary_component.rb

@@ -5,12 +5,14 @@ def initialize(
     vaccination_record,
     current_user:,
     change_links: {},
-    show_notes: true
+    show_notes: true,
+    comparing: false
   )
     @vaccination_record = vaccination_record
     @current_user = current_user
     @change_links = change_links
     @show_notes = show_notes
+    @comparing = comparing
 
     @identity_check = vaccination_record.identity_check
     @patient = vaccination_record.patient
@@ -316,7 +318,8 @@ def call
         end && Flipper.enabled?(:imms_api_integration)
       if @vaccination_record.respond_to?(:sync_status) &&
            correct_feature_flags_enabled &&
-           @vaccination_record.correct_source_for_nhs_immunisations_api?
+           @vaccination_record.correct_source_for_nhs_immunisations_api? &&
+           !@comparing
         summary_list.with_row do |row|
           row.with_key { "Synced with NHS England?" }
           row.with_value do

app/forms/concerns/patient_merge_form_concern.rb

@@ -15,24 +15,29 @@ def nhs_number=(value)
   end
 
   def existing_patient
+    return if nhs_number.blank?
+
     @existing_patient ||=
-      if nhs_number.present?
-        patient_policy_scope.includes(:vaccination_records).find_by(
-          nhs_number:
-        ) ||
-          Patient
-            .where
-            .missing(:patient_locations)
-            .includes(:vaccination_records)
-            .find_by(nhs_number:)
-      end
+      find_existing(patient_policy_scope) ||
+        find_existing(Patient.where.missing(:patient_locations))
+  end
+
+  def find_existing(scope)
+    scope
+      .where.not(id: patient.id)
+      .includes(:vaccination_records)
+      .find_by(nhs_number: nhs_number)
   end
 
   def save
     return false if invalid?
 
     if existing_patient
-      PatientMerger.call(to_keep: existing_patient, to_destroy: patient)
+      PatientMerger.call(
+        to_keep: existing_patient,
+        to_destroy: patient,
+        user: current_user
+      )
     end
 
     true

app/forms/import_duplicate_form.rb

@@ -58,16 +58,54 @@ def apply_pending_changes!
   end
 
   def discard_pending_changes!
+    remove_imported_parent_relationships_if_needed!
+
     object.patient.discard_pending_changes! if object.respond_to?(:patient)
 
     object.discard_pending_changes!
   end
 
   def keep_both_changes!
-    object.apply_pending_changes_to_new_record! if can_keep_both? && can_apply?
+    return unless can_keep_both?
+    return unless can_apply?
+
+    object.apply_pending_changes_to_new_record!(
+      changeset: changeset_for_keep_both
+    )
+  end
+
+  def changeset_for_keep_both
+    scope = object.changesets.includes(:import).order(:created_at)
+
+    return scope.last unless Flipper.enabled?(:import_review_screen)
+
+    completed_import_statuses = %w[
+      processed
+      partially_processed
+      removing_parent_relationships
+    ]
+
+    scope
+      .processed
+      .select { completed_import_statuses.include?(it.import&.status) }
+      .last
   end
 
   def reset_count!
     TeamCachedCounts.new(current_team).reset_import_issues!
   end
+
+  def remove_imported_parent_relationships_if_needed!
+    return unless object.is_a?(Patient)
+
+    changeset = object.changesets.includes(:import).order(:created_at).last
+    return if changeset.nil?
+
+    changeset
+      .import
+      .parent_relationships
+      .includes(:patient)
+      .where(patient: object)
+      .find_each(&:destroy!)
+  end
 end