Changes for 1.5.0 (#2962)

The plan is to deploy 1.4.0 to production on Monday (17th), so we're in
a position where we can get the changes for 1.5.0 ready to merge in to
`main`.

This branch represents all the work that was done for 1.5.0 (also
visible using [the
milestone](https://github.com/nhsuk/manage-vaccinations-in-schools/milestone/5?closed=1))
which was necessary as we hadn't yet deployed the previous release and
wants to leave `main` open for any last minute fixes that needed to be
added to 1.4.0.

Author: thomasleese

Gemfile

@@ -43,7 +43,6 @@ gem "govuk_design_system_formbuilder"
 gem "govuk_markdown"
 gem "jsonb_accessor"
 gem "jwt"
-gem "mail-notify"
 gem "notifications-ruby-client"
 gem "okcomputer"
 gem "omniauth_openid_connect"

Gemfile.lock

@@ -116,14 +116,15 @@ GEM
     ast (2.4.2)
     attr_required (1.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1044.0)
+    aws-partitions (1.1049.0)
     aws-sdk-accessanalyzer (1.65.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.217.1)
+    aws-sdk-core (3.218.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-ec2 (1.503.0)
       aws-sdk-core (~> 3, >= 3.216.0)
@@ -137,8 +138,8 @@ GEM
     aws-sdk-kms (1.97.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.264.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-rds (1.269.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.178.0)
       aws-sdk-core (~> 3, >= 3.216.0)
@@ -281,7 +282,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     hashie (5.0.0)
     hotwire-livereload (2.0.0)
       actioncable (>= 7.0.0)
@@ -339,13 +340,6 @@ GEM
       net-imap
       net-pop
       net-smtp
-    mail-notify (2.0.0)
-      actionmailer (>= 5.2.8.1)
-      actionpack (>= 5.2.8.1)
-      actionview (>= 5.2.8.1)
-      activesupport (>= 5.2.8.1)
-      notifications-ruby-client (~> 6.0)
-      rack (>= 2.1.4.1)
     marcel (1.0.4)
     matrix (0.4.2)
     mechanize (2.14.0)
@@ -375,7 +369,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    net-imap (0.5.2)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -424,7 +418,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
-    phonelib (0.10.3)
+    phonelib (0.10.4)
     pp (0.6.2)
       prettyprint
     prettier_print (1.2.1)
@@ -518,7 +512,7 @@ GEM
       railties (>= 5.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.3.9)
+    rexml (3.4.0)
     rladr (1.2.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -622,7 +616,7 @@ GEM
       activesupport
       solargraph
     splunk-sdk-ruby (1.0.5)
-    stackprof (0.2.26)
+    stackprof (0.2.27)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.2)
@@ -676,7 +670,7 @@ GEM
       activesupport
       faraday (~> 2.0)
       faraday-follow_redirects
-    webmock (3.24.0)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -746,7 +740,6 @@ DEPENDENCIES
   jsbundling-rails
   jsonb_accessor
   jwt
-  mail-notify
   mechanize
   notifications-ruby-client
   okcomputer

app/components/app_activity_log_component.rb

@@ -28,26 +28,39 @@ def initialize(patient: nil, patient_session: nil)
       patient_session ? [patient_session] : patient.patient_sessions
 
     @consents =
-      (patient || patient_session).consents.includes(
+      @patient.consents.includes(
         :consent_form,
         :parent,
         :recorded_by,
         patient: :parent_relationships
       )
+
     @gillick_assessments =
       (patient || patient_session).gillick_assessments.includes(:performed_by)
+
     @notify_log_entries = @patient.notify_log_entries.includes(:sent_by)
+
     @pre_screenings =
       (patient || patient_session).pre_screenings.includes(:performed_by)
+
     @session_attendances =
       (patient || patient_session).session_attendances.includes(:location)
-    @triages = (patient || patient_session).triages.includes(:performed_by)
+
+    @triages = @patient.triages.includes(:performed_by)
+
     @vaccination_records =
-      (patient || patient_session).vaccination_records.with_discarded.includes(
+      @patient.vaccination_records.with_discarded.includes(
         :performed_by_user,
         :programme,
         :vaccine
       )
+
+    if (programme = patient_session&.programmes&.first) # TODO: handle multiple programmes
+      @consents = @consents.where(programme:)
+      @gillick_assessments = @gillick_assessments.where(programme:)
+      @triages = @triages.where(programme:)
+      @vaccination_records = @vaccination_records.where(programme:)
+    end
   end
 
   attr_reader :patient,
@@ -150,7 +163,7 @@ def notify_events
     notify_log_entries.map do
       {
         title: "#{_1.title} sent",
-        body: patient.restricted? ? "" : _1.recipient,
+        body: patient.restricted? ? "" : _1.recipient_deterministic,
         at: _1.created_at,
         by: _1.sent_by
       }

app/components/app_consent_component.rb

@@ -14,8 +14,13 @@ def initialize(patient_session:, section:, tab:)
   delegate :patient, to: :patient_session
   delegate :session, to: :patient_session
 
+  def programme
+    patient_session.programmes.first # TODO: handle multiple programmes
+  end
+
   def consents
-    @consents ||= patient_session.consents.sort_by(&:created_at).reverse
+    @consents ||=
+      patient_session.consents(programme:).sort_by(&:created_at).reverse
   end
 
   def latest_consent_request

app/components/app_import_format_details_component.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 class AppImportFormatDetailsComponent < ViewComponent::Base
-  def initialize(import:, programme: nil)
+  def initialize(import:)
     super
 
     @import = import
-    @programme = programme
   end
 
   private
 
+  delegate :organisation, to: :@import
+
   def summary_text
     case @import
     when ClassImport
@@ -86,7 +87,9 @@ def immunisation_import_columns
       { name: "PERSON_SURNAME", notes: tag.strong("Required") },
       {
         name: "PERSON_DOB",
-        notes: "#{tag.strong("Required")}, must use #{tag.i("YYYYMMDD")} format"
+        notes:
+          "#{tag.strong("Required")}, must use either #{tag.i("YYYYMMDD")} or " \
+            "#{tag.i("DD/MM/YYYY")} format"
       },
       {
         name: "PERSON_GENDER_CODE",
@@ -101,7 +104,9 @@ def immunisation_import_columns
       },
       {
         name: "DATE_OF_VACCINATION",
-        notes: "#{tag.strong("Required")}, must use #{tag.i("YYYYMMDD")} format"
+        notes:
+          "#{tag.strong("Required")}, must use either #{tag.i("YYYYMMDD")} or " \
+            "#{tag.i("DD/MM/YYYY")} format"
       },
       {
         name: "TIME_OF_VACCINATION",
@@ -110,8 +115,8 @@ def immunisation_import_columns
       {
         name: "VACCINE_GIVEN",
         notes:
-          "Required if #{tag.code("VACCINATED")} is #{tag.i("Y")}, must be " +
-            @programme
+          "#{tag.strong("Required")}, must be " +
+            organisation
               .vaccines
               .pluck(:nivs_name)
               .map { tag.i(_1) }
@@ -127,7 +132,8 @@ def immunisation_import_columns
       {
         name: "BATCH_EXPIRY_DATE",
         notes:
-          "Required if #{tag.code("VACCINATED")} is #{tag.i("Y")}, must use #{tag.i("YYYYMMDD")} format"
+          "Required if #{tag.code("VACCINATED")} is #{tag.i("Y")}, must use " \
+            "either #{tag.i("YYYYMMDD")} or #{tag.i("DD/MM/YYYY")} format"
       },
       {
         name: "VACCINATED",
@@ -239,8 +245,6 @@ def anatomical_site
   end
 
   def dose_sequence
-    return [] unless @programme.hpv?
-
     [
       {
         name: "DOSE_SEQUENCE",

app/components/app_imports_table_component.html.erb

@@ -22,7 +22,7 @@
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Imported on</span>
             <%= govuk_link_to import.created_at.to_fs(:long),
-                              path(programme, import) %>
+                              path(import) %>
           <% end %>
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Imported by</span>

app/components/app_imports_table_component.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class AppImportsTableComponent < ViewComponent::Base
-  def initialize(organisation:, programme:)
+  def initialize(organisation:)
     super
 
     @organisation = organisation
-    @programme = programme
   end
 
   def render?
@@ -14,7 +13,7 @@ def render?
 
   private
 
-  attr_reader :organisation, :programme
+  attr_reader :organisation
 
   def imports
     @imports ||=
@@ -27,7 +26,7 @@ def imports
   def class_import_records
     ClassImport
       .select("class_imports.*", "COUNT(patients.id) AS record_count")
-      .where(organisation:, session: programme.sessions)
+      .where(organisation:)
       .left_outer_joins(:patients)
       .includes(:uploaded_by, session: :location)
       .group("class_imports.id")
@@ -36,7 +35,7 @@ def class_import_records
   def cohort_import_records
     CohortImport
       .select("cohort_imports.*", "COUNT(patients.id) AS record_count")
-      .where(organisation:, programme:)
+      .where(organisation:)
       .left_outer_joins(:patients)
       .includes(:uploaded_by)
       .group("cohort_imports.id")
@@ -48,19 +47,19 @@ def immunisation_import_records
         "immunisation_imports.*",
         "COUNT(vaccination_records.id) AS record_count"
       )
-      .where(organisation:, programme:)
+      .where(organisation:)
       .left_outer_joins(:vaccination_records)
       .includes(:uploaded_by)
       .group("immunisation_imports.id")
   end
 
-  def path(programme, import)
+  def path(import)
     if import.is_a?(ClassImport)
       session_class_import_path(import.session, import)
     elsif import.is_a?(CohortImport)
-      programme_cohort_import_path(programme, import)
+      cohort_import_path(import)
     else
-      programme_immunisation_import_path(programme, import)
+      immunisation_import_path(import)
     end
   end
 

app/components/app_outcome_banner_component.rb

@@ -48,18 +48,14 @@ def rows
 
   def vaccination_record
     @vaccination_record ||=
-      if @patient_session.vaccinated?
-        @patient_session
-          .vaccination_records
-          .select(&:administered?)
-          .max_by(&:created_at)
-      else
-        @patient_session.latest_vaccination_record
-      end
+      @patient_session
+        .vaccination_records(programme:)
+        .then { @patient_session.vaccinated? ? it.select(&:administered?) : it }
+        .last
   end
 
   def triage
-    @triage ||= @patient_session.latest_triage
+    @triage ||= @patient_session.latest_triage(programme:)
   end
 
   def show_location?
@@ -126,4 +122,8 @@ def heading
   def colour
     I18n.t("patient_session_statuses.#{status}.colour")
   end
+
+  def programme
+    @patient_session.programmes.first # TODO: handle multiple programmes
+  end
 end

app/components/app_patient_cohort_table_component.html.erb

@@ -1,4 +1,4 @@
-<% if cohort %>
+<% if organisation %>
   <%= govuk_table(html_attributes: {
                     class: "nhsuk-table-responsive",
                   }) do |table| %>
@@ -13,12 +13,12 @@
       <% body.with_row do |row| %>
         <% row.with_cell do %>
           <span class="nhsuk-table-responsive__heading">Name</span>
-          <%= helpers.format_year_group(cohort.year_group) %>
+          <%= helpers.format_year_group(year_group) %>
         <% end %>
         <% row.with_cell do %>
           <span class="nhsuk-table-responsive__heading">Actions</span>
           <%= form_with model: @patient, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
-            <%= f.hidden_field :cohort_id, value: "" %>
+            <%= f.hidden_field :organisation_id, value: "" %>
             <%= f.govuk_submit "Remove from cohort", class: "app-button--secondary-warning app-button--small" %>
           <% end %>
         <% end %>

app/components/app_patient_cohort_table_component.rb

@@ -11,5 +11,5 @@ def initialize(patient)
 
   attr_reader :patient
 
-  delegate :cohort, to: :patient
+  delegate :organisation, :year_group, to: :patient
 end