Merge branch 'next' into add-python-component-to-architecture-adoc

Author: misaka

.github/workflows/data-replication-pipeline.yml

@@ -71,12 +71,18 @@ jobs:
           if [ -z "${{ inputs.db_snapshot_arn }}" ]; then
               echo "No snapshot ARN provided, fetching the latest snapshot"
               SNAPSHOT_ARN=$(aws rds describe-db-cluster-snapshots \
-              --query 'DBClusterSnapshots[?contains(DBClusterSnapshotIdentifier, `${{ inputs.environment}}`)].[DBClusterSnapshotArn, SnapshotCreateTime]' \
+              --query "DBClusterSnapshots[?DBClusterIdentifier=='mavis-${{ inputs.environment }}'].[DBClusterSnapshotArn, SnapshotCreateTime]" \
               --output text | sort -k2 -r | head -n 1 | cut -f1)
+          
+              if [ -z "$SNAPSHOT_ARN" ]; then
+                  echo "No snapshots found for mavis-${{ inputs.environment }}"
+                  exit 1
+              fi
           else
               echo "Using provided snapshot ARN: ${{ inputs.db_snapshot_arn }}"
               SNAPSHOT_ARN="${{ inputs.db_snapshot_arn }}"
           fi
+          echo "Using snapshot ARN: $SNAPSHOT_ARN"
           echo "SNAPSHOT_ARN=$SNAPSHOT_ARN" >> $GITHUB_OUTPUT
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3

Gemfile.lock

@@ -113,18 +113,18 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1118.0)
+    aws-partitions (1.1121.0)
     aws-sdk-accessanalyzer (1.73.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.226.0)
+    aws-sdk-core (3.226.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.531.0)
+    aws-sdk-ec2 (1.533.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.104.0)
@@ -133,13 +133,13 @@ GEM
     aws-sdk-iam (1.123.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.105.0)
+    aws-sdk-kms (1.106.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.280.0)
+    aws-sdk-rds (1.281.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.190.0)
+    aws-sdk-s3 (1.191.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -414,7 +414,7 @@ GEM
       validate_url
       webfinger (~> 2.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.1)
+    ostruct (0.6.2)
     pagy (9.3.4)
     parallel (1.27.0)
     parser (3.3.8.0)
@@ -610,7 +610,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.55.1)
+    solargraph (0.55.3)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)

app/components/app_consent_table_component.rb

@@ -23,7 +23,7 @@ def consents
       patient
         .consents
         .where(programme:)
-        .includes(:consent_form, :parent)
+        .includes(:consent_form, :parent, :programme)
         .order(created_at: :desc)
   end
 end

app/components/app_patient_search_result_card_component.rb

@@ -70,7 +70,7 @@ def call
   def programme_outcome_tag
     status = @patient.vaccination_status(programme: @programme).status
     render AppProgrammeStatusTagsComponent.new(
-             { @programme => status },
+             { @programme => { status: } },
              outcome: :programme
            )
   end

app/components/app_patient_session_search_result_card_component.rb

