Add patient to sessions when importing vaccinations

This fixes a regression that was added in
a01aa7f which meant that when importing
vaccination records for the current academic year (where a session must
exist) we weren't adding the patients to that session if they weren't
already in the session.

Although the data model allows patients to be vaccinated and doesn't
require them to be in the session at that point in time, in this case
it's important that the patients are visible in the session so their
status is represented accurately.

app/models/immunisation_import.rb

@@ -75,13 +75,18 @@ def process_row(row)
     @vaccination_records_batch ||= Set.new
     @batches_batch ||= Set.new
     @patients_batch ||= Set.new
+    @patient_sessions_batch ||= Set.new
 
     @vaccination_records_batch.add(vaccination_record)
     if vaccination_record.administered?
       @batches_batch.add(vaccination_record.batch)
     end
     @patients_batch.add(vaccination_record.patient)
 
+    if (patient_session = row.to_patient_session)
+      @patient_sessions_batch.add(patient_session)
+    end
+
     count_column_to_increment
   end
 
@@ -91,13 +96,16 @@ def bulk_import(rows: 100)
     # We need to convert the batch to an array as `import` modifies the
     # objects to add IDs to any new records.
     vaccination_records = @vaccination_records_batch.to_a
+    patient_sessions = @patient_sessions_batch.to_a
 
     VaccinationRecord.import(vaccination_records, on_duplicate_key_update: :all)
+    PatientSession.import(patient_sessions, on_duplicate_key_ignore: :all)
 
     [
       [:vaccination_records, vaccination_records],
       [:batches, @batches_batch],
-      [:patients, @patients_batch]
+      [:patients, @patients_batch],
+      [:patient_sessions, patient_sessions.select { it.id.present? }]
     ].each do |association, collection|
       link_records_by_type(association, collection)
       collection.clear

app/models/immunisation_import_row.rb

@@ -166,6 +166,12 @@ def to_vaccination_record
     vaccination_record
   end
 
+  def to_patient_session
+    return if patient.nil? || session.nil?
+
+    PatientSession.new(patient:, session:)
+  end
+
   def patient
     return unless valid?
 

spec/models/immunisation_import_spec.rb

@@ -137,6 +137,7 @@
           .and change(immunisation_import.vaccination_records, :count).by(11)
           .and change(immunisation_import.patients, :count).by(11)
           .and change(immunisation_import.batches, :count).by(4)
+          .and not_change(immunisation_import.patient_sessions, :count)
 
         # Second import should not duplicate the vaccination records if they're
         # identical.
@@ -177,6 +178,23 @@
           .times
           .on_queue(:imports)
       end
+
+      it "adds patients to the session if it exists" do
+        # must match a session in valid_flu.csv
+        location = Location.school.find_by!(urn: "120026")
+        create(
+          :session,
+          location:,
+          organisation:,
+          programme:,
+          date: Date.new(2024, 5, 14)
+        )
+
+        expect { process! }.to change(
+          immunisation_import.patient_sessions,
+          :count
+        ).by(8)
+      end
     end
 
     context "with valid HPV rows" do
@@ -190,6 +208,7 @@
           .and change(immunisation_import.vaccination_records, :count).by(11)
           .and change(immunisation_import.patients, :count).by(10)
           .and change(immunisation_import.batches, :count).by(9)
+          .and not_change(immunisation_import.patient_sessions, :count)
 
         # Second import should not duplicate the vaccination records if they're
         # identical.
@@ -230,6 +249,23 @@
           .times
           .on_queue(:imports)
       end
+
+      it "adds patients to the session if it exists" do
+        # must match a session in valid_hpv.csv
+        location = Location.school.find_by!(urn: "110158")
+        create(
+          :session,
+          location:,
+          organisation:,
+          programme:,
+          date: Date.new(2024, 5, 14)
+        )
+
+        expect { process! }.to change(
+          immunisation_import.patient_sessions,
+          :count
+        ).by(6)
+      end
     end
 
     context "with an existing patient matching the name" do