feat: message group id for report request and reporting tasks

Author: joybytes

app/celery/reporting_tasks.py

@@ -174,6 +174,7 @@ def create_nightly_notification_status():
                         "service_id": service_id,
                     },
                     queue=QueueNames.REPORTING,
+                    MessageGroupId=str(service_id),
                 )
 
 

app/service/rest.py

@@ -1610,6 +1610,7 @@ def create_report_request_by_type(service_id):
     process_report_request.apply_async(
         kwargs={"service_id": report_request.service_id, "report_request_id": report_request.id},
         queue=QueueNames.REPORT_REQUESTS_NOTIFICATIONS,
+        MessageGroupId=str(report_request.service_id),
     )
 
     return jsonify(data=created_request.serialize()), 201

tests/app/celery/test_reporting_tasks.py

@@ -78,6 +78,7 @@ def test_create_nightly_notification_status_triggers_tasks(
     mock_celery.assert_called_with(
         kwargs={"service_id": sample_service.id, "process_day": "2019-07-31", "notification_type": SMS_TYPE},
         queue=QueueNames.REPORTING,
+        MessageGroupId=str(sample_service.id),
     )
 
 

tests/app/service/test_rest.py

@@ -2598,7 +2598,11 @@ def test_verify_reply_to_email_address_should_send_verification_email(
     notification = Notification.query.first()
     assert notification.template_id == verify_reply_to_address_email_template.id
     assert response["data"] == {"id": str(notification.id)}
-    mocked.assert_called_once_with([str(notification.id)], queue="notify-internal-tasks")
+    mocked.assert_called_once_with(
+        [str(notification.id)],
+        queue="notify-internal-tasks",
+        MessageGroupId=str(notification.service_id),
+    )
     assert notification.reply_to_text == notify_service.get_default_reply_to_email_address()
 
 
@@ -4594,7 +4598,11 @@ def test_update_service_join_request_by_id_notification_sent(
     )
 
     notification = Notification.query.first()
-    mock_deliver_email_task.assert_called_once_with(([str(notification.id)]), queue="notify-internal-tasks")
+    mock_deliver_email_task.assert_called_once_with(
+        ([str(notification.id)]),
+        queue="notify-internal-tasks",
+        MessageGroupId=str(notification.service_id),
+    )
 
     assert notification.reply_to_text == notify_service.get_default_reply_to_email_address()
     assert notification.to == f"{requester_id}@digital.cabinet-office.gov.uk"
@@ -4640,7 +4648,11 @@ def test_update_service_join_request_get_template(
     )
 
     notification = Notification.query.first()
-    mock_deliver_email_task.assert_called_once_with(([str(notification.id)]), queue="notify-internal-tasks")
+    mock_deliver_email_task.assert_called_once_with(
+        ([str(notification.id)]),
+        queue="notify-internal-tasks",
+        MessageGroupId=str(notification.service_id),
+    )
 
     assert notification.template.version == template.version
     assert notification.template_id == template.id
@@ -4786,6 +4798,7 @@ def test_create_report_request_by_type(
             "service_id": sample_service.id,
         },
         queue="report-requests-notifications-tasks",
+        MessageGroupId=str(sample_service.id),
     )
 
     assert json_resp["data"]["id"]
@@ -4869,6 +4882,7 @@ def test_create_report_request_by_type_creates_new_when_no_existing(admin_reques
             "service_id": sample_service.id,
         },
         queue="report-requests-notifications-tasks",
+        MessageGroupId=str(sample_service.id),
     )
 
 
@@ -4917,4 +4931,5 @@ def test_create_report_request_by_type_creates_new_if_existing_is_stale(
             "service_id": sample_service.id,
         },
         queue="report-requests-notifications-tasks",
+        MessageGroupId=str(sample_service.id),
     )