VED-79: Fix tests issues

Author: Akol125

mns_subscription/models/errors.py

@@ -22,6 +22,12 @@ class Code(str, Enum):
 
 @dataclass
 class UnauthorizedError(RuntimeError):
+    response: dict | str
+    message: str
+
+    def __str__(self):
+        return f"{self.message}\n{self.response}"
+
     @staticmethod
     def to_operation_outcome() -> dict:
         msg = "Unauthorized request"
@@ -35,6 +41,12 @@ def to_operation_outcome() -> dict:
 
 @dataclass
 class TokenValidationError(RuntimeError):
+    response: dict | str
+    message: str
+
+    def __str__(self):
+        return f"{self.message}\n{self.response}"
+
     @staticmethod
     def to_operation_outcome() -> dict:
         msg = "Missing/Invalid Token"
@@ -48,6 +60,12 @@ def to_operation_outcome() -> dict:
 
 @dataclass
 class ConflictError(RuntimeError):
+    response: dict | str
+    message: str
+
+    def __str__(self):
+        return f"{self.message}\n{self.response}"
+
     @staticmethod
     def to_operation_outcome() -> dict:
         msg = "Conflict"

mns_subscription/src/mns_service.py

@@ -48,7 +48,7 @@ def subscribe_notification(self) -> dict | None:
         print(f"Headers: {self.request_headers}")
         print(f"Payload: {json.dumps(self.subscription_payload, indent=2)}")
 
-        if response.status_code == 200:
+        if response.status_code in (200, 201):
             return response.json()
         elif response.status_code == 409:
             msg = "SQS Queue Already Subscribed, can't re-subscribe"
@@ -83,8 +83,6 @@ def get_subscription(self) -> dict | None:
                 if channel.get("endpoint") == SQS_ARN:
                     return resource  # Found a matching subscription
             return None  # No subscription for this SQS ARN
-        elif response.status_code == 404:
-            return None
         elif response.status_code == 401:
             msg = "Token validation failed for the request"
             raise TokenValidationError(response=response.json(), message=msg)

mns_subscription/tests/test_mns_service.py

@@ -2,7 +2,7 @@
 from unittest.mock import patch, MagicMock, Mock, create_autospec
 from mns_service import MnsService
 from authentication import AppRestrictedAuth
-from models.errors import UnhandledResponseError
+from models.errors import ServerError, UnhandledResponseError
 
 
 class TestMnsService(unittest.TestCase):
@@ -14,7 +14,15 @@ def setUp(self):
         self.mock_cache = Mock()
 
     @patch("mns_service.requests.post")
-    def test_successful_subscription(self, mock_post):
+    @patch("mns_service.requests.get")
+    def test_successful_subscription(self, mock_get, mock_post):
+
+        # Arrange GET to return no subscription found
+        mock_get_response = MagicMock()
+        mock_get_response.status_code = 200
+        mock_get_response.json.return_value = {"entry": []}  # No entries!
+        mock_get.return_value = mock_get_response
+
         # Arrange
         mock_response = MagicMock()
         mock_response.status_code = 201
@@ -24,11 +32,12 @@ def test_successful_subscription(self, mock_post):
         service = MnsService(self.authenticator)
 
         # Act
-        result = service.subscribe_notification()
+        result = service.check_subscription()
 
         # Assert
         self.assertEqual(result, {"subscriptionId": "abc123"})
         mock_post.assert_called_once()
+        mock_get.assert_called_once()
         self.authenticator.get_access_token.assert_called_once()
 
     @patch("mns_service.requests.post")
@@ -38,9 +47,11 @@ def test_not_found_subscription(self, mock_post):
         mock_post.return_value = mock_response
 
         service = MnsService(self.authenticator)
-        result = service.subscribe_notification()
 
-        self.assertIsNone(result)
+        with self.assertRaises(UnhandledResponseError) as context:
+            service.subscribe_notification()
+        self.assertIn("404", str(context.exception))
+        self.assertIn("Unhandled error", str(context.exception))
 
     @patch("mns_service.requests.post")
     def test_unhandled_error(self, mock_post):
@@ -51,10 +62,10 @@ def test_unhandled_error(self, mock_post):
 
         service = MnsService(self.authenticator)
 
-        with self.assertRaises(UnhandledResponseError) as context:
+        with self.assertRaises(ServerError) as context:
             service.subscribe_notification()
 
-        self.assertIn("MNS subscription failed", str(context.exception))
+        self.assertIn("Internal Server Error", str(context.exception))
 
 
 if __name__ == "__main__":

mns_subscription/tests/test_subscription.py

@@ -17,7 +17,7 @@ def test_run_subscription_success(self, mock_boto_client, mock_auth_class, mock_
         mock_auth_class.return_value = mock_auth_instance
 
         mock_mns_instance = MagicMock()
-        mock_mns_instance.subscribe_notification.return_value = {"subscriptionId": "abc123"}
+        mock_mns_instance.check_subscription.return_value = {"subscriptionId": "abc123"}
         mock_mns_service.return_value = mock_mns_instance
 
         # Act
@@ -26,7 +26,7 @@ def test_run_subscription_success(self, mock_boto_client, mock_auth_class, mock_
         # Assert
         self.assertEqual(result, {"subscriptionId": "abc123"})
         mock_auth_class.assert_called_once()
-        mock_mns_instance.subscribe_notification.assert_called_once()
+        mock_mns_instance.check_subscription.assert_called_once()
 
 
 if __name__ == "__main__":