fix

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/pricing_plans.py

@@ -27,7 +27,7 @@ class RutPricingUnitGet(BaseModel):
 
     model_config = ConfigDict(
         json_schema_extra={
-            "examples": [  # type: ignore [dict-item]
+            "examples": [
                 {
                     "pricing_unit_id": 1,
                     "unit_name": "SMALL",

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/errors.py

@@ -34,3 +34,14 @@ class LicensedItemCheckoutNotFoundError(LicensesBaseError):
 
 class WalletTransactionError(OsparcErrorMixin, Exception):
     msg_template = "{msg}"
+
+
+### Pricing Plans Error
+
+
+class PricingPlanBaseError(OsparcErrorMixin, Exception):
+    ...
+
+
+class PricingUnitDuplicationError(PricingPlanBaseError):
+    msg_template = "Pricing unit with that name already exists in given product."

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_pricing_plans.py

@@ -16,6 +16,9 @@
 )
 from models_library.services import ServiceKey, ServiceVersion
 from servicelib.rabbitmq import RPCRouter
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
+    PricingUnitDuplicationError,
+)
 
 from ...services import pricing_plans, pricing_units
 
@@ -103,7 +106,7 @@ async def get_pricing_unit(
     )
 
 
-@router.expose(reraise_if_error_type=())
+@router.expose(reraise_if_error_type=(PricingUnitDuplicationError,))
 async def create_pricing_unit(
     app: FastAPI,
     *,

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/pricing_plans_db.py

@@ -13,6 +13,9 @@
     PricingUnitWithCostUpdate,
 )
 from models_library.services import ServiceKey, ServiceVersion
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
+    PricingUnitDuplicationError,
+)
 from simcore_postgres_database.models.resource_tracker_pricing_plan_to_service import (
     resource_tracker_pricing_plan_to_service,
 )
@@ -27,6 +30,7 @@
 )
 from simcore_postgres_database.utils_repos import transaction_context
 from sqlalchemy.dialects.postgresql import ARRAY, INTEGER
+from sqlalchemy.exc import IntegrityError as SqlAlchemyIntegrityError
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 from ....exceptions.errors import (
@@ -559,7 +563,10 @@ async def create_pricing_unit_with_cost(
             )
             .returning(resource_tracker_pricing_units.c.pricing_unit_id)
         )
-        result = await conn.execute(insert_stmt)
+        try:
+            result = await conn.execute(insert_stmt)
+        except SqlAlchemyIntegrityError as exc:
+            raise PricingUnitDuplicationError from exc
         row = result.first()
         if row is None:
             raise PricingUnitNotCreatedDBError(data=data)

services/resource-usage-tracker/tests/unit/with_dbs/test_api_pricing_plans_rpc.py

@@ -27,6 +27,9 @@
     pricing_plans,
     pricing_units,
 )
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
+    PricingUnitDuplicationError,
+)
 from simcore_postgres_database.models.resource_tracker_pricing_plan_to_service import (
     resource_tracker_pricing_plan_to_service,
 )
@@ -212,6 +215,23 @@ async def test_rpc_pricing_plans_with_units_workflow(
     _first_pricing_unit_id = result.pricing_unit_id
     _current_cost_per_unit_id = result.current_cost_per_unit_id
 
+    with pytest.raises(PricingUnitDuplicationError):
+        await pricing_units.create_pricing_unit(
+            rpc_client,
+            product_name="osparc",
+            data=PricingUnitWithCostCreate(
+                pricing_plan_id=_pricing_plan_id,
+                unit_name="SMALL",
+                unit_extra_info=UnitExtraInfoTier.model_config["json_schema_extra"][
+                    "examples"
+                ][0],
+                default=True,
+                specific_info=SpecificInfo(aws_ec2_instances=[]),
+                cost_per_unit=Decimal(10),
+                comment=faker.sentence(),
+            ),
+        )
+
     # Get pricing plan
     result = await pricing_plans.get_pricing_plan(
         rpc_client,

services/web/server/src/simcore_service_webserver/resource_usage/_pricing_plans_admin_rest.py

@@ -33,6 +33,9 @@
 from servicelib.aiohttp.typing_extension import Handler
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.rabbitmq._errors import RPCServerError
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker.errors import (
+    PricingUnitDuplicationError,
+)
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 
 from .._meta import API_VTAG as VTAG
@@ -54,7 +57,7 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
         try:
             return await handler(request)
 
-        except ValueError as exc:
+        except (ValueError, PricingUnitDuplicationError) as exc:
             raise web.HTTPBadRequest(reason=f"{exc}") from exc
 
         except RPCServerError as exc: