fix

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/licensed_items.py

@@ -141,13 +141,10 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                     exclude_unset=True,
                 ),
                 "licensed_resources": [
-                    _ItisVipResourceRestData(**x)
-                    for x in item.array_of_licensed_resource_data
-                ],
-                "category_id": item.array_of_licensed_resource_data[0]["category_id"],
-                "category_display": item.array_of_licensed_resource_data[0][
-                    "category_display"
+                    _ItisVipResourceRestData(**x) for x in item.licensed_resources
                 ],
+                "category_id": item.licensed_resources[0]["category_id"],
+                "category_display": item.licensed_resources[0]["category_display"],
             }
         )
 

packages/models-library/src/models_library/licenses.py

@@ -116,7 +116,7 @@ class LicensedItem(BaseModel):
     version: str
     display_name: str
     licensed_resource_type: LicensedResourceType
-    array_of_licensed_resource_data: list[dict[str, Any]]
+    licensed_resources: list[dict[str, Any]]
     pricing_plan_id: PricingPlanId
     created_at: datetime
     modified_at: datetime
@@ -132,7 +132,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "version": "1.0.0",
                         "display_name": "my best model",
                         "licensed_resource_type": f"{LicensedResourceType.VIP_MODEL}",
-                        "array_of_licensed_resource_data": [
+                        "licensed_resources": [
                             cast(
                                 JsonDict,
                                 {

packages/models-library/tests/test_licenses.py

@@ -13,21 +13,21 @@ def test_licensed_item_from_domain_model():
 
         # nullable doi
         assert (
-            got.licensed_resource_data.source.doi
-            == item.licensed_resource_data["source"]["doi"]
+            got.licensed_resources[0].source.doi
+            == item.licensed_resources[0]["source"]["doi"]
         )
 
         # date is required
-        assert got.licensed_resource_data.source.features["date"]
+        assert got.licensed_resources[0].source.features["date"]
 
         # id is required
         assert (
-            got.licensed_resource_data.source.id
-            == item.licensed_resource_data["source"]["id"]
+            got.licensed_resources[0].source.id
+            == item.licensed_resources[0]["source"]["id"]
         )
 
         # checks unset fields
-        assert "category_icon" not in got.licensed_resource_data.model_fields_set
+        assert "category_icon" not in got.licensed_resources[0].model_fields_set
 
 
 def test_strict_check_of_examples():

services/api-server/src/simcore_service_api_server/services_rpc/resource_usage_tracker.py

@@ -44,6 +44,8 @@ async def get_licensed_item_checkout(
         return LicensedItemCheckoutGet(
             licensed_item_checkout_id=_licensed_item_checkout.licensed_item_checkout_id,
             licensed_item_id=_licensed_item_checkout.licensed_item_id,
+            key=_licensed_item_checkout.key,
+            version=_licensed_item_checkout.version,
             wallet_id=_licensed_item_checkout.wallet_id,
             user_id=_licensed_item_checkout.user_id,
             product_name=_licensed_item_checkout.product_name,

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -58,9 +58,11 @@ def _create_licensed_items_get_page(
         [
             LicensedItemGet(
                 licensed_item_id=elm.licensed_item_id,
+                key=elm.key,
+                version=elm.version,
                 display_name=elm.display_name,
                 licensed_resource_type=elm.licensed_resource_type,
-                licensed_resource_data=elm.licensed_resource_data,
+                licensed_resources=elm.licensed_resources,
                 pricing_plan_id=elm.pricing_plan_id,
                 created_at=elm.created_at,
                 modified_at=elm.modified_at,
@@ -142,6 +144,8 @@ async def checkout_licensed_item_for_wallet(
         return LicensedItemCheckoutGet(
             licensed_item_checkout_id=licensed_item_checkout_get.licensed_item_checkout_id,
             licensed_item_id=licensed_item_checkout_get.licensed_item_id,
+            key=licensed_item_checkout_get.key,
+            version=licensed_item_checkout_get.version,
             wallet_id=licensed_item_checkout_get.wallet_id,
             user_id=licensed_item_checkout_get.user_id,
             product_name=licensed_item_checkout_get.product_name,
@@ -171,6 +175,8 @@ async def release_licensed_item_for_wallet(
         return LicensedItemCheckoutGet(
             licensed_item_checkout_id=licensed_item_checkout_get.licensed_item_checkout_id,
             licensed_item_id=licensed_item_checkout_get.licensed_item_id,
+            key=licensed_item_checkout_get.key,
+            version=licensed_item_checkout_get.version,
             wallet_id=licensed_item_checkout_get.wallet_id,
             user_id=licensed_item_checkout_get.user_id,
             product_name=licensed_item_checkout_get.product_name,

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

@@ -224,7 +224,7 @@ async def delete(
     select(
         licensed_item_to_resource.c.licensed_item_id,
         func.array_agg(licensed_resources.c.licensed_resource_data).label(
-            "array_of_licensed_resource_data"
+            "licensed_resources"
         ),
     )
     .select_from(
@@ -256,7 +256,7 @@ async def get_licensed_item_by_key_version(
             licensed_items.c.version,
             licensed_items.c.display_name,
             licensed_items.c.licensed_resource_type,
-            _licensed_resource_subquery.c.array_of_licensed_resource_data,
+            _licensed_resource_subquery.c.licensed_resources,
             licensed_items.c.pricing_plan_id,
             licensed_items.c.created.label("created_at"),
             licensed_items.c.modified.label("modified_at"),
@@ -302,7 +302,7 @@ async def list_licensed_items(
             licensed_items.c.version,
             licensed_items.c.display_name,
             licensed_items.c.licensed_resource_type,
-            _licensed_resource_subquery.c.array_of_licensed_resource_data,
+            _licensed_resource_subquery.c.licensed_resources,
             licensed_items.c.pricing_plan_id,
             licensed_items.c.created.label("created_at"),
             licensed_items.c.modified.label("modified_at"),

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

@@ -58,7 +58,7 @@ async def get_licensed_items(
                 version=licensed_item.version,
                 display_name=licensed_item.display_name,
                 licensed_resource_type=licensed_item.licensed_resource_type,
-                licensed_resources=licensed_item.array_of_licensed_resource_data,
+                licensed_resources=licensed_item.licensed_resources,
                 pricing_plan_id=licensed_item.pricing_plan_id,
                 created_at=licensed_item.created_at,
                 modified_at=licensed_item.modified_at,

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

@@ -226,9 +226,9 @@ async def test_licensed_items_domain_listing(
     )
     assert total_count == 2
     assert items[0].licensed_item_id == got_duke1.licensed_item_id
-    assert len(items[0].array_of_licensed_resource_data) == 2
+    assert len(items[0].licensed_resources) == 2
     assert items[1].licensed_item_id == got_duke2.licensed_item_id
-    assert len(items[1].array_of_licensed_resource_data) == 1
+    assert len(items[1].licensed_resources) == 1
 
     got = await _licensed_items_repository.get_licensed_item_by_key_version(
         client.app, key="Duke", version="1.0.0", product_name=osparc_product_name