renaming

Author: matusdrobuliak66

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

@@ -39,13 +39,13 @@ async def get_licensed_item_checkout(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     product_name: ProductName,
-    licensed_item_usage_id: LicensedItemCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> LicensedItemCheckoutGet:
     result = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("get_licensed_item_checkout"),
         product_name=product_name,
-        licensed_item_usage_id=licensed_item_usage_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
     assert isinstance(result, LicensedItemCheckoutGet)  # nosec

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

@@ -22,16 +22,16 @@
 
 
 @router.expose(reraise_if_error_type=())
-async def get_licensed_item_usage(
+async def get_licensed_item_checkout(
     app: FastAPI,
     *,
     product_name: ProductName,
-    licensed_item_usage_id: LicensedItemCheckoutID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> LicensedItemCheckoutGet:
     return await licensed_items_checkouts.get_licensed_item_checkout(
         db_engine=app.state.engine,
         product_name=product_name,
-        licensed_item_checkout_id=licensed_item_usage_id,
+        licensed_item_checkout_id=licensed_item_checkout_id,
     )
 
 

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/exceptions/errors.py

@@ -80,5 +80,5 @@ class LicensedItemPurchaseNotFoundError(RutNotFoundError):
     licensed_item_purchase_id: LicensedItemPurchaseID
 
 
-class LicensedItemUsageNotFoundError(RutNotFoundError):
-    licensed_item_usage_id: LicensedItemCheckoutID
+class LicensedItemCheckoutNotFoundError(RutNotFoundError):
+    licensed_item_checkout_id: LicensedItemCheckoutID

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

@@ -52,17 +52,17 @@ async def list_licensed_items_checkouts(
         total=total,
         items=[
             LicensedItemCheckoutGet(
-                licensed_item_checkout_id=licensed_item_usage_db.licensed_item_checkout_id,
-                licensed_item_id=licensed_item_usage_db.licensed_item_id,
-                wallet_id=licensed_item_usage_db.wallet_id,
-                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,
-                started_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,
+                licensed_item_checkout_id=licensed_item_checkout_db.licensed_item_checkout_id,
+                licensed_item_id=licensed_item_checkout_db.licensed_item_id,
+                wallet_id=licensed_item_checkout_db.wallet_id,
+                user_id=licensed_item_checkout_db.user_id,
+                product_name=licensed_item_checkout_db.product_name,
+                service_run_id=licensed_item_checkout_db.service_run_id,
+                started_at=licensed_item_checkout_db.started_at,
+                stopped_at=licensed_item_checkout_db.stopped_at,
+                num_of_seats=licensed_item_checkout_db.num_of_seats,
             )
-            for licensed_item_usage_db in licensed_items_checkouts_list_db
+            for licensed_item_checkout_db in licensed_items_checkouts_list_db
         ],
     )
 
@@ -73,24 +73,24 @@ async def get_licensed_item_checkout(
     product_name: ProductName,
     licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> LicensedItemCheckoutGet:
-    licensed_item_usage_db: LicensedItemCheckoutDB = (
+    licensed_item_checkout_db: LicensedItemCheckoutDB = (
         await licensed_items_checkouts_db.get(
             db_engine,
             product_name=product_name,
-            licensed_item_usage_id=licensed_item_checkout_id,
+            licensed_item_checkout_id=licensed_item_checkout_id,
         )
     )
 
     return LicensedItemCheckoutGet(
-        licensed_item_checkout_id=licensed_item_usage_db.licensed_item_checkout_id,
-        licensed_item_id=licensed_item_usage_db.licensed_item_id,
-        wallet_id=licensed_item_usage_db.wallet_id,
-        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,
-        started_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,
+        licensed_item_checkout_id=licensed_item_checkout_db.licensed_item_checkout_id,
+        licensed_item_id=licensed_item_checkout_db.licensed_item_id,
+        wallet_id=licensed_item_checkout_db.wallet_id,
+        user_id=licensed_item_checkout_db.user_id,
+        product_name=licensed_item_checkout_db.product_name,
+        service_run_id=licensed_item_checkout_db.service_run_id,
+        started_at=licensed_item_checkout_db.started_at,
+        stopped_at=licensed_item_checkout_db.stopped_at,
+        num_of_seats=licensed_item_checkout_db.num_of_seats,
     )
 
 
@@ -139,7 +139,7 @@ async def checkout_licensed_item(
     ):
         raise ValueError("This should not happen")
 
-    _create_item_usage = CreateLicensedItemCheckoutDB(
+    _create_item_checkout = CreateLicensedItemCheckoutDB(
         licensed_item_id=licensed_item_id,
         wallet_id=wallet_id,
         user_id=user_id,
@@ -150,7 +150,7 @@ async def checkout_licensed_item(
         num_of_seats=num_of_seats,
     )
     license_item_checkout_db = await licensed_items_checkouts_db.create(
-        db_engine, data=_create_item_usage
+        db_engine, data=_create_item_checkout
     )
 
     # Return checkout ID
@@ -166,23 +166,23 @@ async def release_licensed_item(
     product_name: ProductName,
 ) -> LicensedItemCheckoutGet:
 
-    licensed_item_usage_db: LicensedItemCheckoutDB = (
+    licensed_item_checkout_db: LicensedItemCheckoutDB = (
         await licensed_items_checkouts_db.update(
             db_engine,
-            licensed_item_usage_id=checkout_id,
+            licensed_item_checkout_id=checkout_id,
             product_name=product_name,
             stopped_at=datetime.now(tz=UTC),
         )
     )
 
     return LicensedItemCheckoutGet(
-        licensed_item_checkout_id=licensed_item_usage_db.licensed_item_checkout_id,
-        licensed_item_id=licensed_item_usage_db.licensed_item_id,
-        wallet_id=licensed_item_usage_db.wallet_id,
-        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,
-        started_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,
+        licensed_item_checkout_id=licensed_item_checkout_db.licensed_item_checkout_id,
+        licensed_item_id=licensed_item_checkout_db.licensed_item_id,
+        wallet_id=licensed_item_checkout_db.wallet_id,
+        user_id=licensed_item_checkout_db.user_id,
+        product_name=licensed_item_checkout_db.product_name,
+        service_run_id=licensed_item_checkout_db.service_run_id,
+        started_at=licensed_item_checkout_db.started_at,
+        stopped_at=licensed_item_checkout_db.stopped_at,
+        num_of_seats=licensed_item_checkout_db.num_of_seats,
     )

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

@@ -4,9 +4,6 @@
 import sqlalchemy as sa
 from models_library.licensed_items import LicensedItemID
 from models_library.products import ProductName
-from models_library.resource_tracker_licensed_items_purchases import (
-    LicensedItemPurchaseID,
-)
 from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.wallets import WalletID
 from pydantic import NonNegativeInt
@@ -17,9 +14,12 @@
     pass_or_acquire_connection,
     transaction_context,
 )
+from simcore_service_resource_usage_tracker.services.licensed_items_checkouts import (
+    LicensedItemCheckoutID,
+)
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
-from ....exceptions.errors import LicensedItemUsageNotFoundError
+from ....exceptions.errors import LicensedItemCheckoutNotFoundError
 from ....models.licensed_items_checkouts import (
     CreateLicensedItemCheckoutDB,
     LicensedItemCheckoutDB,
@@ -125,16 +125,16 @@ async def get(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    licensed_item_usage_id: LicensedItemPurchaseID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
     product_name: ProductName,
 ) -> LicensedItemCheckoutDB:
     base_query = (
         sa.select(*_SELECTION_ARGS)
         .select_from(resource_tracker_licensed_items_checkouts)
         .where(
             (
-                resource_tracker_licensed_items_checkouts.c.licensed_item_usage_id
-                == licensed_item_usage_id
+                resource_tracker_licensed_items_checkouts.c.licensed_item_checkout_id
+                == licensed_item_checkout_id
             )
             & (resource_tracker_licensed_items_checkouts.c.product_name == product_name)
         )
@@ -144,8 +144,8 @@ async def get(
         result = await conn.stream(base_query)
         row = await result.first()
         if row is None:
-            raise LicensedItemUsageNotFoundError(
-                licensed_item_usage_id=licensed_item_usage_id
+            raise LicensedItemCheckoutNotFoundError(
+                licensed_item_checkout_id=licensed_item_checkout_id
             )
         return LicensedItemCheckoutDB.model_validate(row)
 
@@ -154,7 +154,7 @@ async def update(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    licensed_item_usage_id: LicensedItemPurchaseID,
+    licensed_item_checkout_id: LicensedItemCheckoutID,
     product_name: ProductName,
     stopped_at: datetime,
 ) -> LicensedItemCheckoutDB:
@@ -166,8 +166,8 @@ async def update(
         )
         .where(
             (
-                resource_tracker_licensed_items_checkouts.c.licensed_item_usage_id
-                == licensed_item_usage_id
+                resource_tracker_licensed_items_checkouts.c.licensed_item_checkout_id
+                == licensed_item_checkout_id
             )
             & (resource_tracker_licensed_items_checkouts.c.product_name == product_name)
             & (resource_tracker_licensed_items_checkouts.c.stopped_at.is_(None))
@@ -179,8 +179,8 @@ async def update(
         result = await conn.execute(update_stmt)
         row = result.first()
         if row is None:
-            raise LicensedItemUsageNotFoundError(
-                licensed_item_usage_id=licensed_item_usage_id
+            raise LicensedItemCheckoutNotFoundError(
+                licensed_item_checkout_id=licensed_item_checkout_id
             )
         return LicensedItemCheckoutDB.model_validate(row)
 

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

@@ -125,7 +125,7 @@ async def test_rpc_licensed_items_checkouts_workflow(
     output = await licensed_items_checkouts.get_licensed_item_checkout(
         rpc_client,
         product_name="osparc",
-        licensed_item_usage_id=output.items[0].licensed_item_checkout_id,
+        licensed_item_checkout_id=output.items[0].licensed_item_checkout_id,
     )
     assert isinstance(output, LicensedItemCheckoutGet)
 

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

@@ -66,7 +66,7 @@ async def release_licensed_item_for_wallet(
     rpc_client = get_rabbitmq_rpc_client(app)
 
     checkout_item = await licensed_items_checkouts.get_licensed_item_checkout(
-        rpc_client, product_name=product_name, licensed_item_usage_id=checkout_id
+        rpc_client, product_name=product_name, licensed_item_checkout_id=checkout_id
     )
 
     # Check whether user has access to the wallet
@@ -86,7 +86,7 @@ async def release_licensed_item_for_wallet(
     )
 
     return webserver_licensed_items_checkouts.LicensedItemCheckoutGet(
-        licensed_item_checkout_id=licensed_item_get.licensed_item_usage_id,
+        licensed_item_checkout_id=licensed_item_get.licensed_item_checkout_id,
         licensed_item_id=licensed_item_get.licensed_item_id,
         wallet_id=licensed_item_get.wallet_id,
         user_id=licensed_item_get.user_id,

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

@@ -101,9 +101,9 @@ def mock_checkout_licensed_item(mocker: MockerFixture) -> tuple:
 
 
 @pytest.fixture
-def mock_get_licensed_item_usage(mocker: MockerFixture) -> tuple:
+def mock_get_licensed_item_checkout(mocker: MockerFixture) -> tuple:
     return mocker.patch(
-        "simcore_service_webserver.licenses._licensed_checkouts_api.licensed_items_checkouts.get_licensed_item_usage",
+        "simcore_service_webserver.licenses._licensed_checkouts_api.licensed_items_checkouts.get_licensed_item_checkout",
         spec=True,
         return_value=_LICENSED_ITEM_USAGE_GET,
     )
@@ -130,7 +130,7 @@ async def test_license_checkout_workflow(
     mock_get_wallet_by_user: MockerFixture,
     mock_checkout_licensed_item: MockerFixture,
     mock_release_licensed_item: MockerFixture,
-    mock_get_licensed_item_usage: MockerFixture,
+    mock_get_licensed_item_checkout: MockerFixture,
 ):
     assert client.app