Refactor patient session factory

Author: thomasleese

app/controllers/patients_controller.rb

@@ -46,16 +46,15 @@ def set_patient
         :school,
         consents: %i[parent patient],
         parent_relationships: :parent,
-        patient_sessions: :location,
+        sessions: :location,
         vaccination_records: :programme
       ).find(params[:id])
   end
 
   def set_in_generic_clinic
     generic_clinic_session =
       current_team.generic_clinic_session(academic_year: AcademicYear.pending)
-    @in_generic_clinic =
-      @patient.patient_sessions.exists?(session: generic_clinic_session)
+    @in_generic_clinic = @patient.sessions.include?(generic_clinic_session)
   end
 
   def record_access_log_entry

db/seeds.rb

@@ -96,15 +96,15 @@ def create_session(user, team, programmes:, completed: false, year_groups: nil)
     year_groups.each do |year_group|
       patients_without_consent =
         FactoryBot.create_list(
-          :patient_session,
+          :patient,
           2,
           programmes: [programme],
           session:,
-          user:,
+          performed_by: user,
           year_group:
         )
-      unmatched_patients = patients_without_consent.sample(2).map(&:patient)
-      unmatched_patients.each do |patient|
+
+      patients_without_consent.each do |patient|
         FactoryBot.create(
           :consent_form,
           :recorded,
@@ -126,14 +126,14 @@ def create_session(user, team, programmes:, completed: false, year_groups: nil)
       )
 
       traits = %i[
-        consent_given_triage_not_needed
+        consent_conflicting
         consent_given_triage_needed
-        triaged_ready_to_vaccinate
+        consent_given_triage_not_needed
         consent_refused
-        consent_conflicting
-        vaccinated
-        delay_vaccination
+        triage_delay_vaccination
+        triage_ready_to_vaccinate
         unable_to_vaccinate
+        vaccinated
       ]
 
       if programme.vaccinated_dose_sequence != 1
@@ -142,12 +142,12 @@ def create_session(user, team, programmes:, completed: false, year_groups: nil)
 
       traits.each do |trait|
         FactoryBot.create_list(
-          :patient_session,
+          :patient,
           1,
           trait,
           programmes: [programme],
           session:,
-          user:,
+          performed_by: user,
           year_group:
         )
       end

spec/components/app_programme_session_table_component_spec.rb

@@ -16,7 +16,7 @@
   let(:patient) { create(:patient, session:) }
 
   before do
-    create_list(:patient_session, 4, :consent_no_response, session:)
+    create_list(:patient, 4, :consent_no_response, session:)
 
     create(:patient_consent_status, :given, programme:, patient:)
 

spec/components/app_session_actions_component_spec.rb

@@ -16,41 +16,35 @@
 
   before do
     create(
-      :patient_session,
+      :patient,
       :consent_no_response,
       :unknown_attendance,
       session:,
       year_group:
     )
     create(
-      :patient_session,
+      :patient,
       :consent_conflicting,
       :unknown_attendance,
       session:,
       year_group:
     )
     create(
-      :patient_session,
+      :patient,
       :consent_given_triage_needed,
       :unknown_attendance,
       session:,
       year_group:
     )
     create(
-      :patient_session,
+      :patient,
       :consent_given_triage_not_needed,
       :in_attendance,
       session:,
       year_group:
     )
-    create(:patient_session, :vaccinated, :in_attendance, session:, year_group:)
-
-    create(
-      :patient_session,
-      patient: patient_without_nhs_number,
-      session:,
-      year_group:
-    )
+    create(:patient, :vaccinated, :in_attendance, session:, year_group:)
+    create(:patient, nhs_number: nil, session:, year_group:)
   end
 
   it { should have_text("No NHS number1 child") }

spec/components/app_session_details_summary_component_spec.rb

@@ -14,9 +14,9 @@
 
   context "with activity" do
     before do
-      create(:patient_session, session:)
-      create(:patient_session, :consent_refused, session:)
-      create(:patient_session, :vaccinated, session:)
+      create(:patient, session:)
+      create(:patient, :consent_refused, session:)
+      create(:patient, :vaccinated, session:)
     end
 
     it { should have_text("Cohort3 children") }
@@ -28,8 +28,8 @@
 
   context "when the patients are not eligible for the programme" do
     before do
-      create(:patient_session, session:, year_group: 7)
-      create(:patient_session, :consent_refused, session:, year_group: 7)
+      create(:patient, session:, year_group: 7)
+      create(:patient, :consent_refused, session:, year_group: 7)
     end
 
     it { should have_text("CohortNo children") }

spec/components/app_vaccinate_form_component_spec.rb

@@ -16,22 +16,18 @@
     create(
       :patient,
       :consent_given_triage_not_needed,
-      programmes:,
+      :in_attendance,
+      session:,
       given_name: "Hari"
     )
   end
-  let(:patient_session) do
-    create(:patient_session, :in_attendance, programmes:, patient:, session:)
-  end
 
   let(:vaccinate_form) do
     VaccinateForm.new(current_user:, patient:, session_date:, programme:)
   end
 
   let(:component) { described_class.new(vaccinate_form) }
 
-  before { patient_session.strict_loading!(false) }
-
   it { should have_css(".nhsuk-card") }
 
   context "with a flu programme and consent to nasal spray" do