Ensure clinic records are included in school session offline exports

When downloading the offline export for a school session, we include all
vaccinations records for the patient to ensure the nurses can see all
details about the patients. This means that some of those vaccination
records may have come from a clinic, therefore when downloading the
school spreadsheet we need to include `CLINIC_NAME` as a column to
handle those records.

Author: thomasleese

app/lib/reports/offline_session_exporter.rb

@@ -81,48 +81,46 @@ def add_batch_numbers_sheets(package)
   end
 
   def columns
-    @columns ||=
-      %i[
-        person_forename
-        person_surname
-        organisation_code
-        school_urn
-        school_name
-        care_setting
-        person_dob
-        year_group
-        person_gender_code
-        person_address_line_1
-        person_postcode
-        nhs_number
-        consent_status
-        consent_details
-        health_question_answers
-        triage_status
-        triaged_by
-        triage_date
-        triage_notes
-        gillick_status
-        gillick_assessment_date
-        gillick_assessed_by
-        gillick_assessment_notes
-        vaccinated
-        date_of_vaccination
-        time_of_vaccination
-        programme
-        vaccine_given
-        performing_professional_email
-        batch_number
-        batch_expiry_date
-        anatomical_site
-        dose_sequence
-        reason_not_vaccinated
-        notes
-        session_id
-        uuid
-      ].tap do |values|
-        values.insert(6, :clinic_name) if location.generic_clinic?
-      end
+    @columns ||= %i[
+      person_forename
+      person_surname
+      organisation_code
+      school_urn
+      school_name
+      clinic_name
+      care_setting
+      person_dob
+      year_group
+      person_gender_code
+      person_address_line_1
+      person_postcode
+      nhs_number
+      consent_status
+      consent_details
+      health_question_answers
+      triage_status
+      triaged_by
+      triage_date
+      triage_notes
+      gillick_status
+      gillick_assessment_date
+      gillick_assessed_by
+      gillick_assessment_notes
+      vaccinated
+      date_of_vaccination
+      time_of_vaccination
+      programme
+      vaccine_given
+      performing_professional_email
+      batch_number
+      batch_expiry_date
+      anatomical_site
+      dose_sequence
+      reason_not_vaccinated
+      notes
+      session_id
+      uuid
+    ]
   end
 
   def patient_sessions

spec/lib/reports/offline_session_exporter_spec.rb

@@ -58,6 +58,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
             ORGANISATION_CODE
             SCHOOL_URN
             SCHOOL_NAME
+            CLINIC_NAME
             CARE_SETTING
             PERSON_DOB
             YEAR_GROUP
@@ -116,6 +117,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
               "BATCH_EXPIRY_DATE" => nil,
               "BATCH_NUMBER" => "",
               "CARE_SETTING" => 1,
+              "CLINIC_NAME" => "",
               "CONSENT_DETAILS" => "",
               "CONSENT_STATUS" => "",
               "DATE_OF_VACCINATION" => nil,
@@ -193,6 +195,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
               "ANATOMICAL_SITE" => "left upper arm",
               "BATCH_NUMBER" => batch.name,
               "CARE_SETTING" => 1,
+              "CLINIC_NAME" => "",
               "CONSENT_DETAILS" => "",
               "CONSENT_STATUS" => "",
               "DOSE_SEQUENCE" => 1,
@@ -281,6 +284,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
               "ANATOMICAL_SITE" => "left upper arm",
               "BATCH_NUMBER" => batch.name,
               "CARE_SETTING" => nil,
+              "CLINIC_NAME" => "",
               "CONSENT_DETAILS" => "",
               "CONSENT_STATUS" => "",
               "DOSE_SEQUENCE" => 1,
@@ -322,6 +326,83 @@ def validation_formula(worksheet:, column_name:, row: 1)
         end
       end
 
