Merge pull request #5183 from nhsuk/next

Version 5.7.0

Author: thomasleese

.github/workflows/test.yml

@@ -58,8 +58,10 @@ jobs:
         ports:
           - 5432:5432
     env:
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/manage_vaccinations_test
       RAILS_ENV: test
+      DATABASE_HOST: localhost
+      DATABASE_USER: postgres
+      DATABASE_PASSWORD: postgres
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
@@ -69,12 +71,14 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-      - name: Setup database
-        run: bin/rails db:test:prepare
+      - name: Setup Database
+        run: |
+          bin/rails parallel:create
+          bin/rails parallel:load_schema
       - name: Precompile assets
         run: bin/rails assets:precompile
       - name: Run rspec
-        run: bundle exec rspec spec
+        run: bin/rails parallel:spec
 
   jest:
     name: Jest

Gemfile

@@ -77,6 +77,7 @@ group :development, :test do
   gem "brakeman", require: false
   gem "debug", platforms: %i[mri windows]
   gem "factory_bot_instruments"
+  gem "parallel_tests"
   gem "pry-rails"
   gem "rspec-rails"
 end

Gemfile.lock

@@ -119,30 +119,30 @@ GEM
     aws-sdk-accessanalyzer (1.81.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.236.0)
+    aws-sdk-core (3.237.0)
       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.571.0)
+    aws-sdk-ec2 (1.574.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.112.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.132.0)
+    aws-sdk-iam (1.133.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.116.0)
+    aws-sdk-kms (1.117.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-rds (1.297.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.203.0)
+    aws-sdk-s3 (1.203.1)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -433,6 +433,8 @@ GEM
     pagy (9.4.0)
     paint (2.3.0)
     parallel (1.27.0)
+    parallel_tests (5.5.0)
+      parallel
     parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
@@ -832,6 +834,7 @@ DEPENDENCIES
   omniauth-rails_csrf_protection
   omniauth_openid_connect
   pagy
+  parallel_tests
   pg
   phonelib
   prettier_print

README.md

@@ -189,6 +189,15 @@ To run the Rails tests:
 bin/bundle exec rspec
 ```
 
+or run them in parallel using the `parallel_tests` gem
+
+```shell
+# Setup
+rake parallel:create parallel:prepare
+
+rake parallel:spec
+```
+
 To run the JS unit tests:
 
 ```shell

app/components/app_patient_session_search_result_card_component.rb

@@ -234,7 +234,8 @@ def attached_tags(context)
       hash[programme.name] = PatientStatusResolver.new(
         patient,
         programme:,
-        academic_year:
+        academic_year:,
+        context_location_id: session.location_id
       ).send(context)
     end
   end

app/components/app_patient_session_section_component.rb

@@ -18,6 +18,11 @@ def colour = resolved_status.fetch(:colour)
   def heading = "#{programme.name}: #{resolved_status.fetch(:text)}"
 
   def patient_status_resolver
-    PatientStatusResolver.new(patient, programme:, academic_year:)
+    PatientStatusResolver.new(
+      patient,
+      programme:,
+      academic_year:,
+      context_location_id: session.location_id
+    )
   end
 end

app/components/app_session_actions_component.rb

@@ -108,7 +108,7 @@ def ready_for_vaccinator_row
       session.programmes.index_with do |programme|
         patients
           .has_registration_status(%w[attending completed], session:)
-          .includes(:consent_statuses, :triage_statuses, :vaccination_statuses)
+          .includes_statuses
           .count do |patient|
             patient.consent_given_and_safe_to_vaccinate?(
               programme:,

app/components/app_session_overview_tallies_component.rb

@@ -99,7 +99,7 @@ def eligible_children_count(programme)
   def still_to_vaccinate_count
     session
       .patients
-      .includes(:consent_statuses, :triage_statuses, :vaccination_statuses)
+      .includes_statuses
       .consent_given_and_safe_to_vaccinate(
         programmes:,
         academic_year:,

app/controllers/api/testing/teams_controller.rb

@@ -75,6 +75,10 @@ def destroy
 
     log_destroy(ParentRelationship.where(patient_id: patient_ids))
     log_destroy(Patient.where(id: patient_ids))
+
+    log_destroy(
+      Consent.where(parent: Parent.where.missing(:parent_relationships))
+    )
     log_destroy(Parent.where.missing(:parent_relationships))
 
     log_destroy(

app/controllers/patient_sessions/base_controller.rb

@@ -31,9 +31,10 @@ def set_academic_year
 
   def set_patient
     @patient =
-      policy_scope(Patient).includes(parent_relationships: :parent).find(
-        params.fetch(:patient_id, params[:id])
-      )
+      policy_scope(Patient)
+        .includes_statuses
+        .includes(parent_relationships: :parent)
+        .find(params.fetch(:patient_id, params[:id]))
   end
 
   def set_patient_location