Merge pull request #1441 from alphagov/stop-using-delivered-mail-status

Stop using delivered mail status

Author: jamie-o-wilkinson

app/jobs/receive_submission_deliveries_job.rb

@@ -76,7 +76,6 @@ def process_messages(sqs_client, queue_url, messages)
   def process_delivery(submission)
     set_submission_logging_attributes(submission)
 
-    submission.delivered!
     EventLogger.log_form_event("submission_delivered")
   end
 end

db/migrate/20250529084029_update_mail_status_for_pending_submissions.rb

@@ -0,0 +1,5 @@
+class UpdateMailStatusForPendingSubmissions < ActiveRecord::Migration[8.0]
+  def change
+    Submission.where(mail_status: :delivered).update_all(mail_status: :pending)
+  end
+end

db/schema.rb

@@ -90,11 +90,6 @@
         allow(CloudWatchService).to receive(:record_submission_delivery_latency_metric)
       end
 
-      it "updates the submission mail status to delivered" do
-        perform_enqueued_jobs
-        expect(submission.reload.delivered?).to be true
-      end
-
       it "doesn't change the mail status for other submissions" do
         perform_enqueued_jobs
         expect(other_submission.reload.bounced?).to be true