review @pcrespov - adding back trashing

Author: matusdrobuliak66

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

@@ -88,6 +88,10 @@ class LicensedItemPatchDB(BaseModel):
     pricing_plan_id: PricingPlanId | None = None
 
 
+class LicensedResourcePatchDB(BaseModel):
+    trash: bool | None = None
+
+
 class LicensedResourceDB(BaseModel):
     licensed_resource_id: LicensedResourceID
     display_name: str

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

@@ -2,7 +2,12 @@
 from typing import Any
 
 from aiohttp import web
-from models_library.licenses import LicensedResourceDB, LicensedResourceType
+from models_library.licenses import (
+    LicensedResourceDB,
+    LicensedResourceID,
+    LicensedResourcePatchDB,
+    LicensedResourceType,
+)
 from simcore_postgres_database.models.licensed_resources import licensed_resources
 from simcore_postgres_database.utils_repos import (
     get_columns_from_db_model,
@@ -102,3 +107,31 @@ async def get_by_resource_identifier(
                 licensed_resource_type=licensed_resource_type,
             )
         return LicensedResourceDB.model_validate(row)
+
+
+async def update(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    licensed_resource_id: LicensedResourceID,
+    updates: LicensedResourcePatchDB,
+) -> LicensedResourceDB:
+    # NOTE: at least 'touch' if updated_values is empty
+    _updates = {
+        **updates.model_dump(exclude_unset=True),
+        licensed_resources.c.modified.name: func.now(),
+    }
+
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        result = await conn.execute(
+            licensed_resources.update()
+            .values(**_updates)
+            .where(licensed_resources.c.licensed_resource_id == licensed_resource_id)
+            .returning(*_SELECTION_ARGS)
+        )
+        row = result.one_or_none()
+        if row is None:
+            raise LicensedResourceNotFoundError(
+                licensed_resource_id=licensed_resource_id
+            )
+        return LicensedResourceDB.model_validate(row)

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

@@ -7,7 +7,12 @@
 
 from aiohttp import web
 from deepdiff import DeepDiff  # type: ignore[attr-defined]
-from models_library.licenses import LicensedResourceDB, LicensedResourceType
+from models_library.licenses import (
+    LicensedResourceDB,
+    LicensedResourceID,
+    LicensedResourcePatchDB,
+    LicensedResourceType,
+)
 from pydantic import BaseModel
 
 from . import _licensed_resources_repository
@@ -93,3 +98,27 @@ async def register_licensed_resource(
             RegistrationState.NEWLY_REGISTERED,
             f"NEWLY_REGISTERED: {resource_key=} registered with licensed_resource_id={licensed_resource.licensed_resource_id}",
         )
+
+
+async def trash_licensed_resource(
+    app: web.Application,
+    *,
+    licensed_resource_id: LicensedResourceID,
+) -> None:
+    await _licensed_resources_repository.update(
+        app,
+        licensed_resource_id=licensed_resource_id,
+        updates=LicensedResourcePatchDB(trash=True),
+    )
+
+
+async def untrash_licensed_resource(
+    app: web.Application,
+    *,
+    licensed_resource_id: LicensedResourceID,
+) -> None:
+    await _licensed_resources_repository.update(
+        app,
+        licensed_resource_id=licensed_resource_id,
+        updates=LicensedResourcePatchDB(trash=True),
+    )

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

@@ -0,0 +1,54 @@
+import arrow
+import pytest
+from aiohttp.test_utils import TestClient
+from models_library.licenses import (
+    VIP_DETAILS_EXAMPLE,
+    LicensedResourcePatchDB,
+    LicensedResourceType,
+)
+from pytest_simcore.helpers.webserver_login import UserInfoDict
+from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.licenses import _licensed_resources_repository
+from simcore_service_webserver.projects.models import ProjectDict
+
+
+@pytest.fixture
+def user_role() -> UserRole:
+    return UserRole.USER
+
+
+async def test_licensed_items_db_trash(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    user_project: ProjectDict,
+    osparc_product_name: str,
+    pricing_plan_id: int,
+):
+    assert client.app
+
+    # Create two licensed items
+    licensed_resource_ids = []
+    for name in ["Model A", "Model B"]:
+        licensed_resource_db = (
+            await _licensed_resources_repository.create_if_not_exists(
+                client.app,
+                display_name="Model A Display Name",
+                licensed_resource_name=name,
+                licensed_resource_type=LicensedResourceType.VIP_MODEL,
+                licensed_resource_data=VIP_DETAILS_EXAMPLE,
+            )
+        )
+        licensed_resource_ids.append(licensed_resource_db.licensed_resource_id)
+
+    # Trash one licensed item
+    trashing_at = arrow.now().datetime
+    trashed_item = await _licensed_resources_repository.update(
+        client.app,
+        licensed_resource_id=licensed_resource_ids[0],
+        updates=LicensedResourcePatchDB(trash=True),
+    )
+
+    assert trashed_item.licensed_resource_id == licensed_resource_ids[0]
+    assert trashed_item.trashed
+    assert trashing_at < trashed_item.trashed
+    assert trashed_item.trashed < arrow.now().datetime