Add new scope to automated careplus reports

jf-x-dev · jf-x-dev · commit 2cff41e58049 · 2026-04-22T20:10:05.000+01:00
* Include records for patients that gained an nhs number in the last day
* Only include these records if they were created after the careplus integration was enabled

Jira-Issue: MAV-XXX
diff --git a/app/lib/reports/automated_careplus_exporter.rb b/app/lib/reports/automated_careplus_exporter.rb
@@ -37,14 +37,36 @@ def self.vaccination_records_scope(
     start_date:,
     end_date:
   )
-    Reports::CareplusExporter.vaccination_records_scope(
-      team:,
-      programmes: team.programmes,
-      academic_year:,
-      start_date:,
-      end_date:,
-      include_missing_nhs_number: false
-    )
+    base_scope = all_eligible_vaccination_records_scope(team:, academic_year:)
+    daily_scope = base_scope.created_or_updated_between(start_date, end_date)
+
+    return daily_scope if team.careplus_integration_enabled_at.blank?
+
+    nhs_number_first_added_scope =
+      base_scope
+        .created_or_updated_on_or_after(team.careplus_integration_enabled_at)
+        .where.not(patients: { nhs_number_first_added_at: nil })
+
+    if start_date.present?
+      nhs_number_first_added_scope =
+        nhs_number_first_added_scope.where(
+          "patients.nhs_number_first_added_at >= ?",
+          start_date.beginning_of_day
+        )
+    end
+
+    if end_date.present?
+      nhs_number_first_added_scope =
+        nhs_number_first_added_scope.where(
+          "patients.nhs_number_first_added_at <= ?",
+          end_date.end_of_day
+        )
+    end
+
+    base_scope
+      .where(id: daily_scope.select(:id))
+      .or(base_scope.where(id: nhs_number_first_added_scope.select(:id)))
+      .distinct
   end
 
   def self.shared_args(team:, academic_year:)
@@ -57,5 +79,18 @@ def self.shared_args(team:, academic_year:)
     }
   end
 
-  private_class_method :new, :shared_args
+  def self.all_eligible_vaccination_records_scope(team:, academic_year:)
+    Reports::CareplusExporter.vaccination_records_scope(
+      team:,
+      programmes: team.programmes,
+      academic_year:,
+      start_date: nil,
+      end_date: nil,
+      include_missing_nhs_number: false
+    )
+  end
+
+  private_class_method :new,
+                       :shared_args,
+                       :all_eligible_vaccination_records_scope
 end
diff --git a/app/models/vaccination_record.rb b/app/models/vaccination_record.rb
@@ -196,6 +196,13 @@ class VaccinationRecord < ApplicationRecord
           scope
         end
 
+  scope :created_or_updated_on_or_after,
+        ->(timestamp) do
+          where("vaccination_records.created_at >= ?", timestamp).or(
+            where("vaccination_records.updated_at >= ?", timestamp)
+          )
+        end
+
   enum :protocol, { pgd: 0, psd: 1, national: 2 }, validate: { allow_nil: true }
 
   enum :delivery_method,
diff --git a/spec/lib/careplus/automated_report_sender_spec.rb b/spec/lib/careplus/automated_report_sender_spec.rb
@@ -4,7 +4,12 @@
   subject(:call) { described_class.call(team_id: team.id) }
 
   let(:team) do
-    create(:team, :with_careplus_enabled, programmes: Programme.all)
+    create(
+      :team,
+      :with_careplus_enabled,
+      programmes: Programme.all,
+      careplus_integration_enabled_at: Time.zone.local(2025, 8, 28, 10)
+    )
   end
   let(:programme) { Programme.hpv }
   let(:session) { create(:session, team:, programmes: [programme]) }
@@ -167,4 +172,87 @@
       expect { call }.not_to change(CareplusReport, :count)
     end
   end
