Merge pull request #3744 from nhsuk/next

Version 2.2.7

Author: thomasleese

.github/dependabot.yml

@@ -5,15 +5,18 @@
 
 version: 2
 updates:
-  - package-ecosystem: "bundler"
-    directory: "/"
+  - package-ecosystem: bundler
+    directory: /
+    target-branch: next
     schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      interval: daily
+  - package-ecosystem: github-actions
+    directory: /
+    target-branch: next
     schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm"
-    directory: "/"
+      interval: daily
+  - package-ecosystem: npm
+    directory: /
+    target-branch: next
     schedule:
-      interval: "weekly"
+      interval: daily

.github/workflows/deploy.yml

@@ -103,7 +103,7 @@ jobs:
         id: compare-permissions
         run: |
           source ./scripts/validate-github-actions-policy.sh
-          validate_policies arn:aws:iam::${{ env.account_id }}:policy/DeployMavisResources ./resources/github_actions_policy.json
+          validate_policies arn:aws:iam::${{ env.account_id }}:policy/DeployMavisResources ./account/resources/iam_policy_DeployMavisResources.json
           exit $?
   update-permissions:
     runs-on: ubuntu-latest
@@ -126,7 +126,7 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.account_id }}:role/GithubDeployMavisAndInfrastructure
           aws-region: eu-west-2
       - name: Update IAM policy
-        run: ./scripts/update-github-actions-policy.sh arn:aws:iam::${{ env.account_id }}:policy/DeployMavisResources ./resources/github_actions_policy.json
+        run: ./scripts/update-github-actions-policy.sh arn:aws:iam::${{ env.account_id }}:policy/DeployMavisResources ./account/resources/iam_policy_DeployMavisResources.json
   deploy-infrastructure:
     permissions:
       id-token: write

Gemfile

@@ -24,6 +24,7 @@ gem "stackprof"
 gem "activerecord-import"
 gem "activerecord-session_store"
 gem "amazing_print"
+gem "array_enum"
 gem "audited", git: "https://github.com/tvararu/audited", branch: "encryption"
 gem "caxlsx"
 gem "charlock_holmes"

Gemfile.lock

@@ -100,20 +100,22 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
-    amazing_print (1.7.2)
+    amazing_print (1.8.1)
     annotaterb (4.14.0)
+    array_enum (1.6.0)
+      activemodel
     asciidoctor (2.0.23)
     asciidoctor-diagram (3.0.0)
       asciidoctor (>= 1.5.7, < 3.x)
       rexml
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1114.0)
+    aws-partitions (1.1116.0)
     aws-sdk-accessanalyzer (1.72.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.225.1)
