Merge pull request #1831 from alphagov/theseanything/populate-bounced-at

Record `bounced_at` timestamp when processing submission bounces

Author: theseanything

app/jobs/receive_submission_bounces_and_complaints_job.rb

@@ -29,11 +29,17 @@ def perform
   def process_bounce(submission, ses_message)
     set_submission_logging_attributes(submission)
 
+    bounce_object = ses_message["bounce"] || {}
+
     # Don't mark preview submissions as bounced, just log that they bounced. We don't need to attempt to resend preview
     # submissions so these can be deleted as normal by the deletion job.
-    submission.bounced! unless submission.preview?
-
-    bounce_object = ses_message["bounce"] || {}
+    unless submission.preview?
+      bounced_timestamp = Time.zone.parse(bounce_object["timestamp"])
+      submission.update!(
+        delivery_status: :bounced,
+        bounced_at: bounced_timestamp,
+      )
+    end
 
     ses_bounce = {
       bounce_type: bounce_object["bounceType"],

spec/jobs/receive_submission_bounces_and_complaints_job_spec.rb

@@ -74,11 +74,25 @@
     end
 
     context "when it is for a live submission" do
+      let(:bounce_timestamp) { "2023-01-01T12:00:00Z" }
+      let(:ses_message_body) do
+        {
+          "mail" => { "messageId" => mail_message_id },
+          "eventType" => event_type,
+          "bounce" => { "timestamp" => bounce_timestamp },
+        }
+      end
+
       it "updates the submission mail status to bounced" do
         perform_enqueued_jobs
         expect(submission.reload.bounced?).to be true
       end
 
+      it "updates the submission bounced_at timestamp" do
+        perform_enqueued_jobs
+        expect(submission.reload.bounced_at).to eq(Time.zone.parse(bounce_timestamp))
+      end
+
       it "doesn't change the mail status for other submissions" do
         perform_enqueued_jobs
         expect(other_submission.reload.pending?).to be true
@@ -145,7 +159,8 @@
 
     context "when there is a bounce object with detailed information" do
       let(:ses_message_body) { { "mail" => { "messageId" => mail_message_id }, "eventType" => event_type, "bounce" => bounce } }
-      let(:bounce) { { "bounceType" => "Permanent", "bounceSubType" => "General", "bouncedRecipients" => bounced_recipients } }
+      let(:bounce) { { "bounceType" => "Permanent", "bounceSubType" => "General", "bouncedRecipients" => bounced_recipients, "timestamp" => bounce_timestamp } }
+      let(:bounce_timestamp) { "2023-01-01T12:00:00Z" }
       let(:bounced_recipients) { [{ "emailAddress" => "bounce@example.com" }] }
 
       it "logs the bounce details" do