+
+  context "when a patient gains an NHS number yesterday" do
+    it "includes records created after the integration was enabled" do
+      patient =
+        create(
+          :patient,
+          session:,
+          nhs_number_first_added_at: Time.zone.local(2025, 8, 31, 9)
+        )
+      record =
+        create(
+          :vaccination_record,
+          patient:,
+          session:,
+          programme:,
+          performed_at: Date.new(2025, 8, 29),
+          created_at: Time.zone.local(2025, 8, 29, 12),
+          updated_at: Time.zone.local(2025, 8, 29, 12)
+        )
+
+      expect { call }.to change(CareplusReport, :count).by(1)
+
+      expect(CareplusReport.last.vaccination_records).to contain_exactly(record)
+    end
+
+    it "does not include records created before the integration was enabled" do
+      team.update!(
+        careplus_integration_enabled_at: Time.zone.local(2025, 8, 30, 10)
+      )
+
+      patient =
+        create(
+          :patient,
+          session:,
+          nhs_number_first_added_at: Time.zone.local(2025, 8, 31, 9)
+        )
+      create(
+        :vaccination_record,
+        patient:,
+        session:,
+        programme:,
+        performed_at: Date.new(2025, 8, 29),
+        created_at: Time.zone.local(2025, 8, 29, 12),
+        updated_at: Time.zone.local(2025, 8, 29, 12)
+      )
+
+      expect { call }.not_to change(CareplusReport, :count)
+    end
+
+    it "deduplicates records that also changed yesterday" do
+      patient =
+        create(
+          :patient,
+          session:,
+          nhs_number_first_added_at: Time.zone.local(2025, 8, 31, 9)
+        )
+      record =
+        create(
+          :vaccination_record,
+          patient:,
+          session:,
+          programme:,
+          performed_at: yesterday,
+          created_at: Time.zone.local(2025, 8, 29, 12),
+          updated_at: Time.zone.local(2025, 8, 31, 12)
+        )
+
+      expect { call }.to change(CareplusReport, :count).by(1).and(
+        change(CareplusReportVaccinationRecord, :count).by(1)
+      )
+
+      expect(CareplusReport.last.vaccination_records).to contain_exactly(record)
+      expect(WebMock).to have_requested(:post, endpoint).once
+    end
+  end
+
+  context "when CarePlus is configured but not manually enabled" do
+    before { team.update!(careplus_integration_enabled_at: nil) }
+
+    it "does nothing" do
+      expect { call }.not_to change(CareplusReport, :count)
+    end
+  end
 end
diff --git a/spec/lib/reports/automated_careplus_exporter_spec.rb b/spec/lib/reports/automated_careplus_exporter_spec.rb
@@ -28,29 +28,70 @@
     described_class.call(team:, academic_year:, start_date:, end_date:)
   end
 
-  it "delegates vaccination_records_scope to CareplusExporter with the correct parameters" do
-    team = create(:team)
-    academic_year = AcademicYear.current
-    start_date = 1.month.ago.to_date
-    end_date = Date.current
+  describe ".vaccination_records_scope" do
+    let(:programme) { Programme.hpv }
+    let(:export_date) { Date.new(2025, 8, 31) }
+    let(:team) do
+      create(
+        :team,
+        :with_careplus_enabled,
+        programmes: [programme],
+        careplus_integration_enabled_at: Time.zone.local(2025, 8, 28, 10)
+      )
+    end
+    let(:session) { create(:session, team:, programmes: [programme]) }
 
-    expect(Reports::CareplusExporter).to receive(
-      :vaccination_records_scope
-    ).with(
-      team:,
-      programmes: team.programmes,
-      academic_year:,
-      start_date:,
-      end_date:,
-      include_missing_nhs_number: false
-    )
+    it "includes records changed in the export window" do
+      included_record =
+        create(
+          :vaccination_record,
+          patient: create(:patient, session:),
+          session:,
+          programme:,
+          performed_at: export_date,
+          created_at: export_date,
+          updated_at: export_date
+        )
 
-    described_class.vaccination_records_scope(
-      team:,
-      academic_year:,
-      start_date:,
-      end_date:
-    )
+      scope =
+        described_class.vaccination_records_scope(
+          team:,
+          academic_year: export_date.academic_year,
+          start_date: export_date,
+          end_date: export_date
+        )
+
+      expect(scope).to include(included_record)
+    end
+
+    it "includes older records for patients who first had an NHS number added in the export window" do
+      patient =
+        create(
+          :patient,
+          session:,
+          nhs_number_first_added_at: Time.zone.local(2025, 8, 31, 9)
+        )
+      included_record =
+        create(
+          :vaccination_record,
+          patient:,
+          session:,
+          programme:,
+          performed_at: Date.new(2025, 8, 29),
+          created_at: Time.zone.local(2025, 8, 29, 12),
+          updated_at: Time.zone.local(2025, 8, 29, 12)
+        )
+
+      scope =
+        described_class.vaccination_records_scope(
+          team:,
+          academic_year: export_date.academic_year,
+          start_date: export_date,
+          end_date: export_date
+        )
+
+      expect(scope).to include(included_record)
+    end
   end
 
   it "passes the correct parameters to CareplusExporter.from_records" do
