Merge pull request #6353 from NHSDigital/next

Version 7.4.0

Author: thomasleese

.github/workflows/continuous-deployment.yml

@@ -39,7 +39,7 @@ jobs:
     steps:
       - name: Send Slack notification about failed deployment
         if: needs.test.result == 'failure' || needs.deploy.result == 'failure'
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_TECH_WEBHOOK_URL }}
           webhook-type: incoming-webhook
@@ -56,7 +56,7 @@ jobs:
           # yamllint enable rule:line-length
       - name: Send Slack notification about failed E2E tests
         if: needs.end-to-end-tests.result == 'failure'
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_TECH_WEBHOOK_URL }}
           webhook-type: incoming-webhook

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

@@ -153,7 +153,7 @@ jobs:
     steps:
       - name: Notify pending approval
         if: inputs.environment == 'production'
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_TECH_WEBHOOK_URL }}
           webhook-type: incoming-webhook

.github/workflows/deploy.yml

@@ -47,7 +47,7 @@ on:
           - ops
         default: all
       run_pre_deploy_migrations:
-        description: Run data migrations before service deployment.
+        description: Run `pre-deploy` job (schema-migrations) before service deployment.
         required: false
         type: boolean
         default: true
@@ -159,7 +159,7 @@ jobs:
     needs: prepare-deployment
     steps:
       - name: Notify approval required
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
           webhook-type: incoming-webhook
@@ -303,7 +303,7 @@ jobs:
         # yamllint enable rule:line-length
       - name: Notify migrations completed
         if: ${{ env.environment == 'production' }}
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
           webhook-type: incoming-webhook
@@ -483,7 +483,7 @@ jobs:
         # yamllint enable rule:line-length
       - name: Notify data migrations completed
         if: ${{ env.environment == 'production' }}
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
           webhook-type: incoming-webhook
@@ -503,7 +503,7 @@ jobs:
       - name: Notify deployment success
         if: >-
           ${{ needs.deploy-service.result == 'success' || needs.post-deploy.result == 'success' }}
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
           webhook-type: incoming-webhook
@@ -517,7 +517,7 @@ jobs:
       - name: Notify deployment failure
         if: >-
           ${{ needs.deploy-service.result == 'failure' || needs.pre-deploy.result == 'failure' }}
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
           webhook-type: incoming-webhook

.github/workflows/end-to-end-tests-on-pull-request.yml

@@ -343,18 +343,23 @@ jobs:
     outputs:
       test_branch: ${{ steps.check-branch.outputs.test_branch }}
     steps:
-      - name: Check if branch exists
+      - name: Check if head branch or base branch exists
         id: check-branch
         run: |
           if git ls-remote --exit-code \
               --heads https://github.com/NHSDigital/manage-vaccinations-in-schools-testing.git \
-              "$BRANCH_TO_CHECK" > /dev/null 2>&1; then
-            echo "test_branch=$BRANCH_TO_CHECK" >> "$GITHUB_OUTPUT"
+              "$HEAD_REF" > /dev/null 2>&1; then
+            echo "test_branch=$HEAD_REF" >> "$GITHUB_OUTPUT"
+          elif git ls-remote --exit-code \
+              --heads https://github.com/NHSDigital/manage-vaccinations-in-schools-testing.git \
+              "$BASE_REF" > /dev/null 2>&1; then
+            echo "test_branch=$BASE_REF" >> "$GITHUB_OUTPUT"
           else
             echo "test_branch=main" >> "$GITHUB_OUTPUT"
           fi
         env:
-          BRANCH_TO_CHECK: ${{ github.head_ref }}
+          HEAD_REF: ${{ github.head_ref }}
+          BASE_REF: ${{ github.base_ref }}
   call-end-to-end-tests:
     needs: [launch-dockerized-devimage, wait-for-task-stability, find-correct-test-branch]
     if:

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
           cache: yarn
           node-version-file: .tool-versions
       - run: yarn install --immutable --immutable-cache --check-cache
-      - uses: jdx/mise-action@v3
+      - uses: jdx/mise-action@v4
         with:
           install_args: actionlint hk pkl shellcheck yamllint
       - run: hk check --all

.github/workflows/update-version-numbers-slack.yml

@@ -61,7 +61,7 @@ jobs:
           echo "MAVIS_TECH_TOPIC=$TOPIC" >> "$GITHUB_ENV"
         # yamllint enable rule:line-length
       - name: Update mavis tech channel topic