@@ -123,7 +123,10 @@ def status_tag
           render(
             AppProgrammeStatusTagsComponent.new(
               patient_session.programmes.index_with do |programme|
-                patient.consent_status(programme:).status
+                patient.consent_status(programme:).slice(
+                  :status,
+                  :vaccine_methods
+                )
               end,
               outcome: :consent
             )
@@ -136,7 +139,7 @@ def status_tag
           render(
             AppProgrammeStatusTagsComponent.new(
               patient_session.programmes.index_with do |programme|
-                patient.triage_status(programme:).status
+                patient.triage_status(programme:).slice(:status)
               end,
               outcome: :triage
             )
@@ -149,7 +152,7 @@ def status_tag
           render(
             AppProgrammeStatusTagsComponent.new(
               patient_session.programmes.index_with do |programme|
-                patient_session.session_status(programme:).status
+                patient_session.session_status(programme:).slice(:status)
               end,
               outcome: :session
             )

app/components/app_patient_session_triage_component.html.erb

@@ -15,7 +15,10 @@
     <% end %>
 
     <% if helpers.policy(Triage).new? %>
-      <%= render AppTriageFormComponent.new(patient_session:, programme:, triage:, legend: :bold) %>
+      <%= render AppTriageFormComponent.new(
+            triage_form,
+            url: session_patient_programme_triages_path(session, patient, programme),
+          ) %>
     <% end %>
   <% elsif latest_triage %>
     <% if latest_triage.ready_to_vaccinate? %>

app/components/app_patient_session_triage_component.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class AppPatientSessionTriageComponent < ViewComponent::Base
-  def initialize(patient_session, programme:, triage:)
+  def initialize(patient_session, programme:, triage_form: nil)
     super
 
     @patient_session = patient_session
     @programme = programme
-    @triage = triage
+    @triage_form = triage_form || default_triage_form
   end
 
   def render?
@@ -15,7 +15,7 @@ def render?
 
   private
 
-  attr_reader :patient_session, :programme, :triage
+  attr_reader :patient_session, :programme, :triage_form
 
   delegate :patient, :session, to: :patient_session
 
@@ -35,6 +35,8 @@ def triage_status
         .find_by(programme:)
   end
 
+  delegate :status, to: :triage_status
+
   def latest_triage
     @latest_triage ||=
       patient
@@ -45,5 +47,5 @@ def latest_triage
         .find_by(programme:)
   end
 
-  delegate :status, to: :triage_status
+  def default_triage_form = TriageForm.new(patient_session:, programme:)
 end

app/components/app_programme_status_tags_component.rb

@@ -10,8 +10,11 @@ def initialize(programme_statuses, outcome:)
 
   def call
     safe_join(
-      programme_statuses.map do |programme, status|
-        programme_status_tag(programme, status)
+      programme_statuses.map do |programme, hash|
+        status = hash[:status]
+        vaccine_methods =
+          (hash[:vaccine_methods] if programme.has_multiple_delivery_methods?)
+        programme_status_tag(programme, status, vaccine_methods)
       end
     )
   end
@@ -20,7 +23,7 @@ def call
 
   attr_reader :programme_statuses, :outcome
 
-  def programme_status_tag(programme, status)
+  def programme_status_tag(programme, status, vaccine_methods)
     programme_tag =
       tag.strong(
         programme.name,
@@ -32,6 +35,14 @@ def programme_status_tag(programme, status)
 
     status_tag = tag.strong(label, class: "nhsuk-tag nhsuk-tag--#{colour}")
 
-    tag.p(safe_join([programme_tag, status_tag]))
+    vaccine_methods_span =
+      if vaccine_methods.present?
+        tag.span(
+          Vaccine.human_enum_name(:method, vaccine_methods.join("_")),
+          class: "nhsuk-u-secondary-text-color"
+        )
+      end
+
+    tag.p(safe_join([programme_tag, status_tag, vaccine_methods_span]))
   end
 end

app/components/app_session_actions_component.rb

@@ -49,7 +49,7 @@ def consent_row(text, status:)
     return nil if count.zero?
 
     href =
-      session_consent_path(session, search_form: { consent_status: status })
+      session_consent_path(session, search_form: { consent_statuses: [status] })
 
     {
       key: {
@@ -58,7 +58,7 @@ def consent_row(text, status:)
       value: {
         text: I18n.t("children", count:)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [{ text: "Review", visually_hidden_text: text.downcase, href: }]
     }
   end
 
@@ -79,7 +79,9 @@ def triage_required_row
       value: {
         text: I18n.t("children", count:)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [
+        { text: "Review", visually_hidden_text: "triage needed", href: }
+      ]
     }
   end
 
@@ -100,7 +102,9 @@ def register_attendance_row
       value: {
         text: I18n.t("children", count:)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [
+        { text: "Review", visually_hidden_text: "register attendance", href: }
+      ]
     }
   end
 
@@ -137,7 +141,9 @@ def ready_for_vaccinator_row
       value: {
         text: safe_join(texts, tag.br)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [
+        { text: "Review", visually_hidden_text: "ready for vaccinator", href: }
+      ]
     }
   end
 end

app/components/app_session_details_summary_component.rb

@@ -41,7 +41,7 @@ def consent_refused_row
       patient_sessions.has_consent_status(status, programme: programmes).count
 
     href =
-      session_consent_path(session, search_form: { consent_status: status })
+      session_consent_path(session, search_form: { consent_statuses: [status] })
 
     {
       key: {
@@ -50,7 +50,9 @@ def consent_refused_row
       value: {
         text: I18n.t("children", count:)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [
+        { text: "Review", visually_hidden_text: "consent refused", href: }
+      ]
     }
   end
 
@@ -78,7 +80,7 @@ def vaccinated_row
       value: {
         text: safe_join(texts, tag.br)
       },
-      actions: [{ text: "Review", href: }]
+      actions: [{ text: "Review", visually_hidden_text: "vaccinated", href: }]
     }
   end
 end