Handle weekly batch receiving submissions

Author: SamJamCul

app/jobs/receive_submission_deliveries_job.rb

@@ -34,7 +34,7 @@ def perform
 
   def process_delivery(delivery, submission, **attributes)
     set_submission_logging_attributes(submission:, delivery:) if delivery.immediate?
-    set_submission_batch_logging_attributes(form: submission.form, mode: submission.mode_object, delivery:) if delivery.daily?
+    set_submission_batch_logging_attributes(form: submission.form, mode: submission.mode_object, delivery:) if delivery.daily? || delivery.weekly?
 
     delivery.update! attributes
 

spec/jobs/receive_submission_deliveries_job_spec.rb

@@ -60,6 +60,19 @@
         expect(CloudWatchService).not_to have_received(:record_submission_delivery_latency_metric)
       end
     end
+
+    context "when the delivery is a weekly batch delivery" do
+      let(:submission) { create :submission, :sent, delivery_reference: "something-else", created_at: Time.zone.parse("2025-05-09T10:25:35.001Z") }
+
+      before do
+        create :delivery, :weekly, delivery_reference:, submissions: [submission], created_at: Time.zone.parse("2025-05-09T10:25:35.001Z")
+      end
+
+      it "does not send submission delivery latency metric" do
+        described_class.perform_now
+        expect(CloudWatchService).not_to have_received(:record_submission_delivery_latency_metric)
+      end
+    end
   end
 
   describe "processing delivery notifications" do
@@ -94,7 +107,32 @@
 
     context "when the delivery is a daily batch delivery" do
       let!(:submission) { create :submission, :sent, delivery_reference: "something-else" }
-      let!(:delivery) { create(:delivery, :daily, delivery_reference:, submissions: [submission], created_at: Time.zone.parse("2025-05-09T10:25:35.001Z")) }
+      let!(:delivery) { create(:delivery, :daily_scheduled_delivery, delivery_reference:, submissions: [submission], created_at: Time.zone.parse("2025-05-09T10:25:35.001Z")) }
+
+      it "logs form event with batch delivery details", :capture_logging do
+        perform_enqueued_jobs
+
+        expect(log_lines).to include(hash_including(
+                                       "level" => "INFO",
+                                       "message" => "Form event",
+                                       "event" => "form_submission_batch_delivered",
+                                       "form_id" => submission.form_id,
+                                       "form_name" => submission.form.name,
+                                       "delivery_reference" => delivery_reference,
+                                       "delivery_id" => delivery.id,
+                                       "delivery_schedule" => "daily",
+                                       "batch_begin_at" => delivery.batch_begin_at,
+                                       "preview" => "false",
+                                       "sns_message_timestamp" => sns_message_timestamp,
+                                       "job_id" => @job_id,
+                                       "job_class" => "ReceiveSubmissionDeliveriesJob",
+                                     ))
+      end
+    end
+
+    context "when the delivery is a weekly batch delivery" do
+      let!(:submission) { create :submission, :sent, delivery_reference: "something-else" }
+      let!(:delivery) { create(:delivery, :weekly_scheduled_delivery, delivery_reference:, submissions: [submission], created_at: Time.zone.parse("2025-05-09T10:25:35.001Z")) }
 
       it "logs form event with batch delivery details", :capture_logging do
         perform_enqueued_jobs
@@ -107,6 +145,8 @@
                                        "form_name" => submission.form.name,
                                        "delivery_reference" => delivery_reference,
                                        "delivery_id" => delivery.id,
+                                       "delivery_schedule" => "weekly",
+                                       "batch_begin_at" => delivery.batch_begin_at,
                                        "preview" => "false",
                                        "sns_message_timestamp" => sns_message_timestamp,
                                        "job_id" => @job_id,