fixes tests

Author: pcrespov

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

@@ -41,6 +41,7 @@ class LicensedItemDB(BaseModel):
 
 
 class LicensedItemUpdateDB(BaseModel):
-    name: str | None = None
+    licensed_resource_name: str | None = None
     pricing_plan_id: PricingPlanId | None = None
+
     trash: bool | None = None

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

@@ -71,6 +71,7 @@ async def list_(
     offset: NonNegativeInt,
     limit: NonNegativeInt,
     order_by: OrderBy,
+    # filters
     trashed: Literal["exclude", "only", "include"] = "exclude",
     inactive: Literal["exclude", "only", "include"] = "exclude",
 ) -> tuple[int, list[LicensedItemDB]]:
@@ -87,12 +88,12 @@ async def list_(
     elif trashed == "only":
         base_query = base_query.where(licensed_items.c.trashed.is_not(None))
 
-    if inactive == "exclude":
+    if inactive == "only":
         base_query = base_query.where(
             licensed_items.c.product_name.is_(None)
             | licensed_items.c.licensed_item_id.is_(None)
         )
-    elif inactive == "only":
+    elif inactive == "exclude":
         base_query = base_query.where(
             licensed_items.c.product_name.is_not(None)
             & licensed_items.c.licensed_item_id.is_not(None)

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

@@ -7,11 +7,7 @@
 import arrow
 import pytest
 from aiohttp.test_utils import TestClient
-from models_library.licensed_items import (
-    LicensedItemDB,
-    LicensedItemUpdateDB,
-    LicensedResourceType,
-)
+from models_library.licensed_items import LicensedItemUpdateDB, LicensedResourceType
 from models_library.rest_ordering import OrderBy
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from simcore_service_webserver.db.models import UserRole
@@ -33,65 +29,66 @@ async def test_licensed_items_db_crud(
     pricing_plan_id: int,
 ):
     assert client.app
-
-    output: tuple[int, list[LicensedItemDB]] = await _licensed_items_repository.list_(
+    total_count, items = await _licensed_items_repository.list_(
         client.app,
         product_name=osparc_product_name,
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
     )
-    assert output[0] == 0
+    assert total_count == 0
+    assert not items
 
-    licensed_item_db = await _licensed_items_repository.create(
+    got = await _licensed_items_repository.create(
         client.app,
         product_name=osparc_product_name,
         licensed_resource_name="Model A",
         licensed_resource_type=LicensedResourceType.VIP_MODEL,
         pricing_plan_id=pricing_plan_id,
     )
-    _licensed_item_id = licensed_item_db.licensed_item_id
+    licensed_item_id = got.licensed_item_id
 
-    output: tuple[int, list[LicensedItemDB]] = await _licensed_items_repository.list_(
+    total_count, items = await _licensed_items_repository.list_(
         client.app,
         product_name=osparc_product_name,
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
     )
-    assert output[0] == 1
+    assert total_count == 1
+    assert items[0].licensed_item_id == licensed_item_id
 
-    licensed_item_db = await _licensed_items_repository.get(
+    got = await _licensed_items_repository.get(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.licensed_resource_name == "Model A"
+    assert got.licensed_resource_name == "Model A"
 
     await _licensed_items_repository.update(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
-        updates=LicensedItemUpdateDB(name="Model B"),
+        updates=LicensedItemUpdateDB(licensed_resource_name="Model B"),
     )
 
-    licensed_item_db = await _licensed_items_repository.get(
+    got = await _licensed_items_repository.get(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.licensed_resource_name == "Model B"
+    assert got.licensed_resource_name == "Model B"
 
-    licensed_item_db = await _licensed_items_repository.delete(
+    got = await _licensed_items_repository.delete(
         client.app,
-        licensed_item_id=_licensed_item_id,
+        licensed_item_id=licensed_item_id,
         product_name=osparc_product_name,
     )
 
     with pytest.raises(LicensedItemNotFoundError):
         await _licensed_items_repository.get(
             client.app,
-            licensed_item_id=_licensed_item_id,
+            licensed_item_id=licensed_item_id,
             product_name=osparc_product_name,
         )