Merge pull request #940 from ChildMindInstitute/M2-3755

M2-3755 Error messages hotfix
ChildMindInstitute · Dec 20, 2023 · 5b3b7b8 · 5b3b7b8
2 parents 626a7a3 + 28c91b2
commit 5b3b7b8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/apps/answers/service.py b/src/apps/answers/service.py
@@ -857,9 +857,7 @@ async def get_summary_latest_report(
             id_=respondent_id
         )
         if not respondent_exist:
-            raise UserNotFound(
-                message=f"No such respondent with id={respondent_exist}."
-            )
+            raise UserNotFound(f"No such respondent with id={respondent_id}.")
 
         await self._is_report_server_configured(applet_id)
 

diff --git a/src/apps/answers/tests/test_answers_arbitrary.py b/src/apps/answers/tests/test_answers_arbitrary.py
@@ -204,11 +204,20 @@ async def test_get_latest_summary(self, mock: CoroutineMock):
             self.latest_report_url.format(
                 applet_id="92917a56-d586-4613-b7aa-991f2c4b15b8",
                 activity_id="09e3dbf0-aefb-4d0e-9177-bdb321bf3618",
-                respondent_id="7484f34a-3acc-4ee6-8a94-fd7299502fa1",
+                respondent_id="7484f34a-3acc-4ee6-8a94-fd7299502fa8",
             ),
         )
         assert response.status_code == 200
 
+        response = await self.client.post(
+            self.latest_report_url.format(
+                applet_id="92917a56-d586-4613-b7aa-991f2c4b15b8",
+                activity_id="09e3dbf0-aefb-4d0e-9177-bdb321bf3618",
+                respondent_id="7484f34a-3acc-4ee6-8a94-fd7299502fa1",
+            ),
+        )
+        assert response.status_code == 404
+
     @rollback
     async def test_public_answer_activity_items_create_for_respondent(self):
         create_data = dict(

diff --git a/src/apps/shared/exception.py b/src/apps/shared/exception.py
@@ -15,14 +15,18 @@ class ExceptionTypes(str, Enum):
 
 
 class BaseError(Exception):
+    message_is_template: bool = False
     message = _("Oops, something went wrong.")
     fallback_language = Language.ENGLISH
 
     status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
     type = ExceptionTypes.UNDEFINED
 
-    def __init__(self, **kwargs):
+    def __init__(self, *args, **kwargs):
         self.kwargs = kwargs
+        if args and not self.message_is_template:
+            self.message = args[0]
+
         super().__init__(self.message.format(**kwargs))
 
     @property