Merge pull request #3764 from nhsuk/next

Version 2.2.8

Author: thomasleese

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     amazing_print (1.8.1)
-    annotaterb (4.14.0)
+    annotaterb (4.15.0)
     array_enum (1.6.0)
       activemodel
     asciidoctor (2.0.23)
@@ -111,34 +111,34 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1116.0)
+    aws-partitions (1.1117.0)
     aws-sdk-accessanalyzer (1.72.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.225.2)
+    aws-sdk-core (3.226.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.530.0)
+    aws-sdk-ec2 (1.531.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.103.0)
+    aws-sdk-ecr (1.104.0)
       aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     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-sdk-kms (1.105.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
     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-s3 (1.189.1)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -186,12 +186,12 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.4.1)
+    cssbundling-rails (1.4.3)
       railties (>= 6.0.0)
     csv (3.3.5)
-    cuprite (0.15.1)
+    cuprite (0.17)
       capybara (~> 3.0)
-      ferrum (~> 0.15.0)
+      ferrum (~> 0.17.0)
     date (3.4.1)
     debug (1.10.0)
       irb (~> 1.10)
@@ -216,14 +216,14 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.4)
+      activesupport (>= 6.1.0)
     factory_bot_instruments (1.2.0)
       activerecord (>= 4.0)
       factory_bot (>= 4)
-    factory_bot_rails (6.4.4)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
+      railties (>= 6.1.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
     faraday (2.13.1)
@@ -234,8 +234,9 @@ GEM
       faraday (>= 1, < 3)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ferrum (0.15)
+    ferrum (0.17.1)
       addressable (~> 2.5)
+      base64 (~> 0.2)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
@@ -265,10 +266,10 @@ GEM
       fugit (>= 1.11.0)
       railties (>= 6.1.0)
       thor (>= 1.0.0)
-    govuk-components (5.10.0)
+    govuk-components (5.10.1)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
-      view_component (>= 3.18, < 3.22)
+      view_component (>= 3.18, < 3.24)
     govuk_design_system_formbuilder (5.10.1)
       actionview (>= 6.1)
       activemodel (>= 6.1)
@@ -305,7 +306,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.12.0)
+    json (2.12.2)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -437,7 +438,7 @@ GEM
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     pundit (2.5.0)
@@ -541,40 +542,40 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.75.2)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.1.4)
-      rubocop (= 1.75.2)
-      rubocop-ast (= 1.44.0)
+    rubocop-govuk (5.1.14)
+      rubocop (= 1.76.1)
+      rubocop-ast (= 1.45.1)
       rubocop-capybara (= 2.22.1)
-      rubocop-rails (= 2.31.0)
+      rubocop-rails (= 2.32.0)
       rubocop-rake (= 0.7.1)
-      rubocop-rspec (= 3.5.0)
-    rubocop-rails (2.31.0)
+      rubocop-rspec (= 3.6.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.5.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     ruby-prof (1.7.2)
@@ -607,7 +608,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.54.5)
+    solargraph (0.55.1)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)
@@ -669,9 +670,9 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (3.21.0)
+    view_component (3.23.2)
       activesupport (>= 5.2.0, < 8.1)
-      concurrent-ruby (~> 1.0)
+      concurrent-ruby (~> 1)
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -690,7 +691,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
     webrobots (0.1.2)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

app/components/app_card_component.rb

@@ -2,7 +2,7 @@
 
 class AppCardComponent < ViewComponent::Base
   erb_template <<-ERB
-    <div class="<%= card_classes %>">
+    <<%= top_level_tag %> class="<%= card_classes %>">
       <div class="<%= content_classes %>">
         <% if heading.present? %>
           <h2 class="<%= heading_classes %>">
@@ -22,7 +22,7 @@ class AppCardComponent < ViewComponent::Base
 
         <%= content %>
       </div>
-    </div>
+    </<%= top_level_tag %>>
   ERB
 
   renders_one :heading
@@ -34,7 +34,8 @@ def initialize(
     secondary: false,
     data: false,
     patient: false,
-    filters: false
+    filters: false,
+    section: false
   )
     super
 
@@ -44,12 +45,15 @@ def initialize(
     @data = data
     @patient = patient
     @filters = filters
+    @section = section
 
     @feature = (colour.present? && !data) || filters
   end
 
   private
 
+  def top_level_tag = @section ? "section" : "div"
+
   def card_classes
     [
       "nhsuk-card",

app/components/app_vaccinate_form_component.rb

@@ -27,8 +27,11 @@ def url
   end
 
   def delivery_method
-    # TODO: Check which method has been consented to.
-    programme.flu? ? :nasal_spray : :intramuscular
+    if patient.consent_status(programme:).vaccine_method_nasal?
+      :nasal_spray
+    else
+      :intramuscular
+    end
   end
 
   def dose_sequence

app/lib/status_updater.rb

@@ -43,7 +43,7 @@ def update_consent_statuses!
           batch,
           on_duplicate_key_update: {
             conflict_target: [:id],
-            columns: %i[status]
+            columns: %i[status vaccine_methods]
           }
         )
       end

app/models/concerns/has_vaccine_methods.rb

@@ -10,4 +10,12 @@ module HasVaccineMethods
 
     validates :vaccine_methods, subset: %w[injection nasal]
   end
+
+  def vaccine_method_injection? = vaccine_methods.include?("injection")
+
+  def vaccine_method_nasal? = vaccine_methods.include?("nasal")
+
+  def vaccine_method_injection_and_nasal?
+    vaccine_method_injection? && vaccine_method_nasal?
+  end
 end

app/models/consent_form_programme.rb

@@ -30,14 +30,6 @@ class ConsentFormProgramme < ApplicationRecord
 
   enum :response, { given: 0, refused: 1 }, prefix: true
 
-  def vaccine_method_injection? = vaccine_methods.include?("injection")
-
-  def vaccine_method_nasal? = vaccine_methods.include?("nasal")
-
-  def vaccine_method_injection_and_nasal?
-    vaccine_method_injection? && vaccine_method_nasal?
-  end
-
   def vaccines
     Vaccine.active.where(programme_id:, method: vaccine_methods)
   end

app/models/consolidated_health_answers.rb

@@ -8,6 +8,8 @@ def initialize(objects = [])
   end
 
   def add_answer(responder:, question:, answer:, notes: nil)
+    return if answer.nil?
+
     @answers[question] ||= []
     @answers[question] << { responder:, answer:, notes: }
   end
@@ -33,7 +35,7 @@ def add_answers_from_model(model)
       add_answer(
         responder: model.who_responded,
         question: health_question.question,
-        answer: health_question.response.humanize.presence,
+        answer: health_question.response&.humanize.presence,
         notes: health_question.notes.presence
       )
     end

app/models/patient.rb

@@ -348,7 +348,7 @@ def update_from_pds!(pds_patient)
   def invalidate!
     return if invalidated?
 
-    update_column(:invalidated_at, Time.current)
+    update!(invalidated_at: Time.current)
   end
 
   def not_in_organisation? = patient_sessions.empty?