improve error handling

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/licenses/_exceptions_handlers.py

@@ -9,7 +9,8 @@
     exception_handling_decorator,
     to_exceptions_handlers_map,
 )
-from .errors import LicensedItemNotFoundError
+from ..wallets.errors import WalletNotEnoughCreditsError
+from .errors import LicensedItemNotFoundError, LicensedItemPricingPlanMatchError
 
 _logger = logging.getLogger(__name__)
 
@@ -23,6 +24,14 @@
         status.HTTP_403_FORBIDDEN,
         "Wallet {wallet_id} forbidden.",
     ),
+    WalletNotEnoughCreditsError: HttpErrorInfo(
+        status.HTTP_402_PAYMENT_REQUIRED,
+        "Not enough credits in the wallet.",
+    ),
+    LicensedItemPricingPlanMatchError: HttpErrorInfo(
+        status.HTTP_400_BAD_REQUEST,
+        "The provided pricing plan does not match the one associated with the licensed item.",
+    ),
 }
 
 

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_api.py

@@ -24,8 +24,10 @@
 from ..resource_usage.api import get_pricing_plan_unit
 from ..users.api import get_user
 from ..wallets.api import get_wallet_with_available_credits_by_user_and_wallet
+from ..wallets.errors import WalletNotEnoughCreditsError
 from . import _licensed_items_api, _licensed_items_db
 from ._models import LicensedItemsBodyParams
+from .errors import LicensedItemPricingPlanMatchError
 
 _logger = logging.getLogger(__name__)
 
@@ -95,7 +97,10 @@ async def purchase_licensed_item(
     )
 
     if licensed_item.pricing_plan_id != body_params.pricing_plan_id:
-        raise ValueError("You are lying!")
+        raise LicensedItemPricingPlanMatchError(
+            pricing_plan_id=body_params.pricing_plan_id,
+            licensed_item_id=licensed_item_id,
+        )
 
     pricing_unit = await get_pricing_plan_unit(
         app,
@@ -106,7 +111,9 @@ async def purchase_licensed_item(
 
     # Check whether wallet has enough credits
     if wallet.available_credits - pricing_unit.current_cost_per_unit < 0:
-        raise ValueError("Not enough credits!")
+        raise WalletNotEnoughCreditsError(
+            reason=f"Wallet '{wallet.name}' has {wallet.available_credits} credits."
+        )
 
     user = await get_user(app, user_id=user_id)
 

services/web/server/src/simcore_service_webserver/licenses/errors.py

@@ -7,3 +7,7 @@ class LicensesValueError(WebServerBaseError, ValueError):
 
 class LicensedItemNotFoundError(LicensesValueError):
     msg_template = "License good {licensed_item_id} not found"
+
+
+class LicensedItemPricingPlanMatchError(LicensesValueError):
+    msg_template = "The provided pricing plan {pricing_plan_id} does not match the one associated with the licensed item {licensed_item_id}."

services/web/server/src/simcore_service_webserver/wallets/_handlers.py

@@ -47,7 +47,11 @@
     MSG_BILLING_DETAILS_NOT_DEFINED_ERROR,
     MSG_PRICE_NOT_DEFINED_ERROR,
 )
-from .errors import WalletAccessForbiddenError, WalletNotFoundError
+from .errors import (
+    WalletAccessForbiddenError,
+    WalletNotEnoughCreditsError,
+    WalletNotFoundError,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -87,6 +91,9 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
         except ProductPriceNotDefinedError as exc:
             raise web.HTTPConflict(reason=MSG_PRICE_NOT_DEFINED_ERROR) from exc
 
+        except WalletNotEnoughCreditsError as exc:
+            raise web.HTTPPaymentRequired(reason=f"{exc}") from exc
+
         except BillingDetailsNotFoundError as exc:
 
             error_code = create_error_code(exc)