Move confirmation_email_id from request to job log attribute

We no longer send the email at request time, this attribute is only
available in the job context.

Author: theseanything

app/jobs/send_confirmation_email_job.rb

@@ -3,7 +3,7 @@ class SendConfirmationEmailJob < ApplicationJob
   MailerOptions = Data.define(:title, :is_preview, :timestamp, :submission_reference, :payment_url)
 
   def perform(submission:, notify_response_id:, confirmation_email_address:)
-    set_submission_logging_attributes(submission)
+    set_submission_logging_attributes(submission:)
 
     I18n.with_locale(submission.submission_locale || I18n.default_locale) do
       form = submission.form
@@ -16,6 +16,7 @@ def perform(submission:, notify_response_id:, confirmation_email_address:)
       )
 
       mail.deliver_now
+      CurrentJobLoggingAttributes.confirmation_email_id = mail.govuk_notify_response.id
     end
   rescue StandardError
     CloudWatchService.record_job_failure_metric(self.class.name)

app/models/current_job_logging_attributes.rb

@@ -7,6 +7,7 @@ class CurrentJobLoggingAttributes < ActiveSupport::CurrentAttributes
             :preview,
             :delivery_id,
             :delivery_reference,
+            :confirmation_email_id,
             :sqs_message_id,
             :sns_message_timestamp
 
@@ -20,6 +21,7 @@ def as_hash
       preview: preview.to_s,
       delivery_id:,
       delivery_reference:,
+      confirmation_email_id:,
       sqs_message_id:,
       sns_message_timestamp:,
     }.compact_blank

app/models/current_request_logging_attributes.rb

@@ -12,7 +12,6 @@ class CurrentRequestLoggingAttributes < ActiveSupport::CurrentAttributes
             :question_number,
             :submission_reference,
             :confirmation_email_reference,
-            :confirmation_email_id,
             :rescued_exception,
             :rescued_exception_trace,
             :validation_errors,
@@ -33,7 +32,6 @@ def as_hash
       question_number:,
       submission_reference:,
       confirmation_email_reference:,
-      confirmation_email_id:,
       rescued_exception:,
       rescued_exception_trace:,
       validation_errors:,

spec/models/current_request_logging_attributes_spec.rb

@@ -23,7 +23,6 @@
       current.question_number = 3
       current.submission_reference = "a-submission-ref"
       current.confirmation_email_reference = "a-confirmation-email-ref"
-      current.confirmation_email_id = "a-confirmation-email-id"
       current.rescued_exception = "StandardError"
       current.rescued_exception_trace = "a trace"
       current.validation_errors = ["text: blank"]
@@ -43,7 +42,6 @@
         question_number: 3,
         submission_reference: "a-submission-ref",
         confirmation_email_reference: "a-confirmation-email-ref",
-        confirmation_email_id: "a-confirmation-email-id",
         rescued_exception: "StandardError",
         rescued_exception_trace: "a trace",
         validation_errors: ["text: blank"],
@@ -55,10 +53,6 @@
       expect(current.as_hash.key?(:confirmation_email_reference)).to be false
     end
 
-    it "does not include nil confirmation_email_id" do
-      expect(current.as_hash.key?(:confirmation_email_id)).to be false
-    end
-
     it "does not include the validation errors array if empty" do
       current.validation_errors = []
       expect(current.as_hash.keys).not_to include :validation_errors