Handle weekly batch bounces and complaints

Author: SamJamCul

app/jobs/application_job.rb

@@ -18,5 +18,7 @@ def set_submission_batch_logging_attributes(form:, mode:, delivery:)
     CurrentJobLoggingAttributes.preview = mode.preview?
     CurrentJobLoggingAttributes.delivery_id = delivery.id
     CurrentJobLoggingAttributes.delivery_reference = delivery.delivery_reference
+    CurrentJobLoggingAttributes.delivery_schedule = delivery.delivery_schedule
+    CurrentJobLoggingAttributes.batch_begin_at = delivery.batch_begin_at
   end
 end

app/jobs/receive_submission_bounces_and_complaints_job.rb

@@ -32,7 +32,7 @@ def perform
   def set_logging_attributes(submission:, delivery:)
     if delivery.immediate?
       set_submission_logging_attributes(submission:, delivery:)
-    elsif delivery.daily?
+    elsif delivery.daily? || delivery.weekly?
       set_submission_batch_logging_attributes(form: submission.form, mode: submission.mode_object, delivery:)
     end
   end
@@ -66,8 +66,14 @@ def process_bounce(delivery, submission, ses_message)
       }
     end
 
-    process_immediate_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients) if delivery.immediate?
-    process_daily_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients) if delivery.daily?
+    case delivery.delivery_schedule
+    when "immediate"
+      process_immediate_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients)
+    when "daily"
+      process_daily_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients)
+    when "weekly"
+      process_weekly_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients)
+    end
   end
 
   def process_immediate_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients)
@@ -96,9 +102,27 @@ def process_daily_delivery_bounce(delivery, submission, ses_bounce, bounced_reci
                              extra: {
                                form_id: submission.form_id,
                                delivery_reference: delivery.delivery_reference,
+                               delivery_id: delivery.id,
                                delivery_schedule: delivery.delivery_schedule,
+                               batch_begin_at: delivery.batch_begin_at,
+                               job_id:,
+                               ses_bounce:,
+                             })
+    end
+  end
+
+  def process_weekly_delivery_bounce(delivery, submission, ses_bounce, bounced_recipients)
+    EventLogger.log_form_event("weekly_batch_email_bounced", ses_bounce: ses_bounce.merge(bounced_recipients:))
+
+    unless submission.preview?
+      Sentry.capture_message("Weekly submission batch email bounced for form #{submission.form_id} - #{self.class.name}:",
+                             fingerprint: ["{{ default }}", submission.form_id],
+                             extra: {
+                               form_id: submission.form_id,
+                               delivery_reference: delivery.delivery_reference,
                                delivery_id: delivery.id,
-                               batch_date: submission.submission_time.to_date,
+                               delivery_schedule: delivery.delivery_schedule,
+                               batch_begin_at: delivery.batch_begin_at,
                                job_id:,
                                ses_bounce:,
                              })
@@ -110,6 +134,8 @@ def process_complaint(delivery)
       EventLogger.log_form_event("submission_complaint")
     elsif delivery.daily?
       EventLogger.log_form_event("daily_batch_email_complaint")
+    elsif delivery.weekly?
+      EventLogger.log_form_event("weekly_batch_email_complaint")
     end
   end
 end

app/models/current_job_logging_attributes.rb

@@ -7,6 +7,8 @@ class CurrentJobLoggingAttributes < ActiveSupport::CurrentAttributes
             :preview,
             :delivery_id,
             :delivery_reference,
+            :delivery_schedule,
+            :batch_begin_at,
             :confirmation_email_id,
             :sqs_message_id,
             :sns_message_timestamp
@@ -21,6 +23,8 @@ def as_hash
       preview: preview.to_s,
       delivery_id:,
       delivery_reference:,
+      delivery_schedule:,
+      batch_begin_at:,
       confirmation_email_id:,
       sqs_message_id:,
       sns_message_timestamp:,

spec/factories/deliveries.rb

@@ -38,6 +38,12 @@
 
     trait :daily_scheduled_delivery do
       delivery_schedule { "daily" }
+      batch_begin_at { Time.current.beginning_of_day }
+    end
+
+    trait :weekly_scheduled_delivery do
+      delivery_schedule { "weekly" }
+      batch_begin_at { (Time.current - 7.days).beginning_of_day }
     end
   end
 end