Cv2 5589 singular queues downstream

lib/queue/queue.py

@@ -122,7 +122,7 @@ def send_message(self, queue_name: str, message: schemas.Message):
         """
         Send a message to a specific queue.
         """
-        queue = self.get_or_create_queue(queue_name)
+        queue = self.get_or_create_queue(queue_name)[0]
         message_data = {"MessageBody": json.dumps(message.dict())}
         if queue_name.endswith('.fifo'):
             message_data["MessageGroupId"] = message.body.id
@@ -169,7 +169,7 @@ def receive_messages(self, batch_size: int = 1):
         """
         Receive messages from a queue.
         """
-        queue = self.get_or_create_queue(self.input_queue_name)
+        queue = self.get_or_create_queue(self.input_queue_name)[0]
         return queue.receive_messages(MaxNumberOfMessages=min(batch_size, SQS_MAX_BATCH_SIZE))
 
     def find_queue_by_name(self, queue_name: str) -> boto3.resources.base.ServiceResource:

test/lib/queue/test_queue.py

@@ -1,4 +1,3 @@
-import pdb
 import json
 import os
 import unittest
@@ -109,14 +108,25 @@ def test_process(self):
 
     def test_receive_messages(self):
         self.queue.input_queue = self.queue_name_input
+        # Mocking the queue and messages
         mock_queue1 = MagicMock()
-        mock_queue1.receive_messages.return_value = [FakeSQSMessage(receipt_handle="blah", body=json.dumps({"body": {"id": 1, "callback_url": "http://example.com", "text": "This is a test"}})), FakeSQSMessage(receipt_handle="blah", body=json.dumps({"body": {"id": 2, "callback_url": "http://example.com", "text": "This is another test"}}))]
-        self.queue.get_or_create_queue = MagicMock(return_value=mock_queue1)
+        mock_queue1.receive_messages.return_value = [
+            FakeSQSMessage(
+                receipt_handle="blah", 
+                body=json.dumps({"body": {"id": 1, "callback_url": "http://example.com", "text": "This is a test"}})
+            ), 
+            FakeSQSMessage(
+                receipt_handle="blah", 
+                body=json.dumps({"body": {"id": 2, "callback_url": "http://example.com", "text": "This is another test"}})
+            )
+        ]
+        # Set up get_or_create_queue to return mock_queue1
+        self.queue.get_or_create_queue = MagicMock(return_value=[mock_queue1])
         received_messages = self.queue.receive_messages(5)
-        # Check if the right number of messages were received and the content is correct
+        # Assertions
         self.assertEqual(len(received_messages), 2)
-        self.assertIn("a test", received_messages[0].body)
-        self.assertIn("another test", received_messages[1].body)
+        self.assertIn("a test", json.loads(received_messages[0].body)["body"]["text"])
+        self.assertIn("another test", json.loads(received_messages[1].body)["body"]["text"])
 
     def test_restrict_queues_by_suffix(self):
         queues = [