Add method to send weekly CSV to AwsSesSubmissionBatchService

Add a method that generates the CSV(s) for the defined date range and
sends the email with them attached.

We haven't decided what the CSV filenames will be for weekly
submissions yet, so for now keep them the same as for the daily
submissions using the the end date of the range. We can update this
when it's decided.

Author: stephencdaly

app/services/aws_ses_submission_batch_service.rb

@@ -6,18 +6,47 @@ def initialize(submissions_query:, form:, mode:)
   end
 
   def send_daily_batch(date:)
+    files = csv_attachments(date)
+
+    mail = AwsSesSubmissionBatchMailer.daily_submission_batch_email(form: @form, date:, mode: @mode, files:).deliver_now
+
+    CurrentJobLoggingAttributes.delivery_reference = mail.message_id
+    mail.message_id
+  end
+
+  def send_weekly_batch(begin_date:, end_date:)
+    files = csv_attachments(end_date)
+
+    mail = AwsSesSubmissionBatchMailer.weekly_submission_batch_email(
+      form: @form,
+      begin_date:,
+      end_date:,
+      mode: @mode,
+      files:,
+    ).deliver_now
+
+    CurrentJobLoggingAttributes.delivery_reference = mail.message_id
+    mail.message_id
+  end
+
+private
+
+  def csv_attachments(date_for_filename)
     files = {}
 
     csvs = CsvGenerator.generate_batched_submissions(submissions_query: @submissions_query, is_s3_submission: false)
     csvs.each.with_index(1) do |csv, index|
       csv_version = csvs.size > 1 ? index : nil
-      filename = SubmissionFilenameGenerator.batch_csv_filename(form_name: @form.name, date:, mode: @mode, form_version: csv_version)
+      filename = SubmissionFilenameGenerator.batch_csv_filename(
+        form_name: @form.name,
+        date: date_for_filename,
+        mode: @mode,
+        form_version: csv_version,
+      )
+
       files[filename] = csv
     end
 
-    mail = AwsSesSubmissionBatchMailer.daily_submission_batch_email(form: @form, date:, mode: @mode, files:).deliver_now
-
-    CurrentJobLoggingAttributes.delivery_reference = mail.message_id
-    mail.message_id
+    files
   end
 end

spec/services/aws_ses_submission_batch_service_spec.rb

@@ -5,11 +5,12 @@
   let(:form) { build(:form, submission_email:) }
   let(:form_document) { build(:v2_form_document, :with_steps, form_id: form.id) }
   let(:submission_email) { "submit@email.gov.uk" }
-  let(:date) { Date.new(2024, 6, 1) }
   let(:mode) { instance_double(Mode, preview?: false) }
   let(:submissions_query) { Submission.all }
 
   describe "#send_daily_batch" do
+    let(:date) { Date.new(2024, 6, 1) }
+
     before do
       allow(SubmissionFilenameGenerator).to receive(:batch_csv_filename).and_return("filename.csv")
       allow(CsvGenerator).to receive(:generate_batched_submissions).and_return(%w[csv-content])
@@ -28,6 +29,20 @@
       expect(message_id).to eq last_email.message_id
     end
 
+    context "when the csv generator returns a single csv version" do
+      it "calls the AwsSesSubmissionBatchMailer to send the email with the generated file" do
+        expect(AwsSesSubmissionBatchMailer).to receive(:daily_submission_batch_email)
+                                                 .with(
+                                                   form:,
+                                                   date:,
+                                                   mode:,
+                                                   files: { "filename.csv" => "csv-content" },
+                                                 ).and_call_original
+
+        service.send_daily_batch(date:)
+      end
+    end
+
     context "when the csv generator returns multiple csv versions" do
       before do
         allow(CsvGenerator).to receive(:generate_batched_submissions).and_return(%w[csv-content csv-content-2])
@@ -42,15 +57,79 @@
 
       it "calls the AwsSesSubmissionBatchMailer to send the email with the generated files" do
         expect(AwsSesSubmissionBatchMailer).to receive(:daily_submission_batch_email)
-          .with(
-            form:,
-            date:,
-            mode:,
-            files: { "filename.csv" => "csv-content", "filename-2.csv" => "csv-content-2" },
-          ).and_call_original
+                                                 .with(
+                                                   form:,
+                                                   date:,
+                                                   mode:,
+                                                   files: { "filename.csv" => "csv-content", "filename-2.csv" => "csv-content-2" },
+                                                 ).and_call_original
 
         service.send_daily_batch(date:)
       end
     end
   end
+
+  describe "#send_weekly_batch" do
+    let(:begin_date) { Date.new(2024, 6, 1) }
+    let(:end_date) { Date.new(2024, 6, 7) }
+
+    before do
+      allow(SubmissionFilenameGenerator).to receive(:batch_csv_filename).and_return("filename.csv")
+      allow(CsvGenerator).to receive(:generate_batched_submissions).and_return(%w[csv-content])
+      create_list(:submission, 3, form_document:)
+    end
+
+    it "calls the SubmissionFilenameGenerator with a nil form version" do
+      expect(SubmissionFilenameGenerator).to receive(:batch_csv_filename).with(form_name: form.name, date: end_date, mode:, form_version: nil)
+      service.send_weekly_batch(begin_date:, end_date:)
+    end
+
+    it "returns the message id" do
+      message_id = service.send_weekly_batch(begin_date:, end_date:)
+
+      last_email = ActionMailer::Base.deliveries.last
+      expect(message_id).to eq last_email.message_id
+    end
+
+    context "when the csv generator returns a single csv version" do
+      it "calls the AwsSesSubmissionBatchMailer to send the email with the generated file" do
+        expect(AwsSesSubmissionBatchMailer).to receive(:weekly_submission_batch_email)
+                                                 .with(
+                                                   form:,
+                                                   begin_date:,
+                                                   end_date:,
+                                                   mode:,
+                                                   files: { "filename.csv" => "csv-content" },
+                                                 ).and_call_original
+
+        service.send_weekly_batch(begin_date:, end_date:)
+      end
+    end
+
+    context "when the csv generator returns multiple csv versions" do
+      before do
+        allow(CsvGenerator).to receive(:generate_batched_submissions).and_return(%w[csv-content csv-content-2])
+        allow(SubmissionFilenameGenerator).to receive(:batch_csv_filename).and_return("filename.csv", "filename-2.csv")
+      end
+
+      it "calls the SubmissionFilenameGenerator to generate a filename for each form version" do
+        expect(SubmissionFilenameGenerator).to receive(:batch_csv_filename).with(form_name: form.name, date: end_date, mode:, form_version: 1)
+        expect(SubmissionFilenameGenerator).to receive(:batch_csv_filename).with(form_name: form.name, date: end_date, mode:, form_version: 2)
+        service.send_weekly_batch(begin_date:, end_date:)
+      end
+
+      it "calls the AwsSesSubmissionBatchMailer to send the email with the generated files" do
+        expect(AwsSesSubmissionBatchMailer).to receive(:weekly_submission_batch_email)
+                                                 .with(
+                                                   form:,
+                                                   begin_date:,
+                                                   end_date:,
+                                                   mode:,
+                                                   files: { "filename.csv" => "csv-content", "filename-2.csv" => "csv-content-2" },
+                                                 ).and_call_original
+
+        service.send_weekly_batch(begin_date:, end_date:)
+      end
+    end
+  end
 end