-        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95
         with:
           method: conversations.setTopic
           token: ${{ secrets.MAVIS_DEPLOYMENT_BOT_OAUTH_TOKEN }}

Gemfile.lock

@@ -284,7 +284,7 @@ GEM
       irb (~> 1.10)
       reline (>= 0.3.8)
     deep_merge (1.2.2)
-    devise (5.0.2)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
@@ -557,7 +557,7 @@ GEM
       racc
     pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-linux)
-    phonelib (0.10.16)
+    phonelib (0.10.17)
     pp (0.6.3)
       prettyprint
     prettier_print (1.2.1)
@@ -667,7 +667,7 @@ GEM
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.26.4)
+    redis-client (0.27.0)
       connection_pool
     redis-prescription (2.6.0)
     regexp_parser (2.11.3)
@@ -770,15 +770,15 @@ GEM
     securerandom (0.4.1)
     semantic_logger (4.17.0)
       concurrent-ruby (~> 1.0)
-    sentry-rails (6.4.1)
+    sentry-rails (6.5.0)
       railties (>= 5.2.0)
-      sentry-ruby (~> 6.4.1)
-    sentry-ruby (6.4.1)
+      sentry-ruby (~> 6.5.0)
+    sentry-ruby (6.5.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       logger
-    sentry-sidekiq (6.4.1)
-      sentry-ruby (~> 6.4.1)
+    sentry-sidekiq (6.5.0)
+      sentry-ruby (~> 6.5.0)
       sidekiq (>= 5.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)

app/components/app_activity_log_component.rb

@@ -477,13 +477,13 @@ def vaccination_events
 
       subtitle =
         if historical_vaccination_event?(vaccination_record)
-          "Record added to Mavis #{vaccination_record.reported_at.to_fs(:long)} · " \
+          "Record added to Mavis #{vaccination_record.created_at.to_fs(:long)} · " \
             "Vaccination given #{vaccination_record.performed_at.to_date.to_fs(:long)}"
         end
 
       at =
         if historical_vaccination_event?(vaccination_record)
-          vaccination_record.reported_at
+          vaccination_record.created_at
         else
           vaccination_record.performed_at
         end
@@ -511,11 +511,8 @@ def vaccination_events
   end
 
   def historical_vaccination_event?(vaccination_record)
-    vaccination_record.reported_at.present? &&
-      (
-        vaccination_record.sourced_from_manual_report? ||
-          vaccination_record.sourced_from_historical_upload?
-      )
+    vaccination_record.sourced_from_historical_upload? ||
+      vaccination_record.sourced_from_manual_report?
   end
 
   def attendance_events

app/components/app_patient_navigation_component.rb

@@ -17,21 +17,11 @@ def call
         selected: active == :show
       )
 
-      if Flipper.enabled?(:child_record_redesign)
-        @programmes.flat_map do |programme|
-          nav.with_item(
-            href: patient_programme_path(@patient, programme.type),
-            text: programme.name,
-            selected: active == programme.type.to_sym
-          )
-        end
-      end
-
-      unless Flipper.enabled?(:child_record_redesign)
+      @programmes.flat_map do |programme|
         nav.with_item(
-          href: log_patient_path(patient),
-          text: "Activity log",
-          selected: active == :log
+          href: patient_programme_path(@patient, programme.type),
+          text: programme.name,
+          selected: active == programme.type.to_sym
         )
       end
     end

app/components/app_patient_session_record_component.rb

@@ -21,11 +21,7 @@ def render?
       patient.consent_given_and_safe_to_vaccinate?(
         programme:,
         academic_year:
-      ) &&
-      (
-        registration_status&.attending? || registration_status&.completed? ||
-          !session.requires_registration?
-      )
+      ) && can_record_today?
   end
 
   private
@@ -39,6 +35,19 @@ def registration_status
     @registration_status ||= patient.registration_status(session:)
   end
 
+  def can_record_today?
+    return true unless session.requires_registration?
+
+    today_attendance_record.present? && today_attendance_record&.attending?
+  end
+
+  def today_attendance_record
+    patient.attendance_records.find do |attendance_record|
+      attendance_record.location_id == session.location_id &&
+        attendance_record.date == Date.current
+    end
+  end
+
   def vaccination_record
     VaccinationRecord.new(patient:, session:, programme:)
   end