Merge pull request #5177 from nhsuk/revert-refactor-important-notices

Revert refactor to important notices

Author: thomasleese

app/components/app_imports_navigation_component.rb

@@ -20,7 +20,7 @@ def call
         selected: active == :issues
       )
 
-      if policy(ImportantNotice).index?
+      if policy(:notices).index?
         nav.with_item(
           href: imports_notices_path,
           text: notices_text,
@@ -42,7 +42,7 @@ def issues_text
   end
 
   def notices_text
-    count = policy_scope(ImportantNotice).count
+    count = ImportantNotices.call(patient_scope: policy_scope(Patient)).length
 
     text_with_count("Important notices", count)
   end

app/components/app_notices_table_component.html.erb

@@ -19,15 +19,15 @@
         <% body.with_row do |row| %>
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Date</span>
-            <%= notice.recorded_at.to_date.to_fs(:long) %>
+            <%= notice[:date_time].to_date.to_fs(:long) %>
           <% end %>
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Child</span>
-            <%= link_to notice.patient.full_name, patient_path(notice.patient) %>
+            <%= link_to notice[:patient].full_name, patient_path(notice[:patient]) %>
           <% end %>
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Notice</span>
-            <%= notice.message %>
+            <%= notice[:message] %>
           <% end %>
         <% end %>
       <% end %>

app/components/app_patient_card_component.rb

@@ -6,7 +6,7 @@ class AppPatientCardComponent < ViewComponent::Base
       <% card.with_heading(level: heading_level) { "Child’s details" } %>
       
       <% important_notices.each do |notice| %>
-        <%= render AppStatusComponent.new(text: notice) %>
+        <%= render AppStatusComponent.new(text: notice[:message]) %>
       <% end %>
 
       <%= render AppChildSummaryComponent.new(
@@ -46,40 +46,5 @@ def initialize(
 
   def show_school_and_year_group = patient.show_year_group?(team: current_team)
 
-  def important_notices
-    notices = patient.important_notices.where(team_id: current_team.id)
-
-    [
-      (
-        if patient.restricted?
-          notices.restricted.order(recorded_at: :desc).first&.message
-        end
-      ),
-      (
-        if patient.invalidated?
-          notices.invalidated.order(recorded_at: :desc).first&.message
-        end
-      ),
-      *notices.deceased.first&.message,
-      *gillick_no_notify_notices
-    ].compact
-  end
-
-  def gillick_no_notify_notices
-    no_notify_vaccination_records =
-      patient.vaccination_records.select do
-        it.notify_parents == false && it.team == current_team
-      end
-
-    if no_notify_vaccination_records.any?
-      vaccinations_sentence =
-        "#{no_notify_vaccination_records.map(&:programme).uniq.map(&:name).to_sentence} " \
-          "#{"vaccination".pluralize(no_notify_vaccination_records.length)}"
-
-      "Child gave consent for #{vaccinations_sentence} under Gillick competence and " \
-        "does not want their parents to be notified. " \
-        "These records will not be automatically synced with GP records. " \
-        "Your team must let the child's GP know they were vaccinated."
-    end
-  end
+  def important_notices = ImportantNotices.call(patient:)
 end

app/controllers/dashboard_controller.rb

@@ -7,6 +7,8 @@ class DashboardController < ApplicationController
 
   def index
     @notices_count =
-      (policy_scope(ImportantNotice).count if policy(ImportantNotice).index?)
+      if policy(:notices).index?
+        ImportantNotices.call(patient_scope: policy_scope(Patient)).length
+      end
   end
 end

app/controllers/imports/notices_controller.rb

@@ -4,11 +4,8 @@ class Imports::NoticesController < ApplicationController
   layout "full"
 
   def index
-    authorize ImportantNotice
+    authorize :notices
 
-    @notices =
-      policy_scope(ImportantNotice).includes(
-        vaccination_record: :programme
-      ).order(recorded_at: :desc)
+    @notices = ImportantNotices.call(patient_scope: policy_scope(Patient))
   end
 end