Merge pull request #5152 from nhsuk/next

Version 5.6.0

Author: thomasleese

.rubocop.yml

@@ -19,7 +19,7 @@ Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
 Layout/LineLength:
-  AllowedPatterns: [idx_on,index_]
+  AllowedPatterns: [idx_on,index_,idx_]
   Exclude:
     - db/schema.rb
 

Gemfile

@@ -112,6 +112,7 @@ group :test do
   gem "capybara-screenshot"
   gem "climate_control"
   gem "cuprite"
+  gem "database_cleaner-active_record"
   gem "its"
   gem "rack_session_access"
   gem "rspec"

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors.git
-  revision: bd3019acc7be517423b97e8cd71bc3cff06f2cce
+  revision: 5b9ce7840d04270e99f4f0cb03989e05437326a6
   specs:
-    capybara_accessible_selectors (0.14.0)
+    capybara_accessible_selectors (0.15.0)
       capybara (~> 3.36)
 
 GIT
@@ -115,8 +115,8 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1179.0)
-    aws-sdk-accessanalyzer (1.80.0)
+    aws-partitions (1.1181.0)
+    aws-sdk-accessanalyzer (1.81.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-core (3.236.0)
@@ -127,7 +127,7 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.569.0)
+    aws-sdk-ec2 (1.571.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-ecr (1.112.0)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-rds (1.297.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.202.0)
+    aws-sdk-s3 (1.203.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -159,7 +159,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
-    brakeman (7.1.0)
+    brakeman (7.1.1)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -200,6 +200,10 @@ GEM
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
+    database_cleaner-active_record (2.2.2)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0)
+    database_cleaner-core (2.0.1)
     date (3.5.0)
     date_time_precision (0.8.1)
     debug (1.11.0)
@@ -611,9 +615,9 @@ GEM
     ruby-prof (1.7.2)
       base64
     ruby-progressbar (1.13.0)
-    rubyXL (3.4.33)
+    rubyXL (3.4.35)
       nokogiri (>= 1.10.8)
-      rubyzip (>= 1.3.0)
+      rubyzip (>= 3.2.2)
     rubyntlm (0.6.5)
       base64
     rubyzip (3.2.2)
@@ -800,6 +804,7 @@ DEPENDENCIES
   cssbundling-rails
   csv
   cuprite
+  database_cleaner-active_record
   debug
   devise
   discard

app/components/app_session_actions_component.rb

@@ -130,13 +130,7 @@ def ready_for_vaccinator_row
               count:,
               programme: programme.name_in_sentence
             )
-          href =
-            session_record_path(
-              session,
-              search_form: {
-                programme_types: [programme.type]
-              }
-            )
+          href = session_record_path(session, programme_types: [programme.type])
           count.positive? ? helpers.link_to(text, href) : text
         end
       end

app/components/app_session_dates_table_component.rb

@@ -60,9 +60,8 @@ def tally_vaccination_counts_for_date(session_date)
 
   def count_by_vaccine_method(vaccination_records)
     nasal_spray_count =
-      vaccination_records.count { it.vaccine.method == "nasal" }
-    injection_count =
-      vaccination_records.count { it.vaccine.method == "injection" }
+      vaccination_records.count(&:delivery_method_nasal_spray?)
+    injection_count = vaccination_records.count(&:delivery_method_injection?)
     [nasal_spray_count, injection_count]
   end
 
@@ -79,11 +78,12 @@ def compute_total_tallies
   def vaccination_records_by_date(programme)
     @vaccination_records_by_date ||= {}
     @vaccination_records_by_date[programme.id] ||= VaccinationRecord
+      .administered
+      .kept
       .where(
         programme:,
         session:,
-        patient_id: patients_for_programme(programme),
-        outcome: :administered
+        patient_id: patients_for_programme(programme)
       )
       .group_by { |record| record.performed_at.to_date }
   end

app/components/app_session_overview_tallies_component.html.erb

@@ -68,12 +68,14 @@
       </div>
     <% end %>
   </section>
+
   <section>
     <%= render AppCardComponent.new do |card| %>
       <% card.with_heading(level: 3) { "Action required" } %>
       <%= render AppSessionActionsComponent.new(session, show_heading: false) %>
     <% end %>
   </section>
+
   <section>
     <%= render AppCardComponent.new do |card| %>
       <% card.with_heading(level: 3) { session.clinic? ? "About this clinic" : "About this school" } %>

app/components/app_session_overview_tallies_component.rb

@@ -44,19 +44,25 @@ def cards_for_programme(programme)
       .map do |key, value|
         string_key = key.to_s
         {
-          heading: card_heading_for(string_key),
+          heading: card_heading_for(string_key, programme:),
           colour: card_colour_for(string_key),
           count: value.to_s,
           link_to: card_link_to_for(string_key, programme:)
         }
       end
   end
 
-  def card_heading_for(key)
+  def card_heading_for(key, programme:)
     if key.starts_with?("consent_")
       I18n.t(key[8..], scope: %i[status consent label])
     elsif key == "vaccinated"
