fix

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/f4c938f80040_preparation_for_osparc_io_migration.py renamed to packages/postgres-database/src/simcore_postgres_database/migration/versions/47dc5c0a138e_preparation_for_osparc_io_migration.py

@@ -1,8 +1,8 @@
 """preparation for osparc.io migration
 
-Revision ID: f4c938f80040
+Revision ID: 47dc5c0a138e
 Revises: b39f2dc87ccd
-Create Date: 2025-05-19 14:30:09.366828+00:00
+Create Date: 2025-05-19 14:55:15.889813+00:00
 
 """
 
@@ -11,7 +11,7 @@
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "f4c938f80040"
+revision = "47dc5c0a138e"
 down_revision = "b39f2dc87ccd"
 branch_labels = None
 depends_on = None
@@ -109,7 +109,7 @@ def upgrade():
     op.drop_table("projects_comments")
     op.drop_constraint("api_keys_user_id_fkey", "api_keys", type_="foreignkey")
     op.create_foreign_key(
-        None,
+        "fk_api_keys_to_user_id",
         "api_keys",
         "users",
         ["user_id"],
@@ -128,17 +128,8 @@ def upgrade():
         ondelete="CASCADE",
     )
     op.drop_column("file_meta_data", "node_id")
-    op.drop_constraint("fk_new_folders_to_groups_gid", "folders_v2", type_="foreignkey")
     op.drop_constraint("fk_new_folders_to_folders_id", "folders_v2", type_="foreignkey")
-    op.create_foreign_key(
-        "fk_new_folders_to_groups_gid",
-        "folders_v2",
-        "groups",
-        ["created_by_gid"],
-        ["gid"],
-        onupdate="CASCADE",
-        ondelete="SET NULL",
-    )
+    op.drop_constraint("fk_new_folders_to_groups_gid", "folders_v2", type_="foreignkey")
     op.create_foreign_key(
         "fk_new_folders_to_folders_id",
         "folders_v2",
@@ -148,17 +139,17 @@ def upgrade():
         onupdate="CASCADE",
     )
     op.create_foreign_key(
-        "fk_payments_autorecharge_id_wallets",
-        "payments_autorecharge",
-        "wallets",
-        ["wallet_id"],
-        ["wallet_id"],
+        "fk_new_folders_to_groups_gid",
+        "folders_v2",
+        "groups",
+        ["created_by_gid"],
+        ["gid"],
         onupdate="CASCADE",
-        ondelete="CASCADE",
+        ondelete="SET NULL",
     )
     op.create_foreign_key(
-        "fk_payments_methods_to_wallet_id",
-        "payments_methods",
+        "fk_payments_autorecharge_id_wallets",
+        "payments_autorecharge",
         "wallets",
         ["wallet_id"],
         ["wallet_id"],
@@ -175,8 +166,8 @@ def upgrade():
         ondelete="CASCADE",
     )
     op.create_foreign_key(
-        "fk_payments_transactions_to_wallet_id",
-        "payments_transactions",
+        "fk_payments_methods_to_wallet_id",
+        "payments_methods",
         "wallets",
         ["wallet_id"],
         ["wallet_id"],
@@ -201,6 +192,15 @@ def upgrade():
         onupdate="CASCADE",
         ondelete="CASCADE",
     )
+    op.create_foreign_key(
+        "fk_payments_transactions_to_wallet_id",
+        "payments_transactions",
+        "wallets",
+        ["wallet_id"],
+        ["wallet_id"],
+        onupdate="CASCADE",
+        ondelete="CASCADE",
+    )
     op.create_foreign_key(
         "fk_service_runs_to_product_name",
         "resource_tracker_service_runs",
@@ -212,7 +212,7 @@ def upgrade():
     )
     op.drop_constraint("tokens_user_id_fkey", "tokens", type_="foreignkey")
     op.create_foreign_key(
-        None,
+        "fk_tokens_to_user_id",
         "tokens",
         "users",
         ["user_id"],
@@ -225,48 +225,41 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(None, "tokens", type_="foreignkey")
+    op.drop_constraint("fk_tokens_to_user_id", "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_payments_transactions_to_user_id",
+        "fk_payments_transactions_to_wallet_id",
         "payments_transactions",
         type_="foreignkey",
     )
     op.drop_constraint(
-        "fk_payments_transactions_to_products_name",
+        "fk_payments_transactions_to_user_id",
         "payments_transactions",
         type_="foreignkey",
     )
     op.drop_constraint(
-        "fk_payments_transactions_to_wallet_id",
+        "fk_payments_transactions_to_products_name",
         "payments_transactions",
         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_methods_to_wallet_id", "payments_methods", type_="foreignkey"
+        "fk_payments_methods_to_user_id", "payments_methods", type_="foreignkey"
     )
     op.drop_constraint(
         "fk_payments_autorecharge_id_wallets",
         "payments_autorecharge",
         type_="foreignkey",
     )
-    op.drop_constraint("fk_new_folders_to_folders_id", "folders_v2", type_="foreignkey")
     op.drop_constraint("fk_new_folders_to_groups_gid", "folders_v2", type_="foreignkey")
-    op.create_foreign_key(
-        "fk_new_folders_to_folders_id",
-        "folders_v2",
-        "folders_v2",
-        ["parent_folder_id"],
-        ["folder_id"],
-    )
+    op.drop_constraint("fk_new_folders_to_folders_id", "folders_v2", type_="foreignkey")
     op.create_foreign_key(
         "fk_new_folders_to_groups_gid",
         "folders_v2",
@@ -275,6 +268,13 @@ def downgrade():
         ["gid"],
         ondelete="SET NULL",
     )
+    op.create_foreign_key(
+        "fk_new_folders_to_folders_id",
+        "folders_v2",
+        "folders_v2",
+        ["parent_folder_id"],
+        ["folder_id"],
+    )
     op.add_column(
         "file_meta_data",
         sa.Column("node_id", sa.VARCHAR(), autoincrement=False, nullable=True),
@@ -288,7 +288,7 @@ def downgrade():
         ["id"],
         ondelete="CASCADE",
     )
-    op.drop_constraint(None, "api_keys", type_="foreignkey")
+    op.drop_constraint("fk_api_keys_to_user_id", "api_keys", type_="foreignkey")
     op.create_foreign_key(
         "api_keys_user_id_fkey",
         "api_keys",

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

@@ -38,7 +38,10 @@
         "user_id",
         sa.BigInteger(),
         sa.ForeignKey(
-            users.c.id, ondelete=RefActions.CASCADE, onupdate=RefActions.CASCADE
+            users.c.id,
+            ondelete=RefActions.CASCADE,
+            onupdate=RefActions.CASCADE,
+            name="fk_api_keys_to_user_id",
         ),
         nullable=False,
         doc="Identified user",

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

@@ -15,7 +15,10 @@
         "user_id",
         sa.BigInteger,
         sa.ForeignKey(
-            users.c.id, onupdate=RefActions.CASCADE, ondelete=RefActions.CASCADE
+            users.c.id,
+            onupdate=RefActions.CASCADE,
+            ondelete=RefActions.CASCADE,
+            name="fk_tokens_to_user_id",
         ),
         nullable=False,
     ),