Merge pull request #5823 from nhsuk/next

Version 6.13

Author: thomasleese

.github/workflows/end-to-end-tests.yml

@@ -329,10 +329,10 @@ jobs:
           fi
         env:
           BRANCH_TO_CHECK: ${{ github.head_ref }}
-  call-functional-tests:
+  call-end-to-end-tests:
     needs: [ launch-dockerized-devimage, wait-for-task-stability, find-correct-test-branch ]
     if: ${{ !cancelled() && needs.launch-dockerized-devimage.result == 'success' && needs.wait-for-task-stability.result == 'success'}}
-    uses: NHSDigital/manage-vaccinations-in-schools-testing/.github/workflows/functional_selected_device.yaml@main
+    uses: NHSDigital/manage-vaccinations-in-schools-testing/.github/workflows/end-to-end-tests.yaml@main
     permissions:
       contents: write
     with:
@@ -343,7 +343,7 @@ jobs:
       HTTP_AUTH_TOKEN_FOR_TESTS: ${{ secrets.HTTP_AUTH_TOKEN_FOR_TESTS }}
       MAVIS_TESTING_REPO_ACCESS_TOKEN: ${{ secrets.MAVIS_TESTING_REPO_ACCESS_TOKEN }}
   stop-docker-environment:
-    needs: [ call-functional-tests, launch-dockerized-devimage, wait-for-task-stability ]
+    needs: [ call-end-to-end-tests, launch-dockerized-devimage, wait-for-task-stability ]
     if: ${{ always() && needs.launch-dockerized-devimage.result != 'skipped'}}
     runs-on: ubuntu-latest
     permissions:

Gemfile

@@ -69,6 +69,7 @@ gem "sentry-sidekiq"
 gem "sidekiq"
 gem "sidekiq-scheduler"
 gem "sidekiq-throttled"
+gem "sidekiq-unique-jobs"
 gem "splunk-sdk-ruby"
 gem "table_tennis"
 gem "tzinfo-data", platforms: %i[jruby windows]

Gemfile.lock

