🐛 Update error handling in middleware to use 'text' for error messages; adjust tests for response structure

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -81,24 +81,22 @@ async def _middleware_handler(request: web.Request, handler: Handler):  # noqa:
             return await handler(request)
 
         except web.HTTPError as err:
-            # TODO: differenciate between server/client error
-            if not err.reason:
-                err.set_status(err.status_code, reason="Unexpected error")
 
             err.content_type = MIMETYPE_APPLICATION_JSON
 
             if not err.text or not is_enveloped_from_text(err.text):
-                error = ErrorGet(
+                error_message = err.text or err.reason or "Unexpected error"
+                error_model = ErrorGet(
                     errors=[
                         ErrorItemType.from_error(err),
                     ],
                     status=err.status,
                     logs=[
-                        LogMessageType(message=err.reason, level="ERROR"),
+                        LogMessageType(message=error_message, level="ERROR"),
                     ],
-                    message=err.reason,
+                    message=error_message,
                 )
-                err.text = EnvelopeFactory(error=error).as_text()
+                err.text = EnvelopeFactory(error=error_model).as_text()
 
             raise
 

services/web/server/tests/unit/with_dbs/04/wallets/payments/test_payments.py

@@ -334,9 +334,6 @@ async def test_billing_info_missing_error(
     assert not data
     assert MSG_BILLING_DETAILS_NOT_DEFINED_ERROR in error["message"]
 
-    assert response.reason
-    assert MSG_BILLING_DETAILS_NOT_DEFINED_ERROR in response.reason
-
 
 async def test_payment_not_found(
     latest_osparc_price: Decimal,
@@ -356,7 +353,7 @@ async def test_payment_not_found(
 
     data, error = await assert_status(response, status.HTTP_404_NOT_FOUND)
     assert data is None
-    error_msg = error["errors"][0]["message"]
+    error_msg = error["message"]
     assert payment_id in error_msg
     assert ":cancel" not in error_msg
 
@@ -391,7 +388,7 @@ async def test_payment_on_wallet_without_access(
         assert data is None
         assert error
 
-        error_msg = error["errors"][0]["message"]
+        error_msg = error["message"]
         assert f"{wallet.wallet_id}" in error_msg