Merge pull request #5300 from nhsuk/next

Version 6.1.0

Author: thomasleese

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors.git
-  revision: 5b9ce7840d04270e99f4f0cb03989e05437326a6
+  revision: d6f66fd2519368553942769aa7b5a91ce698e91f
   specs:
     capybara_accessible_selectors (0.15.0)
       capybara (~> 3.36)
@@ -115,34 +115,34 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1186.0)
-    aws-sdk-accessanalyzer (1.81.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-partitions (1.1187.0)
+    aws-sdk-accessanalyzer (1.82.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.239.0)
+    aws-sdk-core (3.239.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.579.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-ec2 (1.582.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.114.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.134.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-iam (1.136.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.117.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
     aws-sdk-rds (1.299.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.203.1)
+    aws-sdk-s3 (1.205.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

app/components/app_activity_log_component.rb

@@ -21,7 +21,7 @@ def initialize(team:, patient:, session: nil)
       @patient.archive_reasons.where(team:).includes(:created_by)
 
     @attendance_records =
-      (patient || patient_session)
+      patient
         .attendance_records
         .includes(:location)
         .then do |scope|
@@ -35,11 +35,10 @@ def initialize(team:, patient:, session: nil)
           :consent_form,
           :parent,
           :recorded_by,
-          :programme,
           patient: :parent_relationships
         )
         .then do |scope|
-          session ? scope.where(programme: session.programmes) : scope
+          session ? scope.where(programme_type: session.programme_types) : scope
         end
 
     @gillick_assessments =
@@ -52,15 +51,19 @@ def initialize(team:, patient:, session: nil)
     @notes =
       @patient
         .notes
-        .includes(:created_by, :patient, session: :programmes)
+        .includes(:created_by, :patient, :session)
         .then { |scope| session ? scope.where(session:) : scope }
 
     @notify_log_entries =
       @patient
         .notify_log_entries
         .includes(:sent_by)
         .then do |scope|
-          session ? scope.where(programme_ids: session.programmes.ids) : scope
+          if session
+            scope.where(programme_types: session.programme_types)
+          else
+            scope
+          end
         end
 
     @patient_locations =
@@ -76,7 +79,7 @@ def initialize(team:, patient:, session: nil)
         .patient_specific_directions
         .includes(:created_by)
         .then do |scope|
-          session ? scope.where(programme: session.programmes) : scope
+          session ? scope.where(programme_type: session.programme_types) : scope
         end
 
     @pre_screenings =
@@ -90,7 +93,7 @@ def initialize(team:, patient:, session: nil)
         .triages
         .includes(:performed_by)
         .then do |scope|
-          session ? scope.where(programme: session.programmes) : scope
+          session ? scope.where(programme_type: session.programme_types) : scope
         end
 
     @vaccination_records =
@@ -429,17 +432,17 @@ def attendance_events
   end
 
   def programmes_for(object)
-    if object.respond_to?(:programme_ids)
-      object.programme_ids.map { programmes_by_id.fetch(it) }
-    elsif object.respond_to?(:programme_id)
-      [programmes_by_id.fetch(object.programme_id)]
+    if object.respond_to?(:programme_types)
+      object.programme_types.map { programmes_by_type.fetch(it) }
+    elsif object.respond_to?(:programme_type)
+      [programmes_by_type.fetch(object.programme_type)]
     else
       object.programmes
     end
   end
 
-  def programmes_by_id
-    @programmes_by_id ||= Programme.all.index_by(&:id)
+  def programmes_by_type
+    @programmes_by_type ||= Programme.all.index_by(&:type)
   end
 
   private

app/components/app_consent_confirmation_component.rb

@@ -62,20 +62,18 @@ def refused_vaccinations = vaccinations_text(refused_consent_form_programmes)
 
   def vaccinations_text(consent_form_programmes)
     programme_names =
-      consent_form_programmes
-        .includes(:programme)
-        .map do |consent_form_programme|
-          programme = consent_form_programme.programme
-
-          if programme.has_multiple_vaccine_methods?
-            vaccine_method = consent_form_programme.vaccine_methods.first
-            method_prefix =
-              Vaccine.human_enum_name(:method_prefix, vaccine_method)
-            "#{method_prefix} #{programme.name_in_sentence}".lstrip
-          else
-            programme.name_in_sentence
-          end
+      consent_form_programmes.map do |consent_form_programme|
+        programme = consent_form_programme.programme
+
+        if programme.has_multiple_vaccine_methods?
+          vaccine_method = consent_form_programme.vaccine_methods.first
+          method_prefix =
+            Vaccine.human_enum_name(:method_prefix, vaccine_method)
+          "#{method_prefix} #{programme.name_in_sentence}".lstrip
+        else
+          programme.name_in_sentence
         end
+      end
 
     "#{programme_names.to_sentence} vaccination".pluralize(
       programme_names.count

app/components/app_consent_form_card_component.rb

@@ -12,9 +12,7 @@ def call
       govuk_summary_list do |summary_list|
         summary_list.with_row do |row|
           row.with_key { "Programmes" }
-          row.with_value do
-            render AppProgrammeTagsComponent.new(@consent_form.programmes)
-          end
+          row.with_value { render AppProgrammeTagsComponent.new(programmes) }
         end
 
         summary_list.with_row do |row|
@@ -41,6 +39,10 @@ def call
 
   delegate :govuk_summary_list, to: :helpers
 
+  def programmes
+    @consent_form.consent_form_programmes.map(&:programme)
+  end
+
   def refusal_reason
     {
       title: @consent_form.human_enum_name(:reason_for_refusal),

app/components/app_gillick_assessment_component.rb

@@ -19,7 +19,8 @@ def gillick_assessment
         .gillick_assessments
         .order(created_at: :desc)
         .for_session(session)
-        .find_by(programme:)
+        .where_programme(programme)
+        .first
   end
 
   def can_assess?

app/components/app_patient_programmes_table_component.rb

@@ -76,8 +76,8 @@ def notes_for_programme(programme:, academic_year:)
 
   def vaccination_status_hash(programme:, academic_year:)
     @vaccination_status_hash ||= {}
-    @vaccination_status_hash[programme.id] ||= {}
-    @vaccination_status_hash[programme.id][
+    @vaccination_status_hash[programme.type] ||= {}
+    @vaccination_status_hash[programme.type][
       academic_year
     ] ||= PatientStatusResolver.new(
       patient,

app/components/app_patient_search_result_card_component.rb

@@ -138,7 +138,7 @@ def status_tag(type)
 
   def status_resolver_for(programme)
     @status_resolver_for ||= {}
-    @status_resolver_for[programme.id] ||= PatientStatusResolver.new(
+    @status_resolver_for[programme.type] ||= PatientStatusResolver.new(
       patient,
       programme:,
       academic_year:

app/components/app_patient_session_consent_component.rb

@@ -14,7 +14,7 @@ def latest_consent_request
       patient
         .consent_notifications
         .request
-        .has_programme(programme)
+        .has_all_programmes_of([programme])
         .joins(:session)
         .where(session: { academic_year: })
         .order(sent_at: :desc)
@@ -25,8 +25,9 @@ def consents
     @consents ||=
       patient
         .consents
-        .where(academic_year:, programme:)
-        .includes(:consent_form, :parent, :programme)
+        .where_programme(programme)
+        .where(academic_year:)
+        .includes(:consent_form, :parent)
         .order(created_at: :desc)
   end
 
@@ -47,7 +48,11 @@ def can_send_consent_request?
 
   def grouped_consents
     @grouped_consents ||=
-      ConsentGrouper.call(consents, programme_id: programme.id, academic_year:)
+      ConsentGrouper.call(
+        consents,
+        programme_type: programme.type,
+        academic_year:
+      )
   end
 
   def who_refused

app/components/app_patient_session_record_component.rb

@@ -44,7 +44,8 @@ def vaccination_record
   end
 
   def default_vaccinate_form
-    pre_screening_confirmed = patient.pre_screenings.today.exists?(programme:)
+    pre_screening_confirmed =
+      patient.pre_screenings.today.where_programme(programme).exists?
 
     VaccinateForm.new(
       current_user:,

app/components/app_patient_session_search_result_card_component.rb

@@ -270,10 +270,10 @@ def note_to_log_event(note)
   end
 
   def has_patient_specific_direction?
-    programme_ids = programmes.map(&:id)
+    programme_types = programmes.map(&:type)
     patient.patient_specific_directions.any? do
-      it.programme_id.in?(programme_ids) && it.academic_year == academic_year &&
-        !it.invalidated?
+      it.programme_type.in?(programme_types) &&
+        it.academic_year == academic_year && !it.invalidated?
     end
   end