errors.py

Author: JamesW1-NHS

lambdas/mns_subscription/src/mns_service.py

@@ -4,7 +4,7 @@
 import logging
 import json
 from common.authentication import AppRestrictedAuth
-from models.errors import (
+from common.models.errors import (
     UnhandledResponseError,
     ResourceNotFoundError,
     UnauthorizedError,
@@ -129,4 +129,6 @@ def raise_error_response(response):
             response.status_code,
             (UnhandledResponseError, f"Unhandled error: {response.status_code}"))
 
+        if response.status_code == 404:
+            raise exception_class(resource_type=response.json(), resource_id=error_message)
         raise exception_class(response=response.json(), message=error_message)

lambdas/mns_subscription/src/models/errors.py

@@ -3,7 +3,7 @@
 from unittest.mock import patch, MagicMock, Mock, create_autospec
 from mns_service import MnsService, MNS_URL
 from common.authentication import AppRestrictedAuth
-from models.errors import (
+from common.models.errors import (
     ServerError,
     UnhandledResponseError,
     TokenValidationError,
@@ -266,8 +266,8 @@ def test_404_resource_found_error(self):
         with self.assertRaises(ResourceNotFoundError) as context:
             MnsService.raise_error_response(resp)
         self.assertIn("Subscription or Resource not found", str(context.exception))
-        self.assertEqual(context.exception.message, "Subscription or Resource not found")
-        self.assertEqual(context.exception.response, {"resource": "Not found"})
+        self.assertEqual(context.exception.resource_id, "Subscription or Resource not found")
+        self.assertEqual(context.exception.resource_type, {"resource": "Not found"})
 
     def test_400_bad_request_error(self):
         resp = self.mock_response(400, {"resource": "Invalid"})