Merge pull request #838 from NHSDigital/dtoss-11768-remove-message-status-queue

DTOSS-11768 Remove message status queue

Author: Harriethw

infrastructure/modules/container-apps/alerts.tf

@@ -42,7 +42,6 @@ resource "azurerm_monitor_scheduled_query_rules_alert_v2" "failure_event" {
 # currently this feature is in preview.
 resource "azurerm_monitor_scheduled_query_rules_alert_v2" "queue_length_high" {
   for_each = var.enable_alerting ? toset([
-    "notifications-message-status-updates",
     "notifications-message-batch-retries"
   ]) : []
 

infrastructure/modules/container-apps/jobs.tf

@@ -37,7 +37,6 @@ locals {
       cron_expression = "*/5 * * * *"
       environment_variables = {
         RETRY_QUEUE_NAME          = "notifications-message-batch-retries"
-        STATUS_UPDATES_QUEUE_NAME = "notifications-message-status-updates"
         ENVIRONMENT               = var.environment
       }
       job_short_name     = "clm"

infrastructure/modules/container-apps/variables.tf

@@ -259,7 +259,7 @@ locals {
       container_access_type = "private"
     }
   }
-  storage_queues = ["notifications-message-status-updates", "notifications-message-batch-retries"]
+  storage_queues = ["notifications-message-batch-retries"]
 
   always_allowed_paths = ["/sha", "/healthcheck"]
   # If allowed_paths is not set, use the module default which allows any pattern

manage_breast_screening/config/.env.tpl

@@ -44,7 +44,6 @@ NBSS_MESH_PRIVATE_KEY="paste-pem-private-key-here"
 QUEUE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
 REPORTS_CONTAINER_NAME="notifications-reports"
 RETRY_QUEUE_NAME="notifications-message-batch-retries"
-STATUS_UPDATES_QUEUE_NAME="notifications-message-status-updates"
 
 APPLICATIONINSIGHTS_CONNECTION_STRING=""
 APPLICATIONINSIGHTS_STATSBEAT_DISABLED_ALL=True

manage_breast_screening/notifications/management/commands/collect_metrics.py

@@ -12,7 +12,6 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         try:
             queues = [
-                Queue.MessageStatusUpdates(),
                 Queue.RetryMessageBatches(),
             ]
 

manage_breast_screening/notifications/services/queue.py

@@ -62,14 +62,6 @@ def item(self):
     def get_message_count(self):
         return self.client.get_queue_properties().approximate_message_count
 
-    @classmethod
-    def MessageStatusUpdates(cls):
-        return cls(
-            os.getenv(
-                "STATUS_UPDATES_QUEUE_NAME", "notifications-message-status-updates"
-            )
-        )
-
     @classmethod
     def RetryMessageBatches(cls):
         return cls(os.getenv("RETRY_QUEUE_NAME", "notifications-message-batch-retries"))

manage_breast_screening/notifications/tests/management/commands/test_collect_metrics.py

@@ -15,28 +15,17 @@ def setup(self, monkeypatch):
     @patch(f"{Command.__module__}.Queue")
     @patch(f"{Command.__module__}.Metrics")
     def test_handle_sends_queue_lengths(self, mock_metrics_class, mock_queue):
-        mock_status = MagicMock()
-        mock_status.queue_name = "status_queue"
-        mock_status.get_message_count.return_value = 2
-
         mock_retry = MagicMock()
         mock_retry.queue_name = "retry_queue"
         mock_retry.get_message_count.return_value = 5
 
-        mock_queue.MessageStatusUpdates.return_value = mock_status
         mock_queue.RetryMessageBatches.return_value = mock_retry
 
         Command().handle()
 
         metrics_instance = mock_metrics_class.return_value
 
-        assert metrics_instance.set_gauge_value.call_count == 2
-        metrics_instance.set_gauge_value.assert_any_call(
-            "queue_size_status_queue",
-            "messages",
-            "Queue length",
-            2,
-        )
+        assert metrics_instance.set_gauge_value.call_count == 1
         metrics_instance.set_gauge_value.assert_any_call(
             "queue_size_retry_queue",
             "messages",

manage_breast_screening/notifications/tests/services/test_queue.py

@@ -41,21 +41,6 @@ def test_add_to_queue(self, mock_queue_client):
 
         mock_queue_client.send_message.assert_called_once_with("a message")
 
-    def test_message_status_updates_queue(self):
-        with patch(
-            "manage_breast_screening.notifications.services.queue.QueueClient"
-        ) as queue_client:
-            mock_client = MagicMock()
-            queue_client.from_connection_string.return_value = mock_client
-
-            Queue.MessageStatusUpdates().add("some data")
-
-            queue_client.from_connection_string.assert_called_once_with(
-                "qqq111", "notifications-message-status-updates"
-            )
-            mock_client.create_queue.assert_called_once()
-            mock_client.send_message.assert_called_once_with("some data")
-
     def test_items_method_receives_messages(self, mock_queue_client):
         mock_queue_client.receive_messages.return_value = ["this", "that"]
 
@@ -99,20 +84,6 @@ def test_queue_initialises_using_managed_identity_credentials(self, monkeypatch)
                     client_id="my-mi-id"
                 )
 
-    def test_update_queue_prefers_queue_name_from_env(self, monkeypatch):
-        monkeypatch.setenv("STATUS_UPDATES_QUEUE_NAME", "updates")
-        with patch(
-            "manage_breast_screening.notifications.services.queue.QueueClient"
-        ) as queue_client:
-            mock_client = MagicMock()
-            queue_client.from_connection_string.return_value = mock_client
-
-            Queue.MessageStatusUpdates()
-
-            queue_client.from_connection_string.assert_called_once_with(
-                "qqq111", "updates"
-            )
-
     def test_retry_message_batches_queue(self):
         with patch(
             "manage_breast_screening.notifications.services.queue.QueueClient"