+    aws-sdk-core (3.225.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -126,20 +128,20 @@ GEM
     aws-sdk-ecr (1.103.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.120.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-iam (1.123.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-kms (1.101.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.277.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-rds (1.280.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.186.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
     base64 (0.3.0)
@@ -575,7 +577,8 @@ GEM
     rubocop-rspec (3.5.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    ruby-prof (1.7.1)
+    ruby-prof (1.7.2)
+      base64
     ruby-progressbar (1.13.0)
     rubyXL (3.4.33)
       nokogiri (>= 1.10.8)
@@ -590,10 +593,10 @@ GEM
     securerandom (0.4.1)
     semantic_logger (4.16.1)
       concurrent-ruby (~> 1.0)
-    sentry-rails (5.24.0)
+    sentry-rails (5.25.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.24.0)
-    sentry-ruby (5.24.0)
+      sentry-ruby (~> 5.25.0)
+    sentry-ruby (5.25.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-matchers (6.5.0)
@@ -713,6 +716,7 @@ DEPENDENCIES
   activerecord-session_store
   amazing_print
   annotaterb
+  array_enum
   asciidoctor
   asciidoctor-diagram
   audited!

app/controllers/api/organisations_controller.rb

@@ -7,6 +7,7 @@ def destroy
     response.headers["Content-Type"] = "text/event-stream"
     response.headers["Cache-Control"] = "no-cache"
 
+    keep_itself = ActiveModel::Type::Boolean.new.cast(params[:keep_itself])
     organisation = Organisation.find_by!(ods_code: params[:ods_code])
 
     @start_time = Time.zone.now
@@ -32,9 +33,6 @@ def destroy
         patient_sessions.in_batches { log_destroy(it) }
 
         log_destroy(SessionDate.where(session: sessions))
-        log_destroy(sessions)
-
-        organisation.patients
 
         log_destroy(SchoolMove.where(patient_id: patient_ids))
         log_destroy(SchoolMove.where(organisation:))
@@ -62,7 +60,18 @@ def destroy
           VaccinationRecord.where(performed_ods_code: organisation.ods_code)
         )
 
-        UnscheduledSessionsFactory.new.call
+        unless keep_itself
+          log_destroy(SessionProgramme.where(session: sessions))
+          log_destroy(sessions)
+
+          teams = Team.where(organisation:)
+          Location.where(team: teams).update_all(team_id: nil)
+
+          log_destroy(teams)
+
+          log_destroy(OrganisationProgramme.where(organisation:))
+          log_destroy(Organisation.where(id: organisation.id))
+        end
       end
     end
 

app/controllers/parent_interface/consent_forms/edit_controller.rb

@@ -4,14 +4,23 @@ module ParentInterface
   class ConsentForms::EditController < ConsentForms::BaseController
     include WizardControllerConcern
 
-    before_action :validate_params, only: %i[update]
+    before_action :validate_params, only: :update
     before_action :set_health_answer, if: :is_health_question_step?
-    before_action :set_follow_up_changes_start_page, only: %i[show]
+    before_action :set_follow_up_changes_start_page, only: :show
 
     HOME_EDUCATED_SCHOOL_ID = "home-educated"
 
     def show
-      set_response if current_step == :consent
+      case current_step
+      when :response_doubles
+        set_response_doubles
+      when :response_flu
+        set_response_flu
+      when :response_hpv
+        set_response_hpv
+      when :injection_alternative
+        set_injection_alternative
+      end
 
       render_wizard
     end
@@ -48,7 +57,9 @@ def update
              @consent_form.parent_phone.present?
           jump_to("contact-method", skip_to_confirm: true)
         end
-      elsif current_step == :consent
+      elsif current_step == :injection_alternative
+        @consent_form.update_injection_alternative
+      elsif is_response_step?
         @consent_form.update_programme_responses
         @consent_form.seed_health_questions
       end
@@ -97,9 +108,12 @@ def update_params
           parent_contact_method_type
           parent_contact_method_other_details
         ],
-        consent: %i[response chosen_programme],
         reason: %i[reason],
         reason_notes: %i[reason_notes],
+        response_doubles: %i[response chosen_programme],
+        response_flu: %i[response],
+        response_hpv: %i[response],
+        injection_alternative: %i[injection_alternative],
         address: %i[address_line_1 address_line_2 address_town address_postcode]
       }.fetch(current_step)
 
@@ -125,18 +139,48 @@ def set_health_answer
       @health_answer = @consent_form.health_answers[@question_number]
     end
 
-    def set_response
+    def set_response_doubles
       if @consent_form.response_given? && @consent_form.response_refused?
         @consent_form.response = "given_one"
         @consent_form.chosen_programme =
-          @consent_form.given_programmes.first&.type
+          @consent_form.given_programmes.first.type
       elsif @consent_form.response_given?
         @consent_form.response = "given"
       elsif @consent_form.response_refused?
         @consent_form.response = "refused"
       end
     end
 
+    def set_response_flu
+      if @consent_form.response_given?
+        method =
+          @consent_form
+            .given_consent_form_programmes
+            .first
+            .vaccine_methods
+            .first
+        @consent_form.response = "given_#{method}"
+      elsif @consent_form.response_refused?
+        @consent_form.response = "refused"
+      end
+    end
+
+    def set_response_hpv
+      if @consent_form.response_given?
+        @consent_form.response = "given"
+      elsif @consent_form.response_refused?
+        @consent_form.response = "refused"
+      end
+    end
+
+    def set_injection_alternative
+      if @consent_form.consent_form_programmes.any?(
+           &:vaccine_method_injection_and_nasal?
+         )
+        @consent_form.injection_alternative = "true"
+      end
+    end
+
     def validate_params
       case current_step
       when :date_of_birth
@@ -154,9 +198,9 @@ def validate_params
       end
     end
 
-    def is_health_question_step?
-      step == "health-question"
-    end
+    def is_response_step? = step.start_with?("response-")
+
+    def is_health_question_step? = step == "health-question"
 
     def current_health_answer
       index = step.split("-").last.to_i - 1

app/controllers/patient_sessions/consents_controller.rb

@@ -123,7 +123,8 @@ def create_params
     {
       patient_session: @patient_session,
       programme: @programme,
-      recorded_by: current_user
+      recorded_by: current_user,
+      vaccine_methods: %w[injection]
     }
   end
 

app/models/concerns/has_vaccine_methods.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module HasVaccineMethods
+  extend ActiveSupport::Concern
+
+  included do
+    extend ArrayEnum
+
+    array_enum vaccine_methods: { injection: 0, nasal: 1 }
+
+    validates :vaccine_methods, subset: %w[injection nasal]
+  end
+end