Merge pull request #4665 from nhsuk/next

Version 4.2.2

Author: thomasleese

Gemfile.lock

@@ -113,7 +113,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1159.0)
+    aws-partitions (1.1161.0)
     aws-sdk-accessanalyzer (1.78.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
@@ -125,7 +125,7 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.556.0)
+    aws-sdk-ec2 (1.557.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.110.0)
@@ -387,9 +387,9 @@ GEM
       net-protocol
     nio4r (2.7.4)
     nkf (0.2.0)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     notifications-ruby-client (6.2.0)
       jwt (>= 1.5, < 3)
@@ -433,7 +433,7 @@ GEM
       prettyprint
     prettier_print (1.2.1)
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.5.1)
     propshaft (1.2.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -513,7 +513,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.6.1)
+    rbs (3.9.5)
       logger
     rdoc (6.14.2)
       erb
@@ -522,15 +522,15 @@ GEM
     redis-client (0.25.2)
       connection_pool
     redis-prescription (2.6.0)
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.2)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.2)
+    rexml (3.4.4)
     rladr (1.2.0)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
@@ -645,7 +645,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.56.2)
+    solargraph (0.57.0)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)
@@ -658,16 +658,17 @@ GEM
       ostruct (~> 0.6)
       parser (~> 3.0)
       prism (~> 1.4)
-      rbs (~> 3.6.1)
+      rbs (>= 3.6.1, <= 4.0.0.dev.4)
       reverse_markdown (~> 3.0)
-      rubocop (~> 1.38)
+      rubocop (~> 1.76)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+      yard-activesupport-concern (~> 0.0)
       yard-solargraph (~> 0.1)
-    solargraph-rails (1.2.3)
+    solargraph-rails (1.2.4)
       activesupport
-      solargraph (>= 0.48.0, < 0.57)
+      solargraph (>= 0.48.0, <= 0.57)
     splunk-sdk-ruby (1.0.5)
     stackprof (0.2.27)
     stringio (3.1.7)
@@ -704,9 +705,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uk_postcode (2.1.8)
-    unicode-display_width (3.1.5)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
@@ -744,6 +745,8 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.37)
+    yard-activesupport-concern (0.0.1)
+      yard (>= 0.8)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
     zeitwerk (2.7.3)

app/components/app_activity_log_component.rb

@@ -63,12 +63,13 @@ def initialize(team:, patient:, session: nil)
           session ? scope.where(programme_ids: session.programmes.ids) : scope
         end
 
-    @patient_sessions =
+    @patient_locations =
       @patient
-        .patient_sessions
-        .includes_programmes
-        .includes(session: :location)
-        .then { |scope| session ? scope.where(session:) : scope }
+        .patient_locations
+        .includes(:location)
+        .then do |scope|
+          session ? scope.where(location: session.location) : scope
+        end
 
     @patient_specific_directions =
       @patient
@@ -105,7 +106,7 @@ def initialize(team:, patient:, session: nil)
               :notes,
               :notify_log_entries,
               :patient,
-              :patient_sessions,
+              :patient_locations,
               :patient_specific_directions,
               :pre_screenings,
               :attendance_records,
@@ -346,15 +347,11 @@ def pre_screening_events
   end
 
   def session_events
-    patient_sessions.map do |patient_session|
-      patient = patient_session.patient
-      session = patient_session.session
-
+    patient_locations.map do |patient_location|
       [
         {
-          title: "Added to the session at #{session.location.name}",
-          at: patient_session.created_at,
-          programmes: session.programmes_for(patient:)
+          title: "Added to the session at #{patient_location.location.name}",
+          at: patient_location.created_at
         }
       ]
     end

app/components/app_imports_navigation_component.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 class AppImportsNavigationComponent < ViewComponent::Base
-  def initialize(active:)
+  def initialize(active:, team:)
     @active = active
+    @team = team
   end
 
   def call
@@ -31,18 +32,22 @@ def call
 
   private
 
-  attr_reader :active
+  attr_reader :active, :team
 
-  delegate :import_issues_count, :policy, :policy_scope, to: :helpers
+  delegate :policy, :policy_scope, to: :helpers
 
   def issues_text
-    safe_join(
-      ["Import issues", " ", render(AppCountComponent.new(import_issues_count))]
-    )
+    count = TeamCachedCounts.new(team).import_issues
+    text_with_count("Import issues", count)
   end
 
   def notices_text
     count = ImportantNotices.call(patient_scope: policy_scope(Patient)).length
-    safe_join(["Important notices", " ", render(AppCountComponent.new(count))])
+
+    text_with_count("Important notices", count)
+  end
+
+  def text_with_count(text, count)
+    safe_join([text, " ", render(AppCountComponent.new(count))])
   end
 end

app/components/app_patient_pds_discrepancy_table_component.rb

@@ -12,9 +12,7 @@ def initialize(discrepancies:, current_user:)
 
   delegate :format_nhs_number, :govuk_table, to: :helpers
 
-  def can_link_to?(record)
-    allowed_ids.include?(record.id)
-  end
+  def can_link_to?(record) = allowed_ids.include?(record.id)
 
   def allowed_ids
     @allowed_ids ||= PatientPolicy::Scope.new(current_user, Patient).resolve.ids

app/components/app_patient_programmes_table_component.rb

