Merge pull request #4591 from nhsuk/next

Version 4.1.1

Author: thomasleese

.tool-versions

@@ -1,8 +1,9 @@
+awscli      2.27.46
+hk          1.1.2
 nodejs      22.15.0
+pkl         0.28.1
 postgres    17.2
+redis       8.2.1
 ruby        3.4.3
-awscli      2.27.46
 terraform   1.11.4
 tflint      0.55.1
-pkl         0.28.1
-hk          1.1.2

Gemfile

@@ -62,6 +62,7 @@ gem "sentry-rails"
 gem "sentry-ruby"
 gem "sentry-sidekiq"
 gem "sidekiq"
+gem "sidekiq-scheduler"
 gem "sidekiq-throttled"
 gem "splunk-sdk-ruby"
 gem "table_tennis"
@@ -116,6 +117,7 @@ group :test do
   gem "its"
   gem "rspec"
   gem "rspec-html-matchers"
+  gem "rspec-sidekiq"
   gem "rubyXL"
   gem "shoulda-matchers"
   gem "simplecov", require: false

Gemfile.lock

@@ -222,12 +222,12 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (6.5.4)
+    factory_bot (6.5.5)
       activesupport (>= 6.1.0)
     factory_bot_instruments (1.2.0)
       activerecord (>= 4.0)
       factory_bot (>= 4)
-    factory_bot_rails (6.5.0)
+    factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
     faker (3.5.2)
@@ -454,7 +454,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (7.0.0)
+    puma (7.0.2)
       nio4r (~> 2.0)
     pundit (2.5.0)
       activesupport (>= 3.0.0)
@@ -559,6 +559,11 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
+    rspec-sidekiq (5.2.0)
+      rspec-core (~> 3.0)
+      rspec-expectations (~> 3.0)
+      rspec-mocks (~> 3.0)
+      sidekiq (>= 5, < 9)
     rspec-support (3.13.4)
     rubocop (1.79.2)
       json (~> 2.3)
@@ -604,8 +609,10 @@ GEM
       rubyzip (>= 1.3.0)
     rubyntlm (0.6.5)
       base64
-    rubyzip (3.0.2)
+    rubyzip (3.1.0)
     rufo (0.18.1)
+    rufus-scheduler (3.9.2)
+      fugit (~> 1.1, >= 1.11.1)
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
@@ -629,6 +636,9 @@ GEM
       logger (>= 1.6.2)
       rack (>= 3.1.0)
       redis-client (>= 0.23.2)
+    sidekiq-scheduler (6.0.1)
+      rufus-scheduler (~> 3.2)
+      sidekiq (>= 7.3, < 9)
     sidekiq-throttled (2.0.0)
       concurrent-ruby (>= 1.2.0)
       redis-prescription (~> 2.2)
@@ -817,6 +827,7 @@ DEPENDENCIES
   rspec
   rspec-html-matchers
   rspec-rails
+  rspec-sidekiq
   rubocop-govuk
   ruby-prof
   ruby-progressbar
@@ -828,6 +839,7 @@ DEPENDENCIES
   sentry-sidekiq
   shoulda-matchers
   sidekiq
+  sidekiq-scheduler
   sidekiq-throttled
   simplecov
   solargraph

Procfile

@@ -1 +1,3 @@
+web: bin/rails server
 release: bin/rails db:prepare:ignore_concurrent_migration_exceptions
+sidekiq: bin/sidekiq

Procfile.dev

@@ -1,3 +1,5 @@
 web: unset PORT && bin/rails server
+sidekiq: bin/sidekiq
 css: yarn build:css --watch
 js: yarn build --watch
+redis: redis-server

README.md

@@ -23,7 +23,8 @@ This project depends on:
 - [Ruby on Rails](https://rubyonrails.org/)
 - [NodeJS](https://nodejs.org/)
 - [Yarn](https://yarnpkg.com/)
-- [Postgres](https://www.postgresql.org/)
+- [PostgreSQL](https://www.postgresql.org/)
+- [Redis](https://redis.io/) or [Valkey](https://valkey.io/)
 
 The instructions below assume you are using `mise` to manage the necessary
 versions of the above.

app/components/app_vaccination_record_summary_component.rb

@@ -258,7 +258,8 @@ def call
       end
 
       if @vaccination_record.respond_to?(:sync_status) &&
-           Flipper.enabled?(:immunisations_fhir_api_integration)
+           Flipper.enabled?(:imms_api_sync_job) &&
+           Flipper.enabled?(:imms_api_integration)
         summary_list.with_row do |row|
           row.with_key { "Synced with NHS England?" }
           row.with_value do

app/controllers/api/testing/teams_controller.rb

@@ -37,7 +37,9 @@ def destroy
         # In local dev we can end up with NotifyLogEntries without a patient
         log_destroy(NotifyLogEntry.where(patient_id: nil))
         log_destroy(NotifyLogEntry.where(patient_id: patient_ids))
+        log_destroy(PatientChangeset.where(patient_id: patient_ids))
         log_destroy(PatientSession.where(patient_id: patient_ids))
+        log_destroy(PatientSpecificDirection.where(patient_id: patient_ids))
         log_destroy(PDSSearchResult.where(patient_id: patient_ids))
         log_destroy(PreScreening.where(patient_id: patient_ids))
         log_destroy(SchoolMove.where(patient_id: patient_ids))

app/controllers/sessions/register_controller.rb

@@ -11,7 +11,7 @@ class Sessions::RegisterController < ApplicationController
   layout "full"
 
   def show
-    @statuses = PatientSession::RegistrationStatus.statuses.keys
+    @statuses = Patient::RegistrationStatus.statuses.keys
 
     scope =
       @session.patient_sessions.includes_programmes.includes(

app/forms/vaccinate_form.rb

@@ -62,6 +62,8 @@ def delivery_site=(value)
 
   def delivery_site
     if vaccine_method.present?
+      return nil if vaccine_method == "none"
+
       available_delivery_sites =
         Vaccine::AVAILABLE_DELIVERY_SITES.fetch(vaccine_method)