refactor the queue class

Author: mrlockstar

manage_breast_screening/notifications/management/commands/save_message_status.py

@@ -13,6 +13,7 @@
     Message,
     MessageStatus,
 )
+from manage_breast_screening.notifications.services.metrics import Metrics
 from manage_breast_screening.notifications.services.queue import Queue
 
 INSIGHTS_ERROR_NAME = "SaveMessageStatusError"
@@ -41,6 +42,9 @@ def handle(self, *args, **options):
                 if self.save_status_update():
                     logger.info(f"Message status update {item} saved")
 
+            self.metrics = Metrics(queue.queue_name, "messages", "Queue length")
+            self.metrics.add(queue.get_message_count())
+
     def save_status_update(self) -> bool:
         try:
             if self.data["type"] == "ChannelStatus":

manage_breast_screening/notifications/services/queue.py

@@ -5,8 +5,6 @@
 from azure.identity import ManagedIdentityCredential
 from azure.storage.queue import QueueClient, QueueMessage
 
-from manage_breast_screening.notifications.services.metrics import Metrics
-
 logger = logging.getLogger(__name__)
 
 
@@ -33,21 +31,21 @@ def __init__(self, queue_name):
             except ResourceExistsError:
                 pass
 
-        logger.info(f"storage_account_name: {storage_account_name}")
-        logger.info(f"queue_mi_client_id: {queue_mi_client_id}")
-        logger.info(f"connection_string: {connection_string}")
-        logger.info(f"self.queue_name: {self.queue_name}")
+        # logger.info(
+        #     f"APPLICATIONINSIGHTS_CONNECTION_STRING: {os.getenv('APPLICATIONINSIGHTS_CONNECTION_STRING')}"
+        # )
+        # logger.info(f"storage_account_name: {storage_account_name}")
+        # logger.info(f"queue_mi_client_id: {queue_mi_client_id}")
+        # logger.info(f"connection_string: {connection_string}")
+        # logger.info(f"self.queue_name: {self.queue_name}")
 
-        self.metrics = Metrics(queue_name, "messages", "Queue length")
-        self.recordMetrics()
+        # self.metrics = Metrics(queue_name, "messages", "Queue length")
 
     def add(self, message: str):
         self.client.send_message(message)
-        self.recordMetrics()
 
     def delete(self, message: str | QueueMessage):
         self.client.delete_message(message)
-        self.recordMetrics()
 
     def items(self, limit=50):
         return self.client.receive_messages(max_messages=limit)
@@ -58,19 +56,12 @@ def peek(self):
     def item(self):
         return self.client.receive_message()
 
-    def recordMetrics(self):
-        try:
-            properties = self.client.get_queue_properties()
-            message_count = properties.approximate_message_count
-
-            logger.info(f"recordMetrics : {message_count}")
-
-        except Exception as e:
-            logger.exception(e)
-            message_count = None
-            return
+    def get_message_count(self):
+        properties = self.client.get_queue_properties()
+        message_count = properties.approximate_message_count
+        logger.debug(f"get_message_count: {message_count}")
 
-        self.metrics.add(message_count)
+        return message_count
 
     @classmethod
     def MessageStatusUpdates(cls):