adapts repository

Author: pcrespov

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

@@ -1,7 +1,12 @@
 from datetime import datetime
-from typing import NamedTuple
+from typing import NamedTuple, Self
 
-from models_library.licensed_items import LicensedItemID, LicensedResourceType
+from common_library.dict_tools import remap_keys
+from models_library.licensed_items import (
+    LicensedItemDB,
+    LicensedItemID,
+    LicensedResourceType,
+)
 from models_library.resource_tracker import PricingPlanId
 from pydantic import ConfigDict, PositiveInt
 
@@ -32,6 +37,19 @@ class LicensedItemGet(OutputSchema):
         }
     )
 
+    @classmethod
+    def from_domain_model(cls, licensed_item_db: LicensedItemDB) -> Self:
+        return cls.model_validate(
+            remap_keys(
+                licensed_item_db.model_dump(),
+                {
+                    "licensed_resource_name": "name",
+                    "created": "created_at",
+                    "modified": "modified_at",
+                },
+            )
+        )
+
 
 class LicensedItemGetPage(NamedTuple):
     items: list[LicensedItemGet]

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

@@ -71,20 +71,33 @@ async def list_(
     offset: NonNegativeInt,
     limit: NonNegativeInt,
     order_by: OrderBy,
-    filter_trashed: Literal["exclude", "only", "include"] = "exclude",
+    trashed: Literal["exclude", "only", "include"] = "exclude",
+    inactive: Literal["exclude", "only", "include"] = "exclude",
 ) -> tuple[int, list[LicensedItemDB]]:
+
     base_query = (
         select(*_SELECTION_ARGS)
         .select_from(licensed_items)
         .where(licensed_items.c.product_name == product_name)
     )
 
     # Apply trashed filter
-    if filter_trashed == "exclude":
+    if trashed == "exclude":
         base_query = base_query.where(licensed_items.c.trashed.is_(None))
-    elif filter_trashed == "only":
+    elif trashed == "only":
         base_query = base_query.where(licensed_items.c.trashed.is_not(None))
 
+    if inactive == "exclude":
+        base_query = base_query.where(
+            licensed_items.c.product_name.is_(None)
+            or 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)
+        )
+
     # Select total count from base_query
     subquery = base_query.subquery()
     count_query = select(func.count()).select_from(subquery)

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

@@ -42,15 +42,7 @@ async def get_licensed_item(
     licensed_item_db = await _licensed_items_repository.get(
         app, licensed_item_id=licensed_item_id, product_name=product_name
     )
-    return LicensedItemGet(
-        licensed_item_id=licensed_item_db.licensed_item_id,
-        name=licensed_item_db.name,
-        license_key=licensed_item_db.license_key,
-        licensed_resource_type=licensed_item_db.licensed_resource_type,
-        pricing_plan_id=licensed_item_db.pricing_plan_id,
-        created_at=licensed_item_db.created,
-        modified_at=licensed_item_db.modified,
-    )
+    return LicensedItemGet.from_domain_model(licensed_item_db)
 
 
 async def list_licensed_items(
@@ -61,21 +53,19 @@ async def list_licensed_items(
     limit: int,
     order_by: OrderBy,
 ) -> LicensedItemGetPage:
-    total_count, licensed_item_db_list = await _licensed_items_repository.list_(
-        app, product_name=product_name, offset=offset, limit=limit, order_by=order_by
+    total_count, items = await _licensed_items_repository.list_(
+        app,
+        product_name=product_name,
+        offset=offset,
+        limit=limit,
+        order_by=order_by,
+        trashed="exclude",
+        inactive="exclude",
     )
     return LicensedItemGetPage(
         items=[
-            LicensedItemGet(
-                licensed_item_id=licensed_item_db.licensed_item_id,
-                name=licensed_item_db.name,
-                license_key=licensed_item_db.license_key,
-                licensed_resource_type=licensed_item_db.licensed_resource_type,
-                pricing_plan_id=licensed_item_db.pricing_plan_id,
-                created_at=licensed_item_db.created,
-                modified_at=licensed_item_db.modified,
-            )
-            for licensed_item_db in licensed_item_db_list
+            LicensedItemGet.from_domain_model(licensed_item_db)
+            for licensed_item_db in items
         ],
         total=total_count,
     )

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

@@ -66,7 +66,7 @@ async def test_licensed_items_db_crud(
         licensed_item_id=_licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.name == "Model A"
+    assert licensed_item_db.licensed_resource_name == "Model A"
 
     await _licensed_items_repository.update(
         client.app,
@@ -80,7 +80,7 @@ async def test_licensed_items_db_crud(
         licensed_item_id=_licensed_item_id,
         product_name=osparc_product_name,
     )
-    assert licensed_item_db.name == "Model B"
+    assert licensed_item_db.licensed_resource_name == "Model B"
 
     licensed_item_db = await _licensed_items_repository.delete(
         client.app,
@@ -140,7 +140,7 @@ async def test_licensed_items_db_trash(
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
-        filter_trashed="include",
+        trashed="include",
     )
     assert total_count == 2
     assert {i.licensed_item_id for i in items} == set(licensed_item_ids)
@@ -152,7 +152,7 @@ async def test_licensed_items_db_trash(
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
-        filter_trashed="exclude",
+        trashed="exclude",
     )
     assert total_count == 1
     assert items[0].licensed_item_id == licensed_item_id2
@@ -165,7 +165,7 @@ async def test_licensed_items_db_trash(
         offset=0,
         limit=10,
         order_by=OrderBy(field="modified"),
-        filter_trashed="only",
+        trashed="only",
     )
     assert total_count == 1
     assert items[0].licensed_item_id == trashed_item.licensed_item_id