Add GOV.UK Notify personalisation include today's date

In c6f8b2a we updated the
`next_session_` personalisation variables to remove today's date from
any of these values. This was to fix an issue where today's date was
showing in session reminders.

However, this broke the consent confirmation emails where we do need to
include today's date if consent happens to be given on the day of a
session. To resolve this, we introduce a new set of personalisation
variables that includes today's date and we will update the consent
templates to use these new variables.

Jira-Issue: MAV-944

Author: thomasleese

app/lib/govuk_notify_personalisation.rb

@@ -39,6 +39,9 @@ def to_h
       day_month_year_of_vaccination:,
       full_and_preferred_patient_name:,
       location_name:,
+      next_or_today_session_date:,
+      next_or_today_session_dates:,
+      next_or_today_session_dates_or:,
       next_session_date:,
       next_session_dates:,
       next_session_dates_or:,
@@ -136,6 +139,24 @@ def location_name
     session.location.name
   end
 
+  def next_or_today_session_date
+    session.next_date(include_today: true)&.to_fs(:short_day_of_week)
+  end
+
+  def next_or_today_session_dates
+    session
+      .today_or_future_dates
+      .map { it.to_fs(:short_day_of_week) }
+      .to_sentence
+  end
+
+  def next_or_today_session_dates_or
+    session
+      .today_or_future_dates
+      .map { it.to_fs(:short_day_of_week) }
+      .to_sentence(last_word_connector: ", or ", two_words_connector: " or ")
+  end
+
   def next_session_date
     session.next_date(include_today: false)&.to_fs(:short_day_of_week)
   end
@@ -147,7 +168,7 @@ def next_session_dates
   def next_session_dates_or
     session
       .future_dates
-      .map { _1.to_fs(:short_day_of_week) }
+      .map { it.to_fs(:short_day_of_week) }
       .to_sentence(last_word_connector: ", or ", two_words_connector: " or ")
   end
 

spec/lib/govuk_notify_personalisation_spec.rb

@@ -56,6 +56,9 @@
           "http://localhost:4000/consents/#{session.slug}/hpv/start",
         full_and_preferred_patient_name: "John Smith",
         location_name: "Hogwarts",
+        next_or_today_session_date: "Thursday 1 January",
+        next_or_today_session_dates: "Thursday 1 January",
+        next_or_today_session_dates_or: "Thursday 1 January",
         next_session_date: "Thursday 1 January",
         next_session_dates: "Thursday 1 January",
         next_session_dates_or: "Thursday 1 January",
@@ -86,8 +89,9 @@
       )
     end
 
-    it "doesn't show today's date" do
+    it "doesn't show today's date in next date" do
       expect(to_h).to include(
+        next_or_today_session_date: Date.current.to_fs(:short_day_of_week),
         next_session_date: Date.tomorrow.to_fs(:short_day_of_week)
       )
     end
@@ -121,6 +125,11 @@
       expect(to_h).to match(
         hash_including(
           consent_deadline: "Wednesday 31 December",
+          next_or_today_session_date: "Thursday 1 January",
+          next_or_today_session_dates:
+            "Thursday 1 January and Friday 2 January",
+          next_or_today_session_dates_or:
+            "Thursday 1 January or Friday 2 January",
           next_session_date: "Thursday 1 January",
           next_session_dates: "Thursday 1 January and Friday 2 January",
           next_session_dates_or: "Thursday 1 January or Friday 2 January",
@@ -137,6 +146,11 @@
         expect(to_h).to match(
           hash_including(
             consent_deadline: "Thursday 1 January",
+            next_or_today_session_date: "Thursday 1 January",
+            next_or_today_session_dates:
+              "Thursday 1 January and Friday 2 January",
+            next_or_today_session_dates_or:
+              "Thursday 1 January or Friday 2 January",
             next_session_date: "Friday 2 January",
             subsequent_session_dates_offered_message: ""
           )