review @pcrespov

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/aa6da21a0055_rename_usages_to_checkouts.py

@@ -1,7 +1,7 @@
 """rename usages to checkouts
 
 Revision ID: aa6da21a0055
-Revises: 77ac824a77ff
+Revises: 52a0e8148dd5
 Create Date: 2024-12-17 13:47:09.304574+00:00
 
 """
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "aa6da21a0055"
-down_revision = "77ac824a77ff"
+down_revision = "52a0e8148dd5"
 branch_labels = None
 depends_on = None
 

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

@@ -114,6 +114,8 @@ async def list_(
 
     async with pass_or_acquire_connection(engine, connection) as conn:
         total_count = await conn.scalar(count_query)
+        if total_count is None:
+            total_count = 0
 
         result = await conn.stream(list_query)
         items: list[LicensedItemCheckoutDB] = [
@@ -208,8 +210,7 @@ async def get_currently_used_seats_for_item_and_wallet(
     )
 
     async with pass_or_acquire_connection(engine, connection) as conn:
-        result = await conn.execute(sum_stmt)
-        row = result.first()
-        if row is None or row[0] is None:
+        total_sum = await conn.scalar(sum_stmt)
+        if total_sum is None:
             return 0
-        return int(row[0])
+        return cast(int, total_sum)

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

@@ -116,6 +116,8 @@ async def list_(
 
     async with pass_or_acquire_connection(engine, connection) as conn:
         total_count = await conn.scalar(count_query)
+        if total_count is None:
+            total_count = 0
 
         result = await conn.stream(list_query)
         items: list[LicensedItemsPurchasesDB] = [
@@ -181,8 +183,7 @@ async def get_active_purchased_seats_for_item_and_wallet(
     )
 
     async with pass_or_acquire_connection(engine, connection) as conn:
-        result = await conn.execute(sum_stmt)
-        row = result.first()
-        if row is None or row[0] is None:
+        total_sum = await conn.scalar(sum_stmt)
+        if total_sum is None:
             return 0
-        return int(row[0])
+        return cast(int, total_sum)

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

@@ -376,7 +376,9 @@ async def get_osparc_credits_aggregated_by_service(
 
         subquery = base_query.subquery()
         count_query = sa.select(sa.func.count()).select_from(subquery)
-        count_result = await conn.execute(count_query)
+        count_result = await conn.scalar(count_query)
+        if count_result is None:
+            count_result = 0
 
         # Default ordering and pagination
         list_query = (
@@ -387,7 +389,7 @@ async def get_osparc_credits_aggregated_by_service(
         list_result = await conn.execute(list_query)
 
     return (
-        cast(int, count_result.scalar()),
+        cast(int, count_result),
         [
             OsparcCreditsAggregatedByServiceKeyDB.model_validate(row)
             for row in list_result.fetchall()

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

@@ -24,12 +24,15 @@
 
 async def checkout_licensed_item_for_wallet(
     app: web.Application,
-    licensed_item_id: LicensedItemID,
-    wallet_id: WalletID,
+    *,
+    # access context
     product_name: ProductName,
+    wallet_id: WalletID,
+    user_id: UserID,
+    # checkout args
+    licensed_item_id: LicensedItemID,
     num_of_seats: int,
     service_run_id: ServiceRunId,
-    user_id: UserID,
 ) -> webserver_licensed_items_checkouts.LicensedItemCheckoutGet:
     # Check whether user has access to the wallet
     await get_wallet_by_user(
@@ -69,8 +72,11 @@ async def checkout_licensed_item_for_wallet(
 
 async def release_licensed_item_for_wallet(
     app: web.Application,
+    *,
+    # access context
     product_name: ProductName,
     user_id: UserID,
+    # release args
     licensed_item_checkout_id: LicensedItemCheckoutID,
 ) -> webserver_licensed_items_checkouts.LicensedItemCheckoutGet:
     rpc_client = get_rabbitmq_rpc_client(app)