make test pass

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/licensed_items.py

@@ -44,7 +44,7 @@ async def get_licensed_items(
 
 
 @router.post(
-    "{licensed_item_id}/checked_out_items/{licensed_item_checkout_id}/release",
+    "/{licensed_item_id}/checked-out-items/{licensed_item_checkout_id}/release",
     response_model=LicensedItemCheckoutGet,
     status_code=status.HTTP_200_OK,
     responses=_LICENSE_ITEMS_STATUS_CODES,

services/api-server/tests/unit/test_licensed_items.py

@@ -5,11 +5,15 @@
 import asyncio
 from functools import partial
 from typing import cast
+from uuid import UUID
 
 import pytest
 from faker import Faker
 from fastapi import FastAPI, status
 from httpx import AsyncClient, BasicAuth
+from models_library.api_schemas_resource_usage_tracker.licensed_items_checkouts import (
+    LicensedItemCheckoutGet,
+)
 from models_library.api_schemas_webserver.licensed_items import (
     LicensedItemGet as _LicensedItemGet,
 )
@@ -20,6 +24,9 @@
     LicensedItemCheckoutRpcGet,
 )
 from models_library.licensed_items import LicensedItemID
+from models_library.resource_tracker_licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
 from models_library.services_types import ServiceRunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
@@ -33,6 +40,9 @@
     NotEnoughAvailableSeatsError,
 )
 from simcore_service_api_server._meta import API_VTAG
+from simcore_service_api_server.api.dependencies.resource_usage_tracker_rpc import (
+    get_resource_usage_tracker_client,
+)
 from simcore_service_api_server.api.dependencies.webserver_rpc import (
     get_wb_api_rpc_client,
 )
@@ -41,6 +51,9 @@
     LicensedItemCheckoutData,
 )
 from simcore_service_api_server.models.schemas.model_adapter import LicensedItemGet
+from simcore_service_api_server.services_rpc.resource_usage_tracker import (
+    ResourceUsageTrackerClient,
+)
 from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
 
@@ -63,17 +76,27 @@ async def _get_backend_licensed_items(
     )
 
 
+class DummyRpcClient:
+    pass
+
+
 @pytest.fixture
 async def mock_wb_api_server_rcp(app: FastAPI, mocker: MockerFixture) -> MockerFixture:
-    class DummyRpcClient:
-        pass
 
     app.dependency_overrides[get_wb_api_rpc_client] = lambda: WbApiRpcClient(
         _client=DummyRpcClient()
     )
     return mocker
 
 
+@pytest.fixture
+async def mock_rut_rpc(app: FastAPI, mocker: MockerFixture) -> MockerFixture:
+    app.dependency_overrides[
+        get_resource_usage_tracker_client
+    ] = lambda: ResourceUsageTrackerClient(_client=DummyRpcClient())
+    return mocker
+
+
 async def test_get_licensed_items(
     mock_wb_api_server_rcp: MockerFixture, client: AsyncClient, auth: BasicAuth
 ):
@@ -173,7 +196,7 @@ async def side_effect(
         ),
     ],
 )
-async def test_get_licensed_items_checkout(
+async def test_checkout_licensed_item(
     mock_wb_api_server_rcp: MockerFixture,
     client: AsyncClient,
     auth: BasicAuth,
@@ -218,3 +241,74 @@ async def side_effect(
         content=body.model_dump_json(),
     )
     assert resp.status_code == expected_api_server_status_code
+
+
+@pytest.mark.parametrize(
+    "backend_exception_to_raise,expected_api_server_status_code,valid_license_checkout_id",
+    [
+        (None, status.HTTP_200_OK, True),
+    ],
+)
+async def test_release_checked_out_licensed_item(
+    mock_wb_api_server_rcp: MockerFixture,
+    mock_rut_rpc: MockerFixture,
+    client: AsyncClient,
+    auth: BasicAuth,
+    backend_exception_to_raise: Exception | None,
+    expected_api_server_status_code: int,
+    valid_license_checkout_id: bool,
+    faker: Faker,
+):
+    _licensed_item_id = cast(UUID, faker.uuid4())
+    _licensed_item_checkout_id = cast(UUID, faker.uuid4())
+
+    async def get_licensed_item_checkout(
+        rabbitmq_rpc_client: RabbitMQRPCClient,
+        product_name: str,
+        licensed_item_checkout_id: LicensedItemCheckoutID,
+    ) -> LicensedItemCheckoutGet:
+        if backend_exception_to_raise is not None:
+            raise backend_exception_to_raise
+        extra = LicensedItemCheckoutGet.model_config.get("json_schema_extra")
+        assert isinstance(extra, dict)
+        examples = extra.get("examples")
+        assert isinstance(examples, list)
+        assert len(examples) > 0
+        example = examples[0]
+        assert isinstance(example, dict)
+        licensed_item_checkout_get = LicensedItemCheckoutGet.model_validate(example)
+        if valid_license_checkout_id:
+            licensed_item_checkout_get.licensed_item_id = _licensed_item_id
+        return licensed_item_checkout_get
+
+    async def release_licensed_item_for_wallet(
+        rabbitmq_rpc_client: RabbitMQRPCClient,
+        product_name: str,
+        user_id: int,
+        licensed_item_checkout_id: LicensedItemCheckoutID,
+    ) -> LicensedItemCheckoutRpcGet:
+        if backend_exception_to_raise is not None:
+            raise backend_exception_to_raise
+        extra = LicensedItemCheckoutRpcGet.model_config.get("json_schema_extra")
+        assert isinstance(extra, dict)
+        examples = extra.get("examples")
+        assert isinstance(examples, list)
+        assert len(examples) > 0
+        example = examples[0]
+        assert isinstance(example, dict)
+        return LicensedItemCheckoutRpcGet.model_validate(example)
+
+    mock_rut_rpc.patch(
+        "simcore_service_api_server.services_rpc.resource_usage_tracker._get_licensed_item_checkout",
+        get_licensed_item_checkout,
+    )
+    mock_wb_api_server_rcp.patch(
+        "simcore_service_api_server.services_rpc.wb_api_server._release_licensed_item_for_wallet",
+        release_licensed_item_for_wallet,
+    )
+
+    resp = await client.post(
+        f"{API_VTAG}/licensed-items/{_licensed_item_id}/checked-out-items/{_licensed_item_checkout_id}/release",
+        auth=auth,
+    )
+    assert resp.status_code == expected_api_server_status_code