Merge pull request #4012 from nhsuk/generic-clinic-factory

Refactor how generic clinic locations are created

Author: thomasleese

app/lib/generic_clinic_factory.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class GenericClinicFactory
+  def initialize(organisation:)
+    @organisation = organisation
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      location.update!(year_groups:)
+      location.create_default_programme_year_groups!(programmes)
+      location
+    end
+  end
+
+  def self.call(...) = new(...).call
+
+  private_class_method :new
+
+  private
+
+  attr_reader :organisation
+
+  delegate :programmes, to: :organisation
+
+  def team
+    organisation
+      .teams
+      .create_with(
+        email: organisation.email,
+        phone: organisation.phone,
+        phone_instructions: organisation.phone_instructions
+      )
+      .find_or_create_by!(name: organisation.name)
+  end
+
+  def location
+    organisation.locations.find_by(
+      ods_code: organisation.ods_code,
+      type: :generic_clinic
+    ) ||
+      Location.create!(
+        name: "Community clinics",
+        ods_code: organisation.ods_code,
+        team:,
+        type: :generic_clinic
+      )
+  end
+
+  def year_groups
+    programmes.flat_map(&:default_year_groups).uniq.sort
+  end
+end

app/models/onboarding.rb

@@ -117,9 +117,10 @@ def errors
   def save!
     ActiveRecord::Base.transaction do
       models.each(&:save!)
-      organisation.generic_clinic.create_default_programme_year_groups!(
-        programmes.map(&:programme)
-      )
+
+      # Reload to ensure the programmes are loaded.
+      GenericClinicFactory.call(organisation: organisation.reload)
+
       @users.each { |user| user.organisations << organisation }
       UnscheduledSessionsFactory.new.call
     end

app/models/organisation.rb

@@ -80,30 +80,9 @@ def year_groups
     @year_groups ||= location_programme_year_groups.pluck_year_groups
   end
 
-  def generic_team
-    teams.create_with(email:, phone:, phone_instructions:).find_or_create_by!(
-      name:
-    )
-  end
-
-  def generic_clinic
-    locations.find_by(ods_code:, type: :generic_clinic) ||
-      ActiveRecord::Base.transaction do
-        Location
-          .create!(
-            name: "Community clinics",
-            team: generic_team,
-            ods_code:,
-            type: :generic_clinic,
-            year_groups: programmes.flat_map(&:default_year_groups).uniq.sort
-          )
-          .tap { it.create_default_programme_year_groups!(programmes) }
-      end
-  end
-
   def generic_clinic_session
     academic_year = AcademicYear.current
-    location = generic_clinic
+    location = locations.generic_clinic.first
 
     sessions
       .includes(:location, :programmes, :session_dates)

db/seeds.rb

@@ -65,11 +65,11 @@ def attach_sample_of_schools_to(organisation)
     .where(team_id: nil)
     .order("RANDOM()")
     .limit(50)
-    .update_all(team_id: organisation.generic_team.id)
+    .update_all(team_id: organisation.teams.first.id)
 end
 
 def attach_specific_school_to_organisation_if_present(organisation:, urn:)
-  Location.where(urn:).update_all(team_id: organisation.generic_team.id)
+  Location.where(urn:).update_all(team_id: organisation.teams.first.id)
 end
 
 def create_session(

lib/tasks/clinics.rake

@@ -7,11 +7,13 @@ task create_default_programme_year_groups: :environment do
     .find_each do |organisation|
       year_groups =
         organisation.programmes.flat_map(&:default_year_groups).uniq.sort
-      organisation.generic_clinic.update!(year_groups:)
 
-      organisation.generic_clinic.create_default_programme_year_groups!(
-        organisation.programmes
-      )
+      organisation.locations.generic_clinic.find_each do |generic_clinic|
+        generic_clinic.update_all(year_groups:)
+        generic_clinic.create_default_programme_year_groups!(
+          organisation.programmes
+        )
+      end
 
       organisation.schools.find_each do |school|
         school.create_default_programme_year_groups!(organisation.programmes)

lib/tasks/create_default_programme_year_groups.rake

@@ -7,5 +7,7 @@ namespace :organisations do
     programme = Programme.find_by!(type: args[:type])
 
     OrganisationProgramme.find_or_create_by!(organisation:, programme:)
+
+    GenericClinicFactory.call(organisation: organisation.reload)
   end
 end

lib/tasks/organisations.rake

@@ -7,7 +7,9 @@
   describe "DELETE" do
     let(:programmes) { [create(:programme, :hpv_all_vaccines)] }
 
-    let(:organisation) { create(:organisation, ods_code: "R1L", programmes:) }
+    let(:organisation) do
+      create(:organisation, :with_generic_clinic, ods_code: "R1L", programmes:)
+    end
 
     let(:cohort_import) do
       create(
@@ -66,7 +68,7 @@
       expect { delete :destroy, params: { ods_code: "r1l" } }.to(
         change(Organisation, :count)
           .by(-1)
-          .and(change(Team, :count).by(-2))
+          .and(change(Team, :count).by(-1))
           .and(change(Session, :count).by(-1))
           .and(change(CohortImport, :count).by(-1))
           .and(change(ImmunisationImport, :count).by(-1))

spec/controllers/api/organisations_controller_spec.rb

@@ -92,7 +92,9 @@
 
     context "when there are no upcoming sessions" do
       let(:programmes) { [create(:programme)] }
-      let(:organisation) { create(:organisation, programmes:) }
+      let(:organisation) do
+        create(:organisation, :with_generic_clinic, programmes:)
+      end
       let(:consent_form) do
         create(
           :consent_form,

spec/controllers/concerns/consent_form_mailer_concern_spec.rb

@@ -46,9 +46,7 @@
     end
 
     trait :with_generic_clinic do
-      after(:create) do |organisation|
-        create(:generic_clinic, team: organisation.generic_team)
-      end
+      after(:create) { |organisation| GenericClinicFactory.call(organisation:) }
     end
   end
 end