VED-79: fix tests issues

Author: Akol125

mns_subscription/src/mns_service.py

@@ -78,7 +78,9 @@ def get_subscription(self) -> dict | None:
             bundle = response.json()
             # Assume a FHIR Bundle with 'entry' list
             for entry in bundle.get("entry", []):
-                resource = entry.get("channel", {})
+                resource = entry.get("resource", entry)
+                print(f"get resource sub: {resource}")
+                logging.debug(f"get resource sub: {resource}")
                 channel = resource.get("channel", {})
                 if channel.get("endpoint") == SQS_ARN:
                     return resource  # Found a matching subscription

mns_subscription/tests/test_mns_service.py

@@ -1,17 +1,22 @@
 import unittest
+import os
 from unittest.mock import patch, MagicMock, Mock, create_autospec
 from mns_service import MnsService
 from authentication import AppRestrictedAuth
-from models.errors import ServerError, UnhandledResponseError
+from models.errors import ServerError, UnhandledResponseError, TokenValidationError
 
 
+SQS_ARN = "arn:aws:sqs:eu-west-2:123456789012:my-queue"
+
+@patch("mns_service.SQS_ARN", SQS_ARN)
 class TestMnsService(unittest.TestCase):
     def setUp(self):
         # Common mock setup
         self.authenticator = create_autospec(AppRestrictedAuth)
         self.authenticator.get_access_token.return_value = "mocked_token"
         self.mock_secret_manager = Mock()
         self.mock_cache = Mock()
+        self.sqs = SQS_ARN
 
     @patch("mns_service.requests.post")
     @patch("mns_service.requests.get")
@@ -67,6 +72,76 @@ def test_unhandled_error(self, mock_post):
 
         self.assertIn("Internal Server Error", str(context.exception))
 
+    @patch.dict(os.environ, {"SQS_ARN": "arn:aws:sqs:eu-west-2:123456789012:my-queue"})
+    @patch("mns_service.requests.get")
+    def test_get_subscription_success(self, mock_get):
+        """Should return the resource dict when a matching subscription exists."""
+        # Arrange a bundle with a matching entry
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            "entry": [
+                {
+                    "channel": {"endpoint": SQS_ARN},
+                    "id": "123"
+                }
+            ]
+    }
+        mock_get.return_value = mock_response
+
+        service = MnsService(self.authenticator)
+        result2 = service.get_subscription()
+        self.assertIsNotNone(result2)
+        self.assertEqual(result2["channel"]["endpoint"], SQS_ARN)
+
+    @patch("mns_service.requests.get")
+    def test_get_subscription_no_match(self, mock_get):
+        """Should return None when no subscription matches."""
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {"entry": []}  # No matches
+        mock_get.return_value = mock_response
+
+        service = MnsService(self.authenticator)
+        result = service.get_subscription()
+        self.assertIsNone(result)
+
+    @patch("mns_service.requests.get")
+    def test_get_subscription_401(self, mock_get):
+        """Should raise TokenValidationError for 401."""
+        mock_response = MagicMock()
+        mock_response.status_code = 401
+        mock_response.json.return_value = {"fault": {"faultstring": "Invalid Access Token"}}
+        mock_get.return_value = mock_response
+
+        service = MnsService(self.authenticator)
+        with self.assertRaises(TokenValidationError):
+            service.get_subscription()
+
+    # Similarly, you can add tests for 400, 403, 500, etc.
+
+    @patch("mns_service.requests.post")
+    @patch("mns_service.requests.get")
+    def test_check_subscription_creates_if_not_found(self, mock_get, mock_post):
+        """If GET finds nothing, POST is called and returned."""
+        # Arrange GET returns no match
+        mock_get_response = MagicMock()
+        mock_get_response.status_code = 200
+        mock_get_response.json.return_value = {"entry": []}
+        mock_get.return_value = mock_get_response
+
+        # Arrange POST returns a new subscription
+        mock_post_response = MagicMock()
+        mock_post_response.status_code = 201
+        mock_post_response.json.return_value = {"subscriptionId": "abc123"}
+        mock_post.return_value = mock_post_response
+
+        service = MnsService(self.authenticator)
+        result = service.check_subscription()
+        self.assertEqual(result, {"subscriptionId": "abc123"})
+        mock_get.assert_called_once()
+        mock_post.assert_called_once()
+
 
 if __name__ == "__main__":
     unittest.main()