adding tests to rut

Author: matusdrobuliak66

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/licensed_items_purchases.py

@@ -17,7 +17,7 @@
 )
 from models_library.rest_ordering import OrderBy
 from models_library.wallets import WalletID
-from pydantic import AnyUrl, NonNegativeInt, TypeAdapter
+from pydantic import NonNegativeInt, TypeAdapter
 
 from ....logging_utils import log_decorator
 from ....rabbitmq import RabbitMQRPCClient
@@ -76,7 +76,7 @@ async def get_licensed_item_purchase(
 async def create_licensed_item_purchase(
     rabbitmq_rpc_client: RabbitMQRPCClient, *, data: LicensedItemsPurchasesCreate
 ) -> LicensedItemPurchaseGet:
-    result: AnyUrl = await rabbitmq_rpc_client.request(
+    result = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("create_licensed_item_purchase"),
         data=data,

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/licensed_items_usages.py

@@ -0,0 +1,116 @@
+import logging
+from typing import Final
+
+from models_library.api_schemas_resource_usage_tracker import (
+    RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+)
+from models_library.api_schemas_resource_usage_tracker.licensed_items_usages import (
+    LicenseCheckoutID,
+    LicensedItemUsageGet,
+    LicenseItemCheckoutGet,
+)
+from models_library.licensed_items import LicensedItemID
+from models_library.products import ProductName
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.resource_tracker import ServiceRunId
+from models_library.users import UserID
+from models_library.wallets import WalletID
+from pydantic import NonNegativeInt, TypeAdapter
+
+from ....logging_utils import log_decorator
+from ....rabbitmq import RabbitMQRPCClient
+
+_logger = logging.getLogger(__name__)
+
+
+_DEFAULT_TIMEOUT_S: Final[NonNegativeInt] = 30
+
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
+
+# @log_decorator(_logger, level=logging.DEBUG)
+# async def get_licensed_items_usages_page(
+#     rabbitmq_rpc_client: RabbitMQRPCClient,
+#     *,
+#     product_name: ProductName,
+#     wallet_id: WalletID,
+#     offset: int = 0,
+#     limit: int = 20,
+#     order_by: OrderBy = OrderBy(field=IDStr("purchased_at")),
+# ) -> LicensedItemsPurchasesPage:
+#     result = await rabbitmq_rpc_client.request(
+#         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+#         _RPC_METHOD_NAME_ADAPTER.validate_python("get_licensed_items_purchases_page"),
+#         product_name=product_name,
+#         wallet_id=wallet_id,
+#         limit=limit,
+#         offset=offset,
+#         order_by=order_by,
+#         timeout_s=_DEFAULT_TIMEOUT_S,
+#     )
+#     assert isinstance(result, LicensedItemsPurchasesPage)  # nosec
+#     return result
+
+
+# @log_decorator(_logger, level=logging.DEBUG)
+# async def get_licensed_item_usage(
+#     rabbitmq_rpc_client: RabbitMQRPCClient,
+#     *,
+#     product_name: ProductName,
+#     licensed_item_purchase_id: LicensedItemPurchaseID,
+# ) -> LicensedItemPurchaseGet:
+#     result = await rabbitmq_rpc_client.request(
+#         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+#         _RPC_METHOD_NAME_ADAPTER.validate_python("get_licensed_item_purchase"),
+#         product_name=product_name,
+#         licensed_item_purchase_id=licensed_item_purchase_id,
+#         timeout_s=_DEFAULT_TIMEOUT_S,
+#     )
+#     assert isinstance(result, LicensedItemPurchaseGet)  # nosec
+#     return result
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def checkout_licensed_item(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    licensed_item_id: LicensedItemID,
+    wallet_id: WalletID,
+    product_name: ProductName,
+    num_of_seats: int,
+    service_run_id: ServiceRunId,
+    user_id: UserID,
+    user_email: str,
+) -> LicenseItemCheckoutGet:
+    result: LicenseItemCheckoutGet = await rabbitmq_rpc_client.request(
+        RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+        _RPC_METHOD_NAME_ADAPTER.validate_python("checkout_licensed_item"),
+        licensed_item_id=licensed_item_id,
+        wallet_id=wallet_id,
+        product_name=product_name,
+        num_of_seats=num_of_seats,
+        service_run_id=service_run_id,
+        user_id=user_id,
+        user_email=user_email,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+    assert isinstance(result, LicenseItemCheckoutGet)  # nosec
+    return result
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def release_licensed_item(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    checkout_id: LicenseCheckoutID,
+    product_name: ProductName,
+) -> LicensedItemUsageGet:
+    result: LicensedItemUsageGet = await rabbitmq_rpc_client.request(
+        RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
+        _RPC_METHOD_NAME_ADAPTER.validate_python("release_licensed_item"),
+        checkout_id=checkout_id,
+        product_name=product_name,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+    assert isinstance(result, LicensedItemUsageGet)  # nosec
+    return result

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/_licensed_items_usages.py

@@ -1,12 +1,12 @@
 from fastapi import FastAPI
 from models_library.api_schemas_resource_usage_tracker.licensed_items_usages import (
+    LicenseCheckoutID,
     LicensedItemUsageGet,
     LicenseItemCheckoutGet,
 )
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
 from models_library.resource_tracker import ServiceRunId
-from models_library.resource_tracker_licensed_items_usages import LicenseCheckoutID
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from servicelib.rabbitmq import RPCRouter

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/api/rpc/routes.py

@@ -8,14 +8,15 @@
 from servicelib.rabbitmq import RPCRouter
 
 from ...services.modules.rabbitmq import get_rabbitmq_rpc_server
-from . import _licensed_items_purchases, _resource_tracker
+from . import _licensed_items_purchases, _licensed_items_usages, _resource_tracker
 
 _logger = logging.getLogger(__name__)
 
 
 ROUTERS: list[RPCRouter] = [
     _resource_tracker.router,
     _licensed_items_purchases.router,
+    _licensed_items_usages.router,
 ]
 
 

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/licensed_items_usages.py

@@ -17,9 +17,10 @@ class LicensedItemUsageDB(BaseModel):
     user_email: str
     product_name: ProductName
     service_run_id: ServiceRunId
-    start_at: datetime
+    started_at: datetime
     stopped_at: datetime | None
     num_of_seats: int
+    modified: datetime
 
     model_config = ConfigDict(from_attributes=True)
 
@@ -31,7 +32,7 @@ class CreateLicensedItemUsageDB(BaseModel):
     user_email: str
     product_name: ProductName
     service_run_id: ServiceRunId
-    start_at: datetime
+    started_at: datetime
     num_of_seats: int
 
     model_config = ConfigDict(from_attributes=True)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/licensed_items_usages.py

@@ -142,7 +142,7 @@ async def checkout_licensed_item(
         user_email=user_email,
         product_name=product_name,
         service_run_id=service_run_id,
-        start_at=datetime.now(tz=UTC),
+        started_at=datetime.now(tz=UTC),
         num_of_seats=num_of_seats,
     )
     license_item_usage_db = await licensed_items_usages_db.create(
@@ -176,7 +176,7 @@ async def release_licensed_item(
         user_id=licensed_item_usage_db.user_id,
         product_name=licensed_item_usage_db.product_name,
         service_run_id=licensed_item_usage_db.service_run_id,
-        start_at=licensed_item_usage_db.start_at,
+        start_at=licensed_item_usage_db.started_at,
         stopped_at=licensed_item_usage_db.stopped_at,
         num_of_seats=licensed_item_usage_db.num_of_seats,
     )

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/licensed_items_usages_db.py

@@ -33,7 +33,7 @@
     resource_tracker_licensed_items_usage.c.user_email,
     resource_tracker_licensed_items_usage.c.product_name,
     resource_tracker_licensed_items_usage.c.service_run_id,
-    resource_tracker_licensed_items_usage.c.start_at,
+    resource_tracker_licensed_items_usage.c.started_at,
     resource_tracker_licensed_items_usage.c.stopped_at,
     resource_tracker_licensed_items_usage.c.num_of_seats,
     resource_tracker_licensed_items_usage.c.modified,
@@ -60,7 +60,7 @@ async def create(
                 user_email=data.user_email,
                 product_name=data.product_name,
                 service_run_id=data.service_run_id,
-                start_at=data.start_at,
+                started_at=data.started_at,
                 stopped_at=None,
                 num_of_seats=data.num_of_seats,
                 modified=sa.func.now(),

services/resource-usage-tracker/tests/unit/with_dbs/test_api_licensed_items_usages.py

@@ -4,8 +4,18 @@
 # pylint:disable=too-many-arguments
 
 
+from datetime import UTC, datetime, timedelta
+from decimal import Decimal
+
 import sqlalchemy as sa
+from models_library.resource_tracker_licensed_items_purchases import (
+    LicensedItemsPurchasesCreate,
+)
 from servicelib.rabbitmq import RabbitMQRPCClient
+from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker import (
+    licensed_items_purchases,
+    licensed_items_usages,
+)
 
 pytest_simcore_core_services_selection = [
     "postgres",
@@ -33,15 +43,46 @@ async def test_rpc_licensed_items_usages_workflow(
     postgres_db: sa.engine.Engine,
     rpc_client: RabbitMQRPCClient,
 ):
-    ...
+    # Purchase license item
+    _create_data = LicensedItemsPurchasesCreate(
+        product_name="osparc",
+        licensed_item_id="beb16d18-d57d-44aa-a638-9727fa4a72ef",
+        wallet_id=1,
+        wallet_name="My Wallet",
+        pricing_plan_id=1,
+        pricing_unit_id=1,
+        pricing_unit_cost_id=1,
+        pricing_unit_cost=Decimal(10),
+        start_at=datetime.now(tz=UTC),
+        expire_at=datetime.now(tz=UTC) + timedelta(days=1),
+        num_of_seats=5,
+        purchased_by_user=1,
+        user_email="[email protected]",
+        purchased_at=datetime.now(tz=UTC),
+    )
 
-    # Can I use the license?
+    created_item = await licensed_items_purchases.create_licensed_item_purchase(
+        rpc_client, data=_create_data
+    )
 
     # Checkout with num of seats
-
-    # Can I use the license?
+    checkout = await licensed_items_usages.checkout_licensed_item(
+        rpc_client,
+        licensed_item_id=created_item.licensed_item_id,
+        wallet_id=1,
+        product_name="osparc",
+        num_of_seats=3,
+        service_run_id="run_1",
+        user_id=1,
+        user_email="[email protected]",
+    )
 
     # Release num of seats
+    license_item_usage = await licensed_items_usages.release_licensed_item(
+        rpc_client, checkout_id=checkout.checkout_id, product_name="osparc"
+    )
+    assert license_item_usage
 
 
+# TODO: MD
 # Add test for heartbeat check!

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

@@ -43,7 +43,9 @@ async def get_licensed_items_for_wallet(
     user_id: UserID,
     product_name: ProductName,
     wallet_id: WalletID,
-) -> None:
+    offset: int,
+    limit: int,
+) -> LicensedItemGetPage:
     raise NotImplementedError