fixes tests

Author: pcrespov

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

@@ -41,7 +41,16 @@ class LicensedItemGet(OutputSchema):
     def from_domain_model(cls, licensed_item_db: LicensedItemDB) -> Self:
         return cls.model_validate(
             remap_keys(
-                licensed_item_db.model_dump(),
+                licensed_item_db.model_dump(
+                    include={
+                        "licensed_item_id",
+                        "licensed_resource_name",
+                        "license_key",
+                        "pricing_plan_id",
+                        "created",
+                        "modified",
+                    }
+                ),
                 {
                     "licensed_resource_name": "name",
                     "created": "created_at",

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

@@ -41,16 +41,16 @@ async def create(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
-    product_name: ProductName,
-    name: str,
+    licensed_resource_name: str,
     licensed_resource_type: LicensedResourceType,
-    pricing_plan_id: PricingPlanId,
+    product_name: ProductName | None,
+    pricing_plan_id: PricingPlanId | None,
 ) -> LicensedItemDB:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(
             licensed_items.insert()
             .values(
-                name=name,
+                licensed_resource_name=licensed_resource_name,
                 licensed_resource_type=licensed_resource_type,
                 pricing_plan_id=pricing_plan_id,
                 product_name=product_name,
@@ -90,12 +90,12 @@ async def list_(
     if inactive == "exclude":
         base_query = base_query.where(
             licensed_items.c.product_name.is_(None)
-            or licensed_items.c.licensed_item_id.is_(None)
+            | licensed_items.c.licensed_item_id.is_(None)
         )
     elif inactive == "only":
         base_query = base_query.where(
             licensed_items.c.product_name.is_not(None)
-            and licensed_items.c.licensed_item_id.is_not(None)
+            & licensed_items.c.licensed_item_id.is_not(None)
         )
 
     # Select total count from base_query

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

@@ -46,7 +46,7 @@ async def test_licensed_items_db_crud(
     licensed_item_db = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
-        name="Model A",
+        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
     )
@@ -111,7 +111,7 @@ async def test_licensed_items_db_trash(
         licensed_item_db = await _licensed_items_repository.create(
             client.app,
             product_name=osparc_product_name,
-            name=name,
+            licensed_resource_name=name,
             licensed_resource_type=LicensedResourceType.VIP_MODEL,
             pricing_plan_id=pricing_plan_id,
         )

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

@@ -42,7 +42,7 @@ async def test_licensed_items_listing(
     licensed_item_db = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
-        name="Model A",
+        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
     )
@@ -109,7 +109,7 @@ async def test_licensed_items_purchase(
     licensed_item_db = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
-        name="Model A",
+        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
     )

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

@@ -135,7 +135,7 @@ async def test_license_checkout_workflow(
     license_item_db = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
-        name="Model A",
+        licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
     )