test create

Author: pcrespov

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

@@ -44,25 +44,26 @@ async def create(
     licensed_resource_name: str,
     licensed_resource_type: LicensedResourceType,
     licensed_resource_data: dict[str, Any] | None = None,
-    licensed_key: str | None = None,
+    license_key: str | None = None,
     product_name: ProductName | None = None,
     pricing_plan_id: PricingPlanId | None = None,
 ) -> LicensedItemDB:
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
-        result = await conn.execute(
-            licensed_items.insert()
-            .values(
-                licensed_resource_name=licensed_resource_name,
-                licensed_resource_type=licensed_resource_type,
-                licensed_resource_data=licensed_resource_data,
-                licensed_key=licensed_key,
-                pricing_plan_id=pricing_plan_id,
-                product_name=product_name,
-                created=func.now(),
-                modified=func.now(),
-            )
-            .returning(*_SELECTION_ARGS)
+    query = (
+        licensed_items.insert()
+        .values(
+            licensed_resource_name=licensed_resource_name,
+            licensed_resource_type=licensed_resource_type,
+            licensed_resource_data=licensed_resource_data,
+            license_key=license_key,
+            pricing_plan_id=pricing_plan_id,
+            product_name=product_name,
+            created=func.now(),
+            modified=func.now(),
         )
+        .returning(*_SELECTION_ARGS)
+    )
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        result = await conn.execute(query)
         row = result.one()
         return LicensedItemDB.model_validate(row)
 

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

@@ -8,14 +8,19 @@
     LicensedItemGet,
     LicensedItemGetPage,
 )
-from models_library.licensed_items import LicensedItemID
+from models_library.licensed_items import (
+    LicensedItemDB,
+    LicensedItemID,
+    LicensedItemUpdateDB,
+    LicensedResourceType,
+)
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_purchases import (
     LicensedItemsPurchasesCreate,
 )
 from models_library.rest_ordering import OrderBy
 from models_library.users import UserID
-from pydantic import NonNegativeInt
+from pydantic import BaseModel, NonNegativeInt
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker import (
     licensed_items_purchases,
 )
@@ -32,6 +37,27 @@
 _logger = logging.getLogger(__name__)
 
 
+async def create_licensed_item_from_resource(
+    app: web.Application,
+    *,
+    licensed_resource_name: str,
+    licensed_resource_type: LicensedResourceType,
+    licensed_resource_data: BaseModel,
+    license_key: str | None,
+) -> LicensedItemDB:
+    return await _licensed_items_repository.create(
+        app,
+        licensed_resource_name=licensed_resource_name,
+        licensed_resource_type=licensed_resource_type,
+        licensed_resource_data=licensed_resource_data.model_dump(
+            mode="json", exclude_unset=True
+        ),
+        license_key=license_key,
+        product_name=None,
+        pricing_plan_id=None,
+    )
+
+
 async def get_licensed_item(
     app: web.Application,
     *,
@@ -71,6 +97,34 @@ async def list_licensed_items(
     )
 
 
+async def trash_licensed_item(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    licensed_item_id: LicensedItemID,
+):
+    await _licensed_items_repository.update(
+        app,
+        product_name=product_name,
+        licensed_item_id=licensed_item_id,
+        updates=LicensedItemUpdateDB(trash=True),
+    )
+
+
+async def untrash_licensed_item(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    licensed_item_id: LicensedItemID,
+):
+    await _licensed_items_repository.update(
+        app,
+        product_name=product_name,
+        licensed_item_id=licensed_item_id,
+        updates=LicensedItemUpdateDB(trash=True),
+    )
+
+
 async def purchase_licensed_item(
     app: web.Application,
     *,

services/web/server/tests/unit/with_dbs/04/licenses/test_itis_vip_service.py

@@ -18,7 +18,7 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver.licenses import (
     _itis_vip_service,
-    _licensed_items_repository,
+    _licensed_items_service,
 )
 from simcore_service_webserver.licenses._itis_vip_models import (
     AvailableDownload,
@@ -147,16 +147,12 @@ async def test_sync_itis_vip_as_licensed_items(
             )
             assert items[0].features["functionality"] == "Posable"
 
-            for item in items:
+            for vip_item in items:
                 # TODO: how to update to minimize collisions? one by one?
-                await _licensed_items_repository.create(
+                await _licensed_items_service.create_licensed_item_from_resource(
                     client.app,
-                    licensed_resource_name=f"{category}/{item.id}",
+                    licensed_resource_name=f"{category}/{vip_item.id}",
                     licensed_resource_type=LicensedResourceType.VIP_MODEL,
-                    licensed_resource_data=item.model_dump(
-                        mode="json", exclude_unset=True
-                    ),
-                    licensed_key=item.license_key,
-                    product_name=None,
-                    pricing_plan_id=None,
+                    licensed_resource_data=vip_item,
+                    license_key=vip_item.license_key,
                 )