Merge pull request #4651 from nhsuk/next

Version 4.2.1

Author: thomasleese

.github/pull_request_template.md

@@ -0,0 +1,9 @@
+## Screenshots
+
+## Pre-release tasks
+
+- ...
+
+## Post-release tasks
+
+- ...

.github/workflows/deploy-application.yml

@@ -23,7 +23,6 @@ on:
         options:
           - all
           - web
-          - good-job
           - sidekiq
         default: all
   workflow_call:
@@ -82,8 +81,6 @@ jobs:
           "application=" + .codedeploy_application_name.value,
           "application_group=" + .codedeploy_deployment_group_name.value,
           "cluster_name=" + .ecs_variables.value.cluster_name,
-          "good_job_service=" + .ecs_variables.value.good_job.service_name,
-          "good_job_task_definition=" + .ecs_variables.value.good_job.task_definition.arn,
           "sidekiq_service=" + .ecs_variables.value.sidekiq.service_name,
           "sidekiq_task_definition=" + .ecs_variables.value.sidekiq.task_definition.arn
           ' > ${{ runner.temp }}/DEPLOYMENT_ENVS
@@ -126,50 +123,6 @@ jobs:
           aws deploy wait deployment-successful --deployment-id "$deployment_id"
           echo "Deployment successful"
 
