PR reviews

Author: matusdrobuliak66

api/specs/web-server/_catalog_licensed_items.py

@@ -56,7 +56,8 @@ async def get_licensed_item(
 
 
 @router.post(
-    "/catalog/licensed-items/{licensed_item_id}", status_code=status.HTTP_204_NO_CONTENT
+    "/catalog/licensed-items/{licensed_item_id}:purchase",
+    status_code=status.HTTP_204_NO_CONTENT,
 )
 async def purchase_licensed_item(
     _path: Annotated[LicensedItemsPathParams, Depends()],

packages/postgres-database/src/simcore_postgres_database/migration/versions/4901050f94f4_add_license_db_tables.py renamed to packages/postgres-database/src/simcore_postgres_database/migration/versions/24a877297edc_add_license_db_tables.py

@@ -1,15 +1,15 @@
 """add license db tables
 
-Revision ID: 4901050f94f4
+Revision ID: 24a877297edc
 Revises: e05bdc5b3c7b
-Create Date: 2024-12-04 10:54:13.440309+00:00
+Create Date: 2024-12-05 10:47:31.251248+00:00
 
 """
 import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = "4901050f94f4"
+revision = "24a877297edc"
 down_revision = "e05bdc5b3c7b"
 branch_labels = None
 depends_on = None
@@ -18,8 +18,8 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "resource_tracker_license_purchases",
-        sa.Column("license_purchase_id", sa.String(), nullable=False),
+        "resource_tracker_licensed_items_purchases",
+        sa.Column("licensed_item_purchase_id", sa.String(), nullable=False),
         sa.Column("product_name", sa.String(), nullable=False),
         sa.Column("licensed_item_id", sa.BigInteger(), nullable=False),
         sa.Column("wallet_id", sa.BigInteger(), nullable=False),
@@ -48,12 +48,12 @@ def upgrade():
             server_default=sa.text("now()"),
             nullable=False,
         ),
-        sa.PrimaryKeyConstraint("license_purchase_id"),
+        sa.PrimaryKeyConstraint("licensed_item_purchase_id"),
     )
     op.create_table(
-        "resource_tracker_license_checkouts",
-        sa.Column("license_checkout_id", sa.String(), nullable=False),
-        sa.Column("license_package_id", sa.String(), nullable=True),
+        "resource_tracker_licensed_items_usage",
+        sa.Column("licensed_item_usage_id", sa.String(), nullable=False),
+        sa.Column("licensed_item_id", sa.String(), nullable=True),
         sa.Column("wallet_id", sa.BigInteger(), nullable=False),
         sa.Column("user_id", sa.BigInteger(), nullable=False),
         sa.Column("user_email", sa.String(), nullable=True),
@@ -78,11 +78,11 @@ def upgrade():
             onupdate="CASCADE",
             ondelete="RESTRICT",
         ),
-        sa.PrimaryKeyConstraint("license_checkout_id"),
+        sa.PrimaryKeyConstraint("licensed_item_usage_id"),
     )
     op.create_index(
-        op.f("ix_resource_tracker_license_checkouts_wallet_id"),
-        "resource_tracker_license_checkouts",
+        op.f("ix_resource_tracker_licensed_items_usage_wallet_id"),
+        "resource_tracker_licensed_items_usage",
         ["wallet_id"],
         unique=False,
     )
@@ -91,8 +91,8 @@ def upgrade():
         sa.Column("licensed_item_id", sa.String(), nullable=False),
         sa.Column("name", sa.String(), nullable=False),
         sa.Column(
-            "license_resource_type",
-            sa.Enum("VIP_MODEL", name="licenseresourcetype"),
+            "licensed_resource_type",
+            sa.Enum("VIP_MODEL", name="licensedresourcetype"),
             nullable=False,
         ),
         sa.Column("pricing_plan_id", sa.BigInteger(), nullable=False),
@@ -132,9 +132,9 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table("licensed_items")
     op.drop_index(
-        op.f("ix_resource_tracker_license_checkouts_wallet_id"),
-        table_name="resource_tracker_license_checkouts",
+        op.f("ix_resource_tracker_licensed_items_usage_wallet_id"),
+        table_name="resource_tracker_licensed_items_usage",
     )
-    op.drop_table("resource_tracker_license_checkouts")
-    op.drop_table("resource_tracker_license_purchases")
+    op.drop_table("resource_tracker_licensed_items_usage")
+    op.drop_table("resource_tracker_licensed_items_purchases")
     # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_license_purchases.py renamed to packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_licensed_items_purchases.py

@@ -13,11 +13,11 @@ def _custom_id_generator():
     return f"rlp_{shortuuid.uuid()}"
 
 
-resource_tracker_license_purchases = sa.Table(
-    "resource_tracker_license_purchases",
+resource_tracker_licensed_items_purchases = sa.Table(
+    "resource_tracker_licensed_items_purchases",
     metadata,
     sa.Column(
-        "license_purchase_id",
+        "licensed_item_purchase_id",
         sa.String,
         nullable=False,
         primary_key=True,

packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_license_checkouts.py renamed to packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_licensed_items_usage.py

@@ -12,18 +12,18 @@ def _custom_id_generator():
     return f"rlc_{shortuuid.uuid()}"
 
 
-resource_tracker_license_checkouts = sa.Table(
-    "resource_tracker_license_checkouts",
+resource_tracker_licensed_items_usage = sa.Table(
+    "resource_tracker_licensed_items_usage",
     metadata,
     sa.Column(
-        "license_checkout_id",
+        "licensed_item_usage_id",
         sa.String,
         nullable=False,
         primary_key=True,
         default=_custom_id_generator,
     ),
     sa.Column(
-        "license_package_id",
+        "licensed_item_id",
         sa.String,
         nullable=True,
     ),
@@ -79,13 +79,3 @@ def _custom_id_generator():
         ondelete=RefActions.RESTRICT,
     ),
 )
-
-# We define the partial index
-# sa.Index(
-#     "ix_resource_tracker_credit_transactions_status_running",
-#     resource_tracker_service_runs.c.service_run_status,
-#     postgresql_where=(
-#         resource_tracker_service_runs.c.service_run_status
-#         == ResourceTrackerServiceRunStatus.RUNNING
-#     ),
-# )

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -2418,6 +2418,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/EnvelopedError'
           description: Not Found
+  /v0/catalog/licensed-items/{licensed_item_id}:purchase:
     post:
       tags:
       - licenses