@@ -258,7 +258,7 @@ def vaccination_records_for(programme:, academic_year: nil)
   end
 
   def eligible_year_groups_for(programme:)
-    location_ids = patient.patient_sessions.joins(:session).select(:location_id)
+    location_ids = patient.patient_locations.select(:location_id)
 
     LocationProgrammeYearGroup
       .where(location_id: location_ids)

app/components/app_programme_session_table_component.rb

@@ -1,23 +1,28 @@
 # frozen_string_literal: true
 
 class AppProgrammeSessionTableComponent < ViewComponent::Base
-  def initialize(sessions, programme:)
+  def initialize(sessions, programme:, academic_year:)
     @sessions = sessions
     @programme = programme
+    @academic_year = academic_year
   end
 
   private
 
-  attr_reader :sessions, :programme
+  attr_reader :sessions, :programme, :academic_year
 
   delegate :govuk_table, to: :helpers
 
   def cohort_count(session:)
-    format_number(patient_sessions(session:).count)
+    format_number(patients(session:).count)
   end
 
   def no_response_scope(session:)
-    patient_sessions(session:).has_consent_status(:no_response, programme:)
+    patients(session:).has_consent_status(
+      :no_response,
+      programme:,
+      academic_year:
+    )
   end
 
   def no_response_count(session:)
@@ -27,13 +32,17 @@ def no_response_count(session:)
   def no_response_percentage(session:)
     format_percentage(
       no_response_scope(session:).count,
-      patient_sessions(session:).count
+      patients(session:).count
     )
   end
 
   def triage_needed_count(session:)
     format_number(
-      patient_sessions(session:).has_triage_status(:required, programme:).count
+      patients(session:).has_triage_status(
+        :required,
+        programme:,
+        academic_year:
+      ).count
     )
   end
 
@@ -48,15 +57,22 @@ def vaccinated_count(session:)
   def vaccinated_percentage(session:)
     format_percentage(
       vaccinated_scope(session:).count,
-      patient_sessions(session:).count
+      patients(session:).count
+    )
+  end
+
+  def patients(session:)
+    @patients ||= {}
+    @patients[session] = session.patients.where(
+      birth_academic_year: birth_academic_years(session:)
     )
   end
 
-  def patient_sessions(session:)
-    session
-      .patient_sessions
-      .joins(:patient, :session)
-      .appear_in_programmes([programme])
+  def birth_academic_years(session:)
+    @birth_academic_years ||= {}
+    @birth_academic_years[session] = session.programme_birth_academic_years[
+      programme
+    ]
   end
 
   def format_number(count) = count.to_s

app/components/app_session_actions_component.rb

@@ -19,12 +19,7 @@ def render? = rows.any?
   delegate :govuk_summary_list, to: :helpers
   delegate :academic_year, :programmes, to: :session
 
-  def patient_sessions
-    session
-      .patient_sessions
-      .joins(:patient, :session)
-      .appear_in_programmes(programmes)
-  end
+  def patients = session.patients
 
   def rows
     @rows ||= [
@@ -38,16 +33,15 @@ def rows
   end
 
   def no_nhs_number_row
-    count = patient_sessions.merge(Patient.without_nhs_number).count
+    count = patients.without_nhs_number.count
     href = session_patients_path(session, missing_nhs_number: true)
 
     generate_row(:children_without_nhs_number, count:, href:)
   end
 
   def no_consent_response_row
     status = "no_response"
-    count =
-      patient_sessions.has_consent_status(status, programme: programmes).count
+    count = session.patients_with_no_consent_response_count
     href = session_consent_path(session, consent_statuses: [status])
     actions = [
       {
@@ -61,7 +55,11 @@ def no_consent_response_row
   def conflicting_consent_row
     status = "conflicts"
     count =
-      patient_sessions.has_consent_status(status, programme: programmes).count
+      patients.has_consent_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
     href = session_consent_path(session, consent_statuses: [status])
 
     generate_row(:children_with_conflicting_consent_response, count:, href:)
@@ -70,7 +68,11 @@ def conflicting_consent_row
   def triage_required_row
     status = "required"
     count =
-      patient_sessions.has_triage_status(status, programme: programmes).count
+      patients.has_triage_status(
+        status,
+        programme: programmes,
+        academic_year:
+      ).count
     href = session_triage_path(session, triage_status: status)
 
     generate_row(:children_requiring_triage, count:, href:)
@@ -80,7 +82,7 @@ def register_attendance_row
     return nil unless session.requires_registration? && session.today?
 
     status = "unknown"
-    count = patient_sessions.has_registration_status(status).count
+    count = patients.has_registration_status(status, session:).count
     href = session_register_path(session, register_status: status)
 
     generate_row(:children_to_register, count:, href:)
@@ -91,13 +93,11 @@ def ready_for_vaccinator_row
 
     counts_by_programme =
       session.programmes.index_with do |programme|
-        patient_sessions
-          .has_registration_status(%w[attending completed])
-          .includes(
-            patient: %i[consent_statuses triage_statuses vaccination_statuses]
-          )
-          .count do |patient_session|
-            patient_session.patient.consent_given_and_safe_to_vaccinate?(
+        patients
+          .has_registration_status(%w[attending completed], session:)
+          .includes(:consent_statuses, :triage_statuses, :vaccination_statuses)
+          .count do |patient|
+            patient.consent_given_and_safe_to_vaccinate?(
               programme:,
               academic_year:
             )