-  create-good-job-deployment:
-    name: Create good-job deployment
-    runs-on: ubuntu-latest
-    needs: prepare-deployment
-    if: inputs.server_types == 'good-job' || inputs.server_types == 'all'
-    permissions:
-      id-token: write
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@v5
-        with:
-          name: DEPLOYMENT_ENVS-${{ inputs.environment }}
-          path: ${{ runner.temp }}
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v5
-        with:
-          role-to-assume: ${{ env.aws-role }}
-          aws-region: eu-west-2
-      - name: Trigger ECS Deployment
-        run: |
-          set -e
-          source ${{ runner.temp }}/DEPLOYMENT_ENVS
-          DEPLOYMENT_ID=$(aws ecs update-service --cluster $cluster_name --service $good_job_service \
-          --task-definition $good_job_task_definition --force-new-deployment \
-          --query 'service.deployments[?rolloutState==`IN_PROGRESS`].[id][0]' --output text)
-          echo "Deployment started: $DEPLOYMENT_ID"
-          echo "deployment_id=$DEPLOYMENT_ID" >> $GITHUB_ENV
-      - name: Wait for deployment to complete
-        run: |
-          set -e
-          source ${{ runner.temp }}/DEPLOYMENT_ENVS
-          DEPLOYMENT_STATE=IN_PROGRESS
-          while [ "$DEPLOYMENT_STATE" == "IN_PROGRESS" ]; do
-            echo "Waiting for deployment to complete..."
-            sleep 30
-            DEPLOYMENT_STATE="$(aws ecs describe-services --cluster $cluster_name --services $good_job_service \
-            --query "services[0].deployments[?id == \`$deployment_id\`].[rolloutState][0]" --output text)"
-          done
-          if [ "$DEPLOYMENT_STATE" != "COMPLETED" ]; then
-            echo "Deployment failed with state: $DEPLOYMENT_STATE"
-            exit 1
-          fi
-          echo "Deployment successful"
-
   create-sidekiq-deployment:
     name: Create sidekiq deployment
     runs-on: ubuntu-latest

.github/workflows/deploy.yml

@@ -40,7 +40,6 @@ on:
         options:
           - all
           - web
-          - good-job
           - sidekiq
           - none
         default: all

.github/workflows/draft-new-release.yml

@@ -0,0 +1,33 @@
+name: Draft new release
+run-name: Draft release notes for ${{ inputs.release_tag }}
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: true
+        description: Release tag
+
+jobs:
+  create-release-notes:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - name: Generate release notes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: script/draft_new_release.sh ${{ inputs.release_tag }}
+      - name: Create GitHub Release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create "${{ inputs.release_tag }}" \
+            --title "Draft release ${{ inputs.release_tag }}" \
+            --notes-file release_notes.md \
+            --draft
+

Dockerfile

@@ -85,6 +85,5 @@ VOLUME ["/rails/db/data", "/rails/tmp", "/rails/log", "/tmp", "/var/log", "/var/
 # Start web server by default, this can be overwritten by environment variable
 EXPOSE 4000
 ENV HTTP_PORT=4000
-ENV GOOD_JOB_PROBE_PORT=4000
 ENV SERVER_TYPE=web
 CMD ["./bin/docker-start"]

Gemfile

@@ -39,7 +39,6 @@ gem "fhir_models"
 gem "flipper"
 gem "flipper-active_record"
 gem "flipper-ui"
-gem "good_job"
 gem "govuk-components"
 gem "govuk_design_system_formbuilder"
 gem "govuk_markdown"

Gemfile.lock

@@ -220,7 +220,7 @@ GEM
       activemodel
     erb (5.0.2)
     erubi (1.13.1)
-    et-orbi (1.2.11)
+    et-orbi (1.3.0)
       tzinfo
     factory_bot (6.5.5)
       activesupport (>= 6.1.0)
@@ -265,18 +265,11 @@ GEM
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 8)
-    fugit (1.11.1)
+    fugit (1.11.2)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (4.11.2)
-      activejob (>= 6.1.0)
-      activerecord (>= 6.1.0)
-      concurrent-ruby (>= 1.3.1)
-      fugit (>= 1.11.0)
-      railties (>= 6.1.0)
-      thor (>= 1.0.0)
     govuk-components (5.11.3)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
@@ -435,7 +428,7 @@ GEM
       racc
     pg (1.6.2-arm64-darwin)
     pg (1.6.2-x86_64-linux)
-    phonelib (0.10.11)
+    phonelib (0.10.12)
     pp (0.6.2)
       prettyprint
     prettier_print (1.2.1)
@@ -454,7 +447,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (7.0.2)
+    puma (7.0.3)
       nio4r (~> 2.0)
     pundit (2.5.1)
       activesupport (>= 3.0.0)
@@ -800,7 +793,6 @@ DEPENDENCIES
   flipper
   flipper-active_record
   flipper-ui
-  good_job
   govuk-components
   govuk_design_system_formbuilder
   govuk_markdown

app/components/app_activity_log_component.rb

@@ -14,59 +14,89 @@ class AppActivityLogComponent < ViewComponent::Base
     <% end %>
   ERB
 
-  def initialize(team:, patient: nil, patient_session: nil)
-    if patient.nil? && patient_session.nil?
-      raise "Pass either a patient or a patient session."
-    elsif patient && patient_session
-      raise "Pass only a patient or a patient session."
-    end
+  def initialize(team:, patient:, session: nil)
+    @patient = patient
 
-    @patient = patient || patient_session.patient
-    @patient_sessions =
-      patient_session ? [patient_session] : patient.patient_sessions
+    @archive_reasons =
+      @patient.archive_reasons.where(team:).includes(:created_by)
 
     @attendance_records =
-      (patient || patient_session).attendance_records.includes(:location)
+      (patient || patient_session)
+        .attendance_records
+        .includes(:location)
+        .then do |scope|
+          session ? scope.where(location: session.location) : scope
+        end
 
     @consents =
-      @patient.consents.includes(
-        :consent_form,
-        :parent,
-        :recorded_by,
-        :programme,
-        patient: :parent_relationships
-      )
+      @patient
+        .consents
+        .includes(
+          :consent_form,
+          :parent,
+          :recorded_by,
+          :programme,
+          patient: :parent_relationships
+        )
+        .then do |scope|
+          session ? scope.where(programme: session.programmes) : scope
+        end
 
     @gillick_assessments =
-      (patient || patient_session)
+      @patient
         .gillick_assessments
         .includes(:performed_by)
         .order(:created_at)
+        .then { |scope| session ? scope.where_session(session) : scope }
 
     @notes =
-      (patient || patient_session).notes.includes(
-        :created_by,
-        :patient,
-        session: :programmes
-      )
+      @patient
+        .notes
+        .includes(:created_by, :patient, session: :programmes)
+        .then { |scope| session ? scope.where(session:) : scope }
+
+    @notify_log_entries =
+      @patient
+        .notify_log_entries
+        .includes(:sent_by)
+        .then do |scope|
+          session ? scope.where(programme_ids: session.programmes.ids) : scope
+        end
 
-    @notify_log_entries = @patient.notify_log_entries.includes(:sent_by)
+    @patient_sessions =
+      @patient
+        .patient_sessions
+        .includes_programmes
+        .includes(session: :location)
+        .then { |scope| session ? scope.where(session:) : scope }
+
+    @patient_specific_directions =
+      @patient
+        .patient_specific_directions
+        .includes(:created_by)
+        .then do |scope|
+          session ? scope.where(programme: session.programmes) : scope
+        end
 
     @pre_screenings =
-      (patient || patient_session).pre_screenings.includes(:performed_by)
+      @patient
+        .pre_screenings
+        .includes(:performed_by)
+        .then { |scope| session ? scope.where_session(session) : scope }
 
-    @triages = @patient.triages.includes(:performed_by)
+    @triages =
+      @patient
+        .triages
+        .includes(:performed_by)
+        .then do |scope|
+          session ? scope.where(programme: session.programmes) : scope
+        end
 
     @vaccination_records =
       @patient.vaccination_records.with_discarded.includes(
         :performed_by_user,
         :vaccine
       )
-
-    @patient_specific_directions =
-      @patient.patient_specific_directions.includes(:created_by)
-
-    @archive_reasons = @patient.archive_reasons.where(team:)
   end
 
   attr_reader :archive_reasons,
@@ -216,9 +246,9 @@ def expiration_events
         body =
           case category
           when :not_vaccinated
-            "#{@patient.full_name} was not vaccinated."
+            "#{patient.full_name} was not vaccinated."
           when :vaccinated_but_seasonal
-            "#{@patient.full_name} was vaccinated."
+            "#{patient.full_name} was vaccinated."
           end
 
         programmes = expired_items_in_category.values.flatten.uniq
@@ -317,11 +347,14 @@ def pre_screening_events
 
   def session_events
     patient_sessions.map do |patient_session|
+      patient = patient_session.patient
+      session = patient_session.session
+
       [
         {
-          title: "Added to the session at #{patient_session.location.name}",
+          title: "Added to the session at #{session.location.name}",
           at: patient_session.created_at,
-          programmes: programmes_for(patient_session)
+          programmes: session.programmes_for(patient:)
         }
       ]
     end