Merge pull request #4240 from nhsuk/next

Version 2.16

Author: thomasleese

.github/workflows/build-and-push-image.yml

@@ -105,7 +105,7 @@ jobs:
         aws-role: ${{ fromJSON(needs.define-matrix.outputs.aws-roles) }}
     steps:
       - name: Download Docker image
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: image
       - name: Configure AWS Credentials

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

@@ -197,7 +197,7 @@ jobs:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: tfplan_infrastructure-${{ inputs.environment }}
           path: ${{ runner.temp }}

.github/workflows/deploy-application.yml

@@ -99,7 +99,7 @@ jobs:
       id-token: write
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: DEPLOYMENT_ENVS-${{ inputs.environment }}
           path: ${{ runner.temp }}
@@ -132,7 +132,7 @@ jobs:
       id-token: write
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: DEPLOYMENT_ENVS-${{ inputs.environment }}
           path: ${{ runner.temp }}

.github/workflows/deploy-backup-infrastructure.yml

@@ -80,7 +80,7 @@ jobs:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: tfplan_infrastructure-${{ inputs.environment }}
           path: ${{ runner.temp }}

.github/workflows/deploy-infrastructure.yml

@@ -111,7 +111,7 @@ jobs:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: tfplan_infrastructure-${{ inputs.environment }}
           path: ${{ runner.temp }}

.github/workflows/deploy-monitoring.yml

@@ -103,7 +103,7 @@ jobs:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
       - name: Download AWS plan artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: tfplan_monitoring_aws-${{ inputs.environment }}
           path: ${{ runner.temp }}

Gemfile

@@ -61,6 +61,7 @@ gem "rubyzip"
 gem "sentry-rails"
 gem "sentry-ruby"
 gem "splunk-sdk-ruby"
+gem "table_tennis"
 gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 gem "uk_postcode"
 gem "wicked"

Gemfile.lock

@@ -367,6 +367,7 @@ GEM
       rubyntlm (~> 0.6, >= 0.6.3)
       webrick (~> 1.7)
       webrobots (~> 0.1.2)
+    memo_wise (1.13.0)
     method_source (1.1.0)
     mime-types (3.6.0)
       logger
@@ -425,6 +426,7 @@ GEM
     orm_adapter (0.5.0)
     ostruct (0.6.2)
     pagy (9.3.5)
+    paint (2.3.0)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
@@ -662,6 +664,12 @@ GEM
       prettier_print
       rbs
       syntax_tree (>= 2.0.1)
+    table_tennis (0.0.7)
+      csv (~> 3.3)
+      ffi (~> 1.17)
+      memo_wise (~> 1.11)
+      paint (~> 2.3)
+      unicode-display_width (~> 3.1)
     temple (0.10.0)
     thor (1.4.0)
     thruster (0.1.15-arm64-darwin)
@@ -811,6 +819,7 @@ DEPENDENCIES
   syntax_tree
   syntax_tree-haml
   syntax_tree-rbs
+  table_tennis
   thruster
   turbo-rails
   tzinfo-data

app/components/app_activity_log_component.rb

@@ -318,59 +318,87 @@ def programmes_by_id
   def decision_expiration_events
     all_programmes = Programme.all.to_a
 
-    AcademicYear.all.filter_map do |academic_year|
-      next if academic_year >= AcademicYear.current
+    AcademicYear.all.flat_map do |academic_year|
+      next [] if academic_year >= AcademicYear.current
 
-      vaccinated_programmes =
-        all_programmes.select do |programme|
+      not_vaccinated_programmes =
+        all_programmes.reject do |programme|
           patient.vaccination_status(programme:, academic_year:).vaccinated?
         end
 
-      programmes_with_expired_consents =
-        consents
-          .select { it.academic_year == academic_year }
-          .flat_map { programmes_for(it) }
-          .reject { vaccinated_programmes.include?(it) }
-
-      programmes_with_expired_triages =
-        triages
-          .select { it.academic_year == academic_year }
-          .flat_map { programmes_for(it) }
-          .reject { vaccinated_programmes.include?(it) }
-
-      programmes_with_expired_psds =
-        patient_specific_directions
-          .select { it.academic_year == academic_year }
-          .flat_map { programmes_for(it) }
-          .reject { vaccinated_programmes.include?(it) }
-
-      expired_items = []
-      if programmes_with_expired_consents.any?
-        expired_items += ["consent", "health information"]
-      end
-      expired_items << "triage outcome" if programmes_with_expired_triages.any?
-      expired_items << "PSD status" if programmes_with_expired_psds.any?
+      vaccinated_but_seasonal_programmes =
+        all_programmes.select do |programme|
+          patient.vaccination_status(programme:, academic_year:).vaccinated? &&
+            programme.seasonal?
+        end
 
-      next if expired_items.empty?
+      expired_items =
+        {
+          vaccinated_but_seasonal: vaccinated_but_seasonal_programmes,
+          not_vaccinated: not_vaccinated_programmes
+        }.transform_values do |programmes|
+          get_expired_items(academic_year:, programmes:)
+        end
 
-      programmes_with_expired_items = [
-        programmes_with_expired_consents,
-        programmes_with_expired_triages,
-        programmes_with_expired_psds
-      ].flatten.uniq
+      expired_items.map do |category, expired_items_in_category|
+        expired_item_names = []
+        if expired_items_in_category[:consents].any?
+          expired_item_names += ["consent", "health information"]
+        end
+        if expired_items_in_category[:triages].any?
+          expired_item_names << "triage outcome"
+        end
+        if expired_items_in_category[:psds].any?
+          expired_item_names << "PSD status"
+        end
 
-      expired_items_sentence =
-        expired_items.to_sentence(
-          words_connector: ", ",
-          last_word_connector: " and "
-        )
+        next [] if expired_item_names.empty?
+
+        title =
+          "#{
+            expired_item_names.to_sentence(
+              words_connector: ", ",
+              last_word_connector: " and "
+            ).upcase_first
+          } expired"
+
+        body =
+          case category
+          when :not_vaccinated
+            "#{@patient.full_name} was not vaccinated."
+          when :vaccinated_but_seasonal
+            "#{@patient.full_name} was vaccinated."
+          end
 
-      {
-        title: "#{expired_items_sentence.upcase_first} expired",
-        body: "#{@patient.full_name} was not vaccinated.",
-        at: academic_year.to_academic_year_date_range.end.end_of_day - 1.second,
-        programmes: programmes_with_expired_items
-      }
+        programmes = expired_items_in_category.values.flatten.uniq
+
+        {
+          title:,
+          body:,
+          at:
+            academic_year.to_academic_year_date_range.end.end_of_day - 1.second,
+          programmes:
+        }
+      end
+    end
+  end
+
+  private
+
+  def filter_expired(items, academic_year:, programmes:)
+    items
+      .select { it.academic_year == academic_year }
+      .flat_map { programmes_for(it) }
+      .select { programmes.include?(it) }
+  end
+
+  def get_expired_items(academic_year:, programmes:)
+    {
+      consents:,
+      triages:,
+      psds: patient_specific_directions
+    }.transform_values do |items|
+      filter_expired(items, academic_year:, programmes:)
     end
   end
 end

app/components/app_imports_navigation_component.rb

@@ -46,8 +46,8 @@ def issues_text
   end
 
   def notices_text
-    count = helpers.policy_scope(Patient).with_notice.count
-
+    count =
+      ImportantNotices.call(patient_scope: helpers.policy_scope(Patient)).length
     safe_join(["Important notices", " ", render(AppCountComponent.new(count))])
   end
 end