wire checkout and release in webserver

Author: matusdrobuliak66

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py

@@ -5,6 +5,10 @@
     LicensedItemGet,
     LicensedItemGetPage,
 )
+from models_library.api_schemas_webserver.licensed_items_usages import (
+    LicenseCheckoutGet,
+    LicensedItemUsageGet,
+)
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
@@ -23,8 +27,8 @@ async def get_licensed_items(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     product_name: str,
-    offset: int,
-    limit: int,
+    offset: int = 0,
+    limit: int = 20,
 ) -> LicensedItemGetPage:
     result: LicensedItemGetPage = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -33,51 +37,58 @@ async def get_licensed_items(
         offset=offset,
         limit=limit,
     )
-    assert isinstance(result, LicensedItemGetPage)
+    assert isinstance(result, LicensedItemGetPage)  # nosec
     return result
 
 
 @log_decorator(_logger, level=logging.DEBUG)
-async def get_licensed_items_for_wallet(
+async def get_purchased_licensed_items_for_wallet(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
-    user_id: UserID,
     product_name: ProductName,
     wallet_id: WalletID,
-) -> LicensedItemGet:
+    user_id: UserID,
+    offset: int = 0,
+    limit: int = 20,
+) -> LicensedItemGetPage:
     result: LicensedItemGet = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_licensed_items_for_wallet"),
-        user_id=user_id,
+        TypeAdapter(RPCMethodName).validate_python(
+            "get_purchased_licensed_items_for_wallet"
+        ),
         product_name=product_name,
+        user_id=user_id,
         wallet_id=wallet_id,
+        offset=offset,
+        limit=limit,
     )
-    assert isinstance(result, LicensedItemGet)  # nosec
+    assert isinstance(result, LicensedItemGetPage)  # nosec
     return result
 
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def checkout_licensed_item_for_wallet(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
-    user_id: UserID,
     product_name: ProductName,
+    user_id: UserID,
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
     service_run_id: ServiceRunId,
-) -> None:
+) -> LicenseCheckoutGet:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("checkout_licensed_item_for_wallet"),
-        user_id=user_id,
         product_name=product_name,
+        user_id=user_id,
         wallet_id=wallet_id,
         licensed_item_id=licensed_item_id,
         num_of_seats=num_of_seats,
         service_run_id=service_run_id,
     )
-    assert result is None  # nosec
+    assert isinstance(result, LicenseCheckoutGet)  # nosec
+    return result
 
 
 @log_decorator(_logger, level=logging.DEBUG)
@@ -90,7 +101,7 @@ async def release_licensed_item_for_wallet(
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
     service_run_id: ServiceRunId,
-) -> None:
+) -> LicensedItemUsageGet:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("release_licensed_item_for_wallet"),
@@ -101,4 +112,5 @@ async def release_licensed_item_for_wallet(
         num_of_seats=num_of_seats,
         service_run_id=service_run_id,
     )
-    assert result is None  # nosec
+    assert isinstance(result, LicensedItemUsageGet)  # nosec
+    return result

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

@@ -42,11 +42,11 @@ async def get_licensed_items(
 
 
 @router.expose(reraise_if_error_type=(NotImplementedError,))
-async def get_licensed_items_for_wallet(
+async def get_purchased_licensed_items_for_wallet(
     app: web.Application,
     *,
-    user_id: UserID,
     product_name: ProductName,
+    user_id: UserID,
     wallet_id: WalletID,
     offset: int,
     limit: int,
@@ -58,8 +58,8 @@ async def get_licensed_items_for_wallet(
 async def checkout_licensed_item_for_wallet(
     app: web.Application,
     *,
-    user_id: UserID,
     product_name: ProductName,
+    user_id: UserID,
     wallet_id: WalletID,
     licensed_item_id: LicensedItemID,
     num_of_seats: int,
@@ -80,9 +80,9 @@ async def checkout_licensed_item_for_wallet(
 async def release_licensed_item_for_wallet(
     app: web.Application,
     *,
+    product_name: ProductName,
     user_id: UserID,
     checkout_id: LicenseCheckoutID,
-    product_name: ProductName,
 ) -> LicensedItemUsageGet:
     return await _licensed_checkouts_api.release_licensed_item_for_wallet(
         app, product_name=product_name, user_id=user_id, checkout_id=checkout_id