+      context "with a vaccinated patient outside the school session, but in a clinic" do
+        let(:clinic_session) { organisation.generic_clinic_session }
+
+        let!(:vaccination_record) do
+          create(
+            :vaccination_record,
+            performed_at:,
+            batch:,
+            patient:,
+            session: clinic_session,
+            programme:,
+            performed_by: user,
+            notes: "Some notes.",
+            location_name: "Waterloo Hospital"
+          )
+        end
+
+        before do
+          create(:patient_session, patient:, session:)
+          create(:patient_session, patient:, session: clinic_session)
+        end
+
+        it "adds a row with the vaccination details" do
+          expect(rows.count).to eq(1)
+          expect(
+            rows.first.except(
+              "BATCH_EXPIRY_DATE",
+              "PERSON_DOB",
+              "DATE_OF_VACCINATION"
+            )
+          ).to eq(
+            {
+              "ANATOMICAL_SITE" => "left upper arm",
+              "BATCH_NUMBER" => batch.name,
+              "CARE_SETTING" => 2,
+              "CLINIC_NAME" => "Waterloo Hospital",
+              "CONSENT_DETAILS" => "",
+              "CONSENT_STATUS" => "",
+              "DOSE_SEQUENCE" => 1,
+              "GILLICK_ASSESSED_BY" => nil,
+              "GILLICK_ASSESSMENT_DATE" => nil,
+              "GILLICK_ASSESSMENT_NOTES" => nil,
+              "GILLICK_STATUS" => "",
+              "HEALTH_QUESTION_ANSWERS" => "",
+              "NHS_NUMBER" => patient.nhs_number,
+              "NOTES" => "Some notes.",
+              "ORGANISATION_CODE" => organisation.ods_code,
+              "PERFORMING_PROFESSIONAL_EMAIL" => "nurse@example.com",
+              "PERSON_ADDRESS_LINE_1" => patient.address_line_1,
+              "PERSON_FORENAME" => patient.given_name,
+              "PERSON_GENDER_CODE" => "Not known",
+              "PERSON_POSTCODE" => patient.address_postcode,
+              "PERSON_SURNAME" => patient.family_name,
+              "PROGRAMME" => "HPV",
+              "REASON_NOT_VACCINATED" => "",
+              "SCHOOL_NAME" => "",
+              "SCHOOL_URN" => "888888",
+              "SESSION_ID" => clinic_session.id,
+              "TIME_OF_VACCINATION" => "12:05:20",
+              "TRIAGED_BY" => nil,
+              "TRIAGE_DATE" => nil,
+              "TRIAGE_NOTES" => nil,
+              "TRIAGE_STATUS" => nil,
+              "VACCINATED" => "Y",
+              "VACCINE_GIVEN" => "Gardasil9",
+              "UUID" => vaccination_record.uuid,
+              "YEAR_GROUP" => patient.year_group
+            }
+          )
+          expect(rows.first["BATCH_EXPIRY_DATE"].to_date).to eq(batch.expiry)
+          expect(rows.first["PERSON_DOB"].to_date).to eq(patient.date_of_birth)
+          expect(rows.first["DATE_OF_VACCINATION"].to_date).to eq(
+            performed_at.to_date
+          )
+        end
+      end
+
       context "with a patient who couldn't be vaccinated" do
         before { create(:patient_session, patient:, session:) }
 
@@ -346,6 +427,7 @@ def validation_formula(worksheet:, column_name:, row: 1)
               "BATCH_EXPIRY_DATE" => nil,
               "BATCH_NUMBER" => nil,
               "CARE_SETTING" => 1,
+              "CLINIC_NAME" => "",
               "CONSENT_DETAILS" => "",
               "CONSENT_STATUS" => "",
               "DOSE_SEQUENCE" => "",
@@ -497,8 +579,8 @@ def validation_formula(worksheet:, column_name:, row: 1)
             ORGANISATION_CODE
             SCHOOL_URN
             SCHOOL_NAME
-            CARE_SETTING
             CLINIC_NAME
+            CARE_SETTING
             PERSON_DOB
             YEAR_GROUP
             PERSON_GENDER_CODE