checkout release functionality

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/licensed_items_usages.py

@@ -20,7 +20,7 @@ class LicensedItemUsageGet(BaseModel):
     user_id: UserID
     product_name: ProductName
     service_run_id: ServiceRunId
-    start_at: datetime
+    started_at: datetime
     stopped_at: datetime | None
     num_of_seats: int
 
@@ -34,7 +34,7 @@ class LicensedItemUsageGet(BaseModel):
                     "user_id": 1,
                     "product_name": "osparc",
                     "service_run_id": "run_1",
-                    "start_at": "2023-01-11 13:11:47.293595",
+                    "started_at": "2023-01-11 13:11:47.293595",
                     "stopped_at": "2023-01-11 13:11:47.293595",
                     "num_of_seats": 1,
                 }

packages/postgres-database/src/simcore_postgres_database/migration/versions/3720518f82a7_modify_licenses_db.py

@@ -0,0 +1,28 @@
+"""modify licenses DB
+
+Revision ID: 3720518f82a7
+Revises: 77ac824a77ff
+Create Date: 2024-12-13 12:46:38.302027+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "3720518f82a7"
+down_revision = "77ac824a77ff"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_column("resource_tracker_licensed_items_usage", "licensed_item_id")
+    op.add_column(
+        "resource_tracker_licensed_items_usage",
+        sa.Column("licensed_item_id", postgresql.UUID(as_uuid=True), nullable=False),
+    )
+
+
+def downgrade():
+    ...

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

@@ -56,7 +56,7 @@ async def list_licensed_items_purchases(
                 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,
+                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,
             )
@@ -84,7 +84,7 @@ async def get_licensed_item_usage(
         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,
+        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,
     )
@@ -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.started_at,
+        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,
     )

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

@@ -6,7 +6,9 @@
 
 from datetime import UTC, datetime, timedelta
 from decimal import Decimal
+from typing import Generator
 
+import pytest
 import sqlalchemy as sa
 from models_library.resource_tracker_licensed_items_purchases import (
     LicensedItemsPurchasesCreate,
@@ -16,6 +18,9 @@
     licensed_items_purchases,
     licensed_items_usages,
 )
+from simcore_postgres_database.models.resource_tracker_service_runs import (
+    resource_tracker_service_runs,
+)
 
 pytest_simcore_core_services_selection = [
     "postgres",
@@ -38,16 +43,43 @@ async def test_service_licensed_items_usages(
     # Get licensed items usages
 
 
+_USER_ID_1 = 1
+_WALLET_ID = 6
+
+
+@pytest.fixture()
+def resource_tracker_service_run_id(
+    postgres_db: sa.engine.Engine, random_resource_tracker_service_run
+) -> Generator[str, None, None]:
+    with postgres_db.connect() as con:
+        result = con.execute(
+            resource_tracker_service_runs.insert()
+            .values(
+                **random_resource_tracker_service_run(
+                    user_id=_USER_ID_1, wallet_id=_WALLET_ID
+                )
+            )
+            .returning(resource_tracker_service_runs.c.service_run_id)
+        )
+        row = result.first()
+        assert row
+
+        yield row[0]
+
+        con.execute(resource_tracker_service_runs.delete())
+
+
 async def test_rpc_licensed_items_usages_workflow(
     mocked_redis_server: None,
     postgres_db: sa.engine.Engine,
+    resource_tracker_service_run_id: str,
     rpc_client: RabbitMQRPCClient,
 ):
     # Purchase license item
     _create_data = LicensedItemsPurchasesCreate(
         product_name="osparc",
         licensed_item_id="beb16d18-d57d-44aa-a638-9727fa4a72ef",
-        wallet_id=1,
+        wallet_id=_WALLET_ID,
         wallet_name="My Wallet",
         pricing_plan_id=1,
         pricing_unit_id=1,
@@ -56,11 +88,10 @@ async def test_rpc_licensed_items_usages_workflow(
         start_at=datetime.now(tz=UTC),
         expire_at=datetime.now(tz=UTC) + timedelta(days=1),
         num_of_seats=5,
-        purchased_by_user=1,
+        purchased_by_user=_USER_ID_1,
         user_email="[email protected]",
         purchased_at=datetime.now(tz=UTC),
     )
-
     created_item = await licensed_items_purchases.create_licensed_item_purchase(
         rpc_client, data=_create_data
     )
@@ -69,11 +100,11 @@ async def test_rpc_licensed_items_usages_workflow(
     checkout = await licensed_items_usages.checkout_licensed_item(
         rpc_client,
         licensed_item_id=created_item.licensed_item_id,
-        wallet_id=1,
+        wallet_id=_WALLET_ID,
         product_name="osparc",
         num_of_seats=3,
-        service_run_id="run_1",
-        user_id=1,
+        service_run_id=resource_tracker_service_run_id,
+        user_id=_USER_ID_1,
         user_email="[email protected]",
     )
 
@@ -82,7 +113,4 @@ async def test_rpc_licensed_items_usages_workflow(
         rpc_client, checkout_id=checkout.checkout_id, product_name="osparc"
     )
     assert license_item_usage
-
-
-# TODO: MD
-# Add test for heartbeat check!
+    assert isinstance(license_item_usage.stopped_at, datetime)

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

@@ -26,6 +26,7 @@
 
 async def list_licensed_items_purchases(
     app: web.Application,
+    *,
     product_name: ProductName,
     user_id: UserID,
     wallet_id: WalletID,