Merge pull request #6474 from NHSDigital/fix-incorrect-labels-for-paged-import-review

Correction to totals on import review page

Author: stevehook

app/components/app_import_review_component.rb

@@ -46,7 +46,7 @@ def auto_matched_message
   end
 
   def import_issues_message
-    count = @import_issues.count
+    count = @import_issues_pagy.count
     "This upload includes #{pluralize(count, "record")} that " \
       "#{count > 1 ? "are close matches to existing records" : "is a close match to an existing record"} " \
       "in Mavis. If you approve the upload, you will need to resolve " \
@@ -62,7 +62,7 @@ def inter_team_message
   end
 
   def school_moves_message
-    count = @school_moves.count
+    count = @school_moves_pagy.count
     if @import.is_a?(ClassImport)
       "This upload will change the school of the #{count > 1 ? "children" : "child"} listed below. " \
         "Children present in the class list will be moved into the school, and those who are not in the " \

spec/components/app_import_review_component_spec.rb

@@ -105,6 +105,35 @@
     end
   end
 
+  describe "with multiple pages of new records" do
+    let(:new_records) do
+      create_list(:patient_changeset, 75, :new_patient, import:)
+    end
+    let(:new_records_pagy) do
+      instance_double(
+        Pagy,
+        count: new_records.count,
+        limit: 50,
+        from: 1,
+        to: 50
+      ).as_null_object
+    end
+
+    include_examples "section with details",
+                     title: "New records",
+                     summary: /75 new records\s+\(showing 1 to 50\)/,
+                     count: 75
+
+    it "shows the section description" do
+      expect(rendered).to have_content(
+        "This upload includes 75 new records that are not currently in Mavis"
+      )
+      expect(rendered).to have_content(
+        "If you approve the upload, these records will be added to Mavis"
+      )
+    end
+  end
+
   describe "with auto-matched records" do
     let(:auto_matched_records) do
       [
@@ -263,6 +292,39 @@
     end
   end
 
+  describe "with multiple pages of school moves" do
+    let(:school_moves) do
+      create_list(
+        :patient_changeset,
+        55,
+        :with_school_move,
+        import:,
+        patient: school_move_patient,
+        school: second_location
+      )
+    end
+    let(:school_moves_pagy) do
+      instance_double(
+        Pagy,
+        count: school_moves.count,
+        limit: 50,
+        from: 1,
+        to: 50
+      ).as_null_object
+    end
+
+    include_examples "section with details",
+                     title: "School moves - resolve after import",
+                     summary: /55 school moves\s+\(showing 1 to 50\)/,
+                     count: 55
+
+    it "shows correct total in import message" do
+      expect(rendered).to have_content(
+        "This upload includes 55 children with a different school to the one on their Mavis record"
+      )
+    end
+  end
+
   describe "with skipped school moves" do
     let(:other_team_school) do
       create(:school, team: other_team, name: "School in Other Team")