-      I18n.t("status.vaccination.label.vaccinated")
+      if programme.mmr?
+        # TODO: Apply this to all multi-dose programmes (Td/IPV) once we
+        #  have confidence in the change.
+        "Fully vaccinated"
+      else
+        I18n.t("status.vaccination.label.vaccinated")
+      end
     end
   end
 

app/controllers/api/reporting/totals_controller.rb

@@ -6,7 +6,7 @@ class API::Reporting::TotalsController < API::Reporting::BaseController
     academic_year: :academic_year,
     programme: :programme_type,
     organisation_id: :organisation_id,
-    gender: :patient_gender_code,
+    gender: :patient_gender,
     year_group: :patient_year_group,
     school_local_authority: :patient_school_local_authority_code,
     local_authority: :patient_local_authority_code
@@ -16,14 +16,14 @@ class API::Reporting::TotalsController < API::Reporting::BaseController
     local_authority: :patient_local_authority_code,
     school: :patient_school_name,
     year_group: :patient_year_group,
-    gender: :patient_gender_code
+    gender: :patient_gender
   }.freeze
 
   GROUP_HEADERS = {
     patient_local_authority_code: "Local Authority",
     patient_school_name: "School",
     patient_year_group: "Year Group",
-    patient_gender_code: "Gender"
+    patient_gender: "Gender"
   }.freeze
 
   METRIC_HEADERS = {
@@ -33,7 +33,12 @@ class API::Reporting::TotalsController < API::Reporting::BaseController
     vaccinated_by_sais: "Vaccinated by SAIS",
     vaccinated_elsewhere_declared: "Vaccinated Elsewhere (Declared)",
     vaccinated_elsewhere_recorded: "Vaccinated Elsewhere (Recorded)",
-    vaccinated_previously: "Vaccinated Previously"
+    vaccinated_previously: "Vaccinated Previously",
+    consent_given: "Consent Given",
+    consent_no_response: "No Consent Response",
+    consent_conflicts: "Conflicting Consent",
+    parent_refused_consent: "Parent Refused Consent",
+    child_refused_vaccination: "Child Refused Vaccination"
   }.freeze
 
   before_action :set_default_filters, :set_filters, :set_scope
@@ -119,7 +124,14 @@ def render_format_json
                @scope.vaccinated_elsewhere_recorded_count,
              vaccinated_previously: @scope.vaccinated_previously_count,
              vaccinations_given: @scope.vaccinations_given_count,
-             monthly_vaccinations_given: @scope.monthly_vaccinations_given
+             monthly_vaccinations_given: @scope.monthly_vaccinations_given,
+             consent_given: @scope.consent_given_count,
+             consent_no_response: @scope.consent_no_response_count,
+             consent_conflicts: @scope.consent_conflicts_count,
+             parent_refused_consent: @scope.parent_refused_consent_count,
+             child_refused_vaccination: @scope.child_refused_vaccination_count,
+             refusal_reasons: consent_refusal_reasons,
+             consent_routes: consent_routes_breakdown
            }
   end
 
@@ -155,4 +167,34 @@ def apply_default_year_group_filter
 
     @scope = @scope.where(Arel::Nodes::Exists.new(subquery))
   end
+
+  def consent_refusal_reasons
+    Consent
+      .joins(:patient)
+      .where(
+        patient_id: @scope.select(:patient_id),
+        programme_id: @scope.select(:programme_id).distinct,
+        academic_year: @scope.select(:academic_year).distinct,
+        response: :refused
+      )
+      .not_invalidated
+      .not_withdrawn
+      .group(:reason_for_refusal)
+      .count
+  end
+
+  def consent_routes_breakdown
+    Consent
+      .joins(:patient)
+      .where(
+        patient_id: @scope.select(:patient_id),
+        programme_id: @scope.select(:programme_id).distinct,
+        academic_year: @scope.select(:academic_year).distinct
+      )
+      .not_invalidated
+      .not_withdrawn
+      .response_provided
+      .group(:route)
+      .count
+  end
 end

app/controllers/api/testing/reporting_refresh_controller.rb

@@ -2,7 +2,7 @@
 
 class API::Testing::ReportingRefreshController < API::Testing::BaseController
   def create
-    ReportingAPI::PatientProgrammeStatus.refresh!
-    redirect_to "/reports"
+    ReportingAPI::RefreshJob.perform_later
+    render status: :accepted
   end
 end

app/controllers/application_controller.rb

@@ -23,6 +23,7 @@ class ApplicationController < ActionController::Base
   before_action :set_app_navigation
 
   after_action :verify_policy_scoped, if: -> { Rails.env.local? }
+  after_action :set_navigation_counts_cookie
 
   class UnprocessableEntity < StandardError
   end
@@ -99,4 +100,19 @@ def set_privacy_policy_url
   def set_sentry_user
     Sentry.set_user(id: current_user&.id)
   end
+
+  # Used by Reporting to display counts in their header
+  def set_navigation_counts_cookie
+    return unless current_user
+
+    unmatched_consent_responses = cached_counts.unmatched_consent_responses || 0
+    school_moves = cached_counts.school_moves || 0
+    imports = cached_counts.import_issues || 0
+
+    cookies[:mavis_navigation_counts] = {
+      unmatched_consent_responses:,
+      school_moves:,
+      imports:
+    }.to_json
+  end
 end