Improve ActivityLog for followed-up consents

If a consent has been followed-up we improve the activity log entry to show
the outcome of the follow-up. We also send a refusal confirmation email is refusal is confirmed
which shows on the activity log too.

Author: murugapl

app/components/app_activity_log_component.rb

@@ -219,7 +219,7 @@ def consent_events
       original_response =
         if consent.withdrawn?
           "given"
-        elsif consent.follow_up_requested?
+        elsif consent.follow_up_requested? || consent.follow_up_resolved?
           "follow_up_requested"
         else
           consent.response
@@ -259,7 +259,7 @@ def consent_events
         }
       end
 
-      if consent.invalidated?
+      if consent.invalidated? && !consent.follow_up_resolved?
         events << {
           title: "Consent from #{consent.name} invalidated",
           at: consent.invalidated_at,
@@ -275,6 +275,16 @@ def consent_events
         }
       end
 
+      if consent.follow_up_resolved?
+        events << {
+          title:
+            "Consent response from #{consent.name} (#{consent.who_responded.downcase_first}) " \
+              "followed-up: refusal #{consent.follow_up_outcome}",
+          at: consent.follow_up_resolved_at,
+          programmes: [consent.programme]
+        }
+      end
+
       events
     end
   end

app/controllers/patient_sessions/consents_controller.rb

@@ -101,6 +101,12 @@ def update_confirm_refusal
         )
       end
 
+      @consent.notifier.send_confirmation(
+        session: @session,
+        triage: nil,
+        sent_by: current_user
+      )
+
       redirect_to session_patient_programme_consent_path,
                   flash: {
                     success: "Consent from #{@consent.name} updated."
@@ -163,7 +169,7 @@ def set_consent
       @patient
         .consents
         .where(academic_year: @session.academic_year)
-        .includes(:consent_form, :parent, patient: :parent_relationships)
+        .includes(:consent_form, :parent, :team, patient: :parent_relationships)
         .find(params[:id])
   end
 

spec/components/app_activity_log_component_spec.rb

@@ -544,6 +544,83 @@
                      programme: "HPV"
   end
 
+  describe "follow-up resolved consent (confirmed)" do
+    before do
+      create(
+        :consent,
+        :follow_up_requested,
+        follow_up_requested: false,
+        follow_up_outcome: "confirmed",
+        follow_up_resolved_at: Time.zone.local(2025, 6, 30, 12),
+        programme: programmes.first,
+        patient:,
+        parent: mum,
+        submitted_at: Time.zone.local(2025, 5, 30, 12)
+      )
+    end
+
+    include_examples "card",
+                     title: "Follow-up requested by Jane Doe (mum)",
+                     date: "30 May 2025 at 12:00pm",
+                     programme: "HPV"
+
+    include_examples "card",
+                     title:
+                       "Consent response from Jane Doe (mum) followed-up: " \
+                         "refusal confirmed",
+                     date: "30 June 2025 at 12:00pm",
+                     programme: "HPV"
+  end
+
+  describe "follow-up resolved consent (withdrawn)" do
+    before do
+      create(
+        :consent,
+        :follow_up_requested,
+        follow_up_outcome: "withdrawn",
+        follow_up_resolved_at: Time.zone.local(2025, 6, 30, 12),
+        invalidated_at: Time.zone.local(2025, 6, 30, 12),
+        notes: "Consent given in follow-up discussion.",
+        programme: programmes.first,
+        patient:,
+        parent: mum,
+        submitted_at: Time.zone.local(2025, 5, 30, 12)
+      )
+      create(
+        :consent,
+        :given_verbally,
+        programme: programmes.first,
+        patient:,
+        parent: mum,
+        submitted_at: Time.zone.local(2025, 6, 30, 13)
+      )
+    end
+
+    include_examples "card",
+                     title: "Follow-up requested",
+                     date: "30 May 2025 at 12:00pm",
+                     programme: "HPV"
+
+    include_examples "card",
+                     title:
+                       "Consent response from Jane Doe (mum) followed-up: " \
+                         "refusal withdrawn",
+                     date: "30 June 2025 at 12:00pm",
+                     programme: "HPV"
+
+    include_examples "card",
+                     title: "Consent given by Jane Doe (mum)",
+                     date: "30 June 2025 at 1:00pm",
+                     programme: "HPV"
+
+    it "does not render an 'invalidated' card for the old consent" do
+      expect(rendered).not_to have_css(
+        ".app-timeline__header",
+        text: "Consent from Jane Doe invalidated"
+      )
+    end
+  end
+
   describe "gillick assessments" do
     let(:programmes) { [Programme.td_ipv] }