@@ -136,35 +136,35 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1205.0)
-    aws-sdk-accessanalyzer (1.84.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-partitions (1.1206.0)
+    aws-sdk-accessanalyzer (1.85.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.241.3)
+    aws-sdk-core (3.241.4)
       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.590.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-ec2 (1.591.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.118.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-ecr (1.119.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.139.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-iam (1.140.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.120.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-kms (1.121.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.305.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-rds (1.306.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.211.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-s3 (1.212.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -355,8 +355,8 @@ GEM
       pg (>= 0.18.1)
     jwt (3.1.2)
       base64
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.5)
@@ -678,13 +678,17 @@ GEM
       concurrent-ruby (>= 1.2.0)
       redis-prescription (~> 2.2)
       sidekiq (>= 8.0)
+    sidekiq-unique-jobs (8.0.13)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
+      sidekiq (>= 7.0.0, < 9.0.0)
+      thor (>= 1.0, < 3.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.58.1)
+    solargraph (0.58.2)
       ast (~> 2.4.3)
       backport (~> 1.2)
       benchmark (~> 0.4)
@@ -741,7 +745,7 @@ GEM
     tilt (2.7.0)
     timeout (0.6.0)
     tsort (0.2.0)
-    turbo-rails (2.0.20)
+    turbo-rails (2.0.21)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
@@ -890,6 +894,7 @@ DEPENDENCIES
   sidekiq
   sidekiq-scheduler
   sidekiq-throttled
+  sidekiq-unique-jobs
   simplecov
   solargraph
   solargraph-rails

app/components/app_patient_search_result_card_component.rb

@@ -105,8 +105,6 @@ def call
            to: :helpers
 
   def programme_status_tag
-    return if programmes.empty?
-
     status_by_programme =
       programmes.each_with_object({}) do |programme, hash|
         resolved_status =
@@ -119,6 +117,8 @@ def programme_status_tag
         hash[resolved_status.fetch(:prefix)] = resolved_status
       end
 
+    return if status_by_programme.empty?
+
     render AppAttachedTagsComponent.new(status_by_programme)
   end
 

app/components/app_programme_session_table_component.rb

@@ -18,8 +18,8 @@ def cohort_count(session:)
   end
 
   def no_response_scope(session:)
-    patients(session:).has_consent_status(
-      :no_response,
+    patients(session:).has_programme_status(
+      "needs_consent_no_response",
       programme:,
       academic_year:
     )
@@ -38,8 +38,8 @@ def no_response_percentage(session:)
 
   def triage_needed_count(session:)
     format_number(
-      patients(session:).has_triage_status(
-        :required,
+      patients(session:).has_programme_status(
+        "needs_triage",
         programme:,
         academic_year:
       ).count

app/components/app_session_actions_component.rb

@@ -72,8 +72,8 @@ def no_consent_response_row
 
   def conflicting_consent_row
     count =
-      patients.has_consent_status(
-        "conflicts",
+      patients.has_programme_status(
+        "has_refusal_consent_conflicts",
         programme: programmes,
         academic_year:
       ).count
@@ -90,8 +90,8 @@ def conflicting_consent_row
 
   def triage_required_row
     count =
-      patients.has_triage_status(
-        "required",
+      patients.has_programme_status(
+        "needs_triage",
         programme: programmes,
         academic_year:
       ).count

app/components/app_vaccination_record_summary_component.rb

@@ -154,6 +154,13 @@ def call
           summary_list.with_row do |row|
             row.with_key { "Dose number" }
             row.with_value { dose_number_value }
+            if (href = @change_links[:dose_sequence])
+              row.with_action(
+                text: "Change",
+                href:,
+                visually_hidden_text: "dose number"
+              )
+            end
           end
         end
       end
@@ -218,6 +225,13 @@ def call
         summary_list.with_row do |row|
           row.with_key { "Vaccinator" }
           row.with_value { vaccinator_value }
+          if (href = @change_links[:vaccinator])
+            row.with_action(
+              text: "Change",
+              visually_hidden_text: "vaccinator",
+              href:
+            )
+          end
         end
       end
 

app/controllers/draft_vaccination_records_controller.rb

@@ -37,6 +37,8 @@ def update
       handle_date_and_time
     when :outcome
       handle_outcome
+    when :location
+      handle_location
     when :batch
       handle_batch
     when :confirm
@@ -98,6 +100,22 @@ def handle_batch
     end
   end
 
+  def handle_location
+    if @draft_vaccination_record.bulk_upload_user_and_record?
+      parsed_location_id =
+        (
+          if update_params[:location_id] == "unknown"
+            nil
+          else
+            update_params[:location_id]
+          end
+        )
+      @draft_vaccination_record.location_id = parsed_location_id
+      @draft_vaccination_record.location_name =
+        (@draft_vaccination_record.location_id.present? ? nil : "Unknown")
+    end
+  end
+
   def handle_confirm
     return unless @draft_vaccination_record.save
 
@@ -161,6 +179,7 @@ def update_params
       date_and_time: %i[performed_at],
       delivery: %i[delivery_site delivery_method],
       dose: %i[full_dose],
+      dose_sequence: %i[dose_sequence],
       identity: %i[
         identity_check_confirmed_by_patient
         identity_check_confirmed_by_other_name
@@ -169,7 +188,8 @@ def update_params
       location: %i[location_id],
       notes: %i[notes],
       outcome: %i[outcome],
-      supplier: %i[supplied_by_user_id]
+      supplier: %i[supplied_by_user_id],
+      vaccinator: %i[performed_by_given_name performed_by_family_name]
     }.fetch(current_step)
 
     params
@@ -222,7 +242,12 @@ def set_batches
   end
 
   def set_locations
-    @locations = policy_scope(Location).community_clinic
+    @locations =
+      if @draft_vaccination_record.bulk_upload_user_and_record?
+        Location.school.where(status: "open").order(:name)
+      else
+        policy_scope(Location).community_clinic
+      end
   end
 
   def set_supplied_by_users

app/controllers/sessions/patient_specific_directions_controller.rb

@@ -66,16 +66,15 @@ def patients_allowed_psd
     @patients_allowed_psd ||=
       @session
         .patients
-        .has_consent_status(
-          "given",
+        .has_programme_status(
+          "due",
           programme: @programme,
-          academic_year: @session.academic_year,
-          vaccine_method: "nasal"
+          academic_year: @session.academic_year
         )
-        .has_triage_status(
-          "not_required",
+        .has_vaccine_criteria(
           programme: @programme,
-          academic_year: @session.academic_year
+          academic_year: @session.academic_year,
+          vaccine_methods: [%w[nasal], %w[nasal injection]]
         )
         .without_patient_specific_direction(
           programme: @programme,

app/helpers/parents_helper.rb

@@ -14,14 +14,17 @@ def format_parents_with_relationships(parent_relationships)
   def format_parent_with_relationship(parent_relationship, include_phone: true)
     parent = parent_relationship.parent
 
-    [
-      parent_relationship.label_with_parent,
-      if (email = parent.email).present?
-        tag.span(email, class: "nhsuk-u-secondary-text-colour")
-      end,
-      if include_phone && (phone = parent.phone).present?
-        tag.span(phone, class: "nhsuk-u-secondary-text-colour")
-      end
-    ].compact.join(tag.br).html_safe
+    safe_join(
+      [
+        parent_relationship.label_with_parent,
+        if (email = parent.email).present?
+          tag.span(email, class: "nhsuk-u-secondary-text-colour")
+        end,
+        if include_phone && (phone = parent.phone).present?
+          tag.span(phone, class: "nhsuk-u-secondary-text-colour")
+        end
+      ].compact,
+      tag.br
+    )
   end
 end