Merge pull request #1665 from alphagov/ldeb-update-submission-delivered-at

Save SES message delivery time to submission record

Author: lfdebrux

app/jobs/receive_submission_deliveries_job.rb

@@ -60,10 +60,10 @@ def process_messages(sqs_client, queue_url, messages)
 
       submission = Submission.find_by!(mail_message_id: ses_message_id)
 
-      process_delivery(submission)
+      delivery_time = Time.zone.parse(ses_message["delivery"]["timestamp"])
+      process_delivery(submission, delivered_at: delivery_time)
       sqs_client.delete_message(queue_url: queue_url, receipt_handle: receipt_handle)
 
-      delivery_time = Time.zone.parse(ses_message["delivery"]["timestamp"])
       submission_duration_ms = ((delivery_time - submission.created_at) * 1000).round
       CloudWatchService.record_submission_delivery_latency_metric(submission_duration_ms, "Email")
     rescue StandardError => e
@@ -74,9 +74,11 @@ def process_messages(sqs_client, queue_url, messages)
     end
   end
 
-  def process_delivery(submission)
+  def process_delivery(submission, **attributes)
     set_submission_logging_attributes(submission)
 
+    submission.update! attributes
+
     EventLogger.log_form_event("submission_delivered")
   end
 end

spec/jobs/receive_submission_deliveries_job_spec.rb

@@ -111,6 +111,11 @@
                                      ))
       end
 
+      it "saves the submission delivery time to the submission record" do
+        perform_enqueued_jobs
+        expect(submission.reload.delivered_at).to eq ses_delivery_timestamp
+      end
+
       it "sends cloudwatch metric for submission delivery time" do
         perform_enqueued_jobs
         # latency is ses_delivery_timestamp - submission.created_at