fix

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/e98c45ff314f_preparation_for_osparc_io_migration.py renamed to packages/postgres-database/src/simcore_postgres_database/migration/versions/43d7e61eedf4_preparation_for_osparc_io_migration.py

@@ -1,8 +1,8 @@
 """preparation for osparc.io migration
 
-Revision ID: e98c45ff314f
+Revision ID: 43d7e61eedf4
 Revises: b39f2dc87ccd
-Create Date: 2025-05-19 11:55:04.513120+00:00
+Create Date: 2025-05-19 12:27:17.367971+00:00
 
 """
 
@@ -11,7 +11,7 @@
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "e98c45ff314f"
+revision = "43d7e61eedf4"
 down_revision = "b39f2dc87ccd"
 branch_labels = None
 depends_on = None
@@ -20,7 +20,7 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "resource_tracker_service_runs__osparc_io_history_202508",
+        "zzz_resource_tracker_service_runs__osparc_io_archive_202508",
         sa.Column("product_name", sa.String(), nullable=False),
         sa.Column("service_run_id", sa.String(), nullable=False),
         sa.Column("wallet_id", sa.BigInteger(), nullable=True),
@@ -84,21 +84,25 @@ def upgrade():
         sa.PrimaryKeyConstraint("product_name", "service_run_id"),
     )
     op.create_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_wallet_id"),
-        "resource_tracker_service_runs__osparc_io_history_202508",
-        ["wallet_id"],
+        op.f(
+            "ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_started_at"
+        ),
+        "zzz_resource_tracker_service_runs__osparc_io_archive_202508",
+        ["started_at"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_user_id"),
-        "resource_tracker_service_runs__osparc_io_history_202508",
-        ["user_id"],
+        op.f(
+            "ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_wallet_id"
+        ),
+        "zzz_resource_tracker_service_runs__osparc_io_archive_202508",
+        ["wallet_id"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_started_at"),
-        "resource_tracker_service_runs__osparc_io_history_202508",
-        ["started_at"],
+        op.f("ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_user_id"),
+        "zzz_resource_tracker_service_runs__osparc_io_archive_202508",
+        ["user_id"],
         unique=False,
     )
     op.drop_index("ix_projects_comments_project_uuid", table_name="projects_comments")
@@ -133,20 +137,20 @@ def upgrade():
         ondelete="CASCADE",
     )
     op.create_foreign_key(
-        "fk_payments_methods_to_user_id",
+        "fk_payments_methods_to_wallet_id",
         "payments_methods",
-        "users",
-        ["user_id"],
-        ["id"],
+        "wallets",
+        ["wallet_id"],
+        ["wallet_id"],
         onupdate="CASCADE",
         ondelete="CASCADE",
     )
     op.create_foreign_key(
-        "fk_payments_methods_to_wallet_id",
+        "fk_payments_methods_to_user_id",
         "payments_methods",
-        "wallets",
-        ["wallet_id"],
-        ["wallet_id"],
+        "users",
+        ["user_id"],
+        ["id"],
         onupdate="CASCADE",
         ondelete="CASCADE",
     )
@@ -177,6 +181,24 @@ def upgrade():
         onupdate="CASCADE",
         ondelete="CASCADE",
     )
+    op.create_foreign_key(
+        "fk_service_runs_to_user_id",
+        "resource_tracker_service_runs",
+        "users",
+        ["user_id"],
+        ["id"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
+    op.create_foreign_key(
+        "fk_service_runs_to_product_name",
+        "resource_tracker_service_runs",
+        "products",
+        ["product_name"],
+        ["name"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
     op.drop_constraint("tokens_user_id_fkey", "tokens", type_="foreignkey")
     op.create_foreign_key(
         None,
@@ -194,6 +216,16 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint(None, "tokens", type_="foreignkey")
     op.create_foreign_key("tokens_user_id_fkey", "tokens", "users", ["user_id"], ["id"])
+    op.drop_constraint(
+        "fk_service_runs_to_product_name",
+        "resource_tracker_service_runs",
+        type_="foreignkey",
+    )
+    op.drop_constraint(
+        "fk_service_runs_to_user_id",
+        "resource_tracker_service_runs",
+        type_="foreignkey",
+    )
     op.drop_constraint(
         "fk_payments_transactions_to_products_name",
         "payments_transactions",
@@ -210,10 +242,10 @@ def downgrade():
         type_="foreignkey",
     )
     op.drop_constraint(
-        "fk_payments_methods_to_wallet_id", "payments_methods", type_="foreignkey"
+        "fk_payments_methods_to_user_id", "payments_methods", type_="foreignkey"
     )
     op.drop_constraint(
-        "fk_payments_methods_to_user_id", "payments_methods", type_="foreignkey"
+        "fk_payments_methods_to_wallet_id", "payments_methods", type_="foreignkey"
     )
     op.drop_constraint(
         "fk_payments_autorecharge_id_wallets",
@@ -283,16 +315,20 @@ def downgrade():
         unique=False,
     )
     op.drop_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_started_at"),
-        table_name="resource_tracker_service_runs__osparc_io_history_202508",
+        op.f("ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_user_id"),
+        table_name="zzz_resource_tracker_service_runs__osparc_io_archive_202508",
     )
     op.drop_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_user_id"),
-        table_name="resource_tracker_service_runs__osparc_io_history_202508",
+        op.f(
+            "ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_wallet_id"
+        ),
+        table_name="zzz_resource_tracker_service_runs__osparc_io_archive_202508",
     )
     op.drop_index(
-        op.f("ix_resource_tracker_service_runs__osparc_io_history_202508_wallet_id"),
-        table_name="resource_tracker_service_runs__osparc_io_history_202508",
+        op.f(
+            "ix_zzz_resource_tracker_service_runs__osparc_io_archive_202508_started_at"
+        ),
+        table_name="zzz_resource_tracker_service_runs__osparc_io_archive_202508",
     )
-    op.drop_table("resource_tracker_service_runs__osparc_io_history_202508")
+    op.drop_table("zzz_resource_tracker_service_runs__osparc_io_archive_202508")
     # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_service_runs.py

@@ -1,12 +1,13 @@
-""" resource_tracker_service_runs table
-"""
+"""resource_tracker_service_runs table"""
+
 import enum
 
 import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import JSONB
 
-from ._common import NUMERIC_KWARGS, column_modified_datetime
+from ._common import NUMERIC_KWARGS, RefActions, column_modified_datetime
 from .base import metadata
+from .users import users
 
 
 class ResourceTrackerServiceType(str, enum.Enum):
@@ -25,7 +26,17 @@ class ResourceTrackerServiceRunStatus(str, enum.Enum):
     metadata,
     # Primary keys
     sa.Column(
-        "product_name", sa.String, nullable=False, doc="Product name", primary_key=True
+        "product_name",
+        sa.String,
+        sa.ForeignKey(
+            "products.name",
+            onupdate=RefActions.CASCADE,
+            ondelete=RefActions.CASCADE,
+            name="fk_service_runs_to_product_name",
+        ),
+        nullable=False,
+        doc="Product name",
+        primary_key=True,
     ),
     sa.Column(
         "service_run_id",
@@ -84,6 +95,12 @@ class ResourceTrackerServiceRunStatus(str, enum.Enum):
     sa.Column(
         "user_id",
         sa.BigInteger,
+        sa.ForeignKey(
+            users.c.id,
+            onupdate=RefActions.CASCADE,
+            ondelete=RefActions.CASCADE,
+            name="fk_service_runs_to_user_id",
+        ),
         nullable=False,
         doc="We want to store the user id for tracking/billing purposes and be sure it stays there even when the user is deleted (that's also reason why we do not introduce foreign key)",
         index=True,

packages/postgres-database/src/simcore_postgres_database/models/resource_tracker_service_runs__osparc_io_history_202508.py

@@ -20,8 +20,8 @@ class ResourceTrackerServiceRunStatusOsparcIoHistory(str, enum.Enum):
     ERROR = "ERROR"
 
 
-resource_tracker_service_runs__osparc_io_history_202508 = sa.Table(
-    "resource_tracker_service_runs__osparc_io_history_202508",
+zzz_resource_tracker_service_runs__osparc_io_archive_202508 = sa.Table(
+    "zzz_resource_tracker_service_runs__osparc_io_archive_202508",
     metadata,
     # Primary keys
     sa.Column(