adding migration & renaming column

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/61e798889f2f_enhance_projects_tags_for_rut.py renamed to packages/postgres-database/src/simcore_postgres_database/migration/versions/8e1f83486be7_enhance_projects_tags_for_rut.py

@@ -1,15 +1,15 @@
 """enhance projects_tags for RUT
 
-Revision ID: 61e798889f2f
+Revision ID: 8e1f83486be7
 Revises: 8bfe65a5e294
-Create Date: 2024-11-14 14:36:14.377526+00:00
+Create Date: 2024-11-15 09:12:57.789183+00:00
 
 """
 import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = "61e798889f2f"
+revision = "8e1f83486be7"
 down_revision = "8bfe65a5e294"
 branch_labels = None
 depends_on = None
@@ -18,7 +18,26 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column(
-        "projects_tags", sa.Column("project_uuid", sa.String(), nullable=False)
+        "projects_tags", sa.Column("project_uuid_for_rut", sa.String(), nullable=True)
+    )
+
+    # Migrate
+    op.execute(
+        sa.DDL(
+            """
+                UPDATE project_tags
+                SET project_uuid_for_rut = project.uuid
+                FROM project
+                WHERE project_tags.project_id = project.id;
+            """
+        )
+    )
+
+    op.alter_column(
+        "projects_tags",
+        "project_uuid_for_rut",
+        existing_type=sa.String(),
+        nullable=False,
     )
     op.alter_column(
         "projects_tags", "project_id", existing_type=sa.BIGINT(), nullable=True
@@ -27,7 +46,9 @@ def upgrade():
         "study_tags_study_id_tag_id_key", "projects_tags", type_="unique"
     )
     op.create_unique_constraint(
-        "project_tags_project_uuid_unique", "projects_tags", ["project_uuid", "tag_id"]
+        "project_tags_project_uuid_unique",
+        "projects_tags",
+        ["project_uuid_for_rut", "tag_id"],
     )
     op.drop_constraint("study_tags_study_id_fkey", "projects_tags", type_="foreignkey")
     op.create_foreign_key(
@@ -65,5 +86,5 @@ def downgrade():
     op.alter_column(
         "projects_tags", "project_id", existing_type=sa.BIGINT(), nullable=False
     )
-    op.drop_column("projects_tags", "project_uuid")
+    op.drop_column("projects_tags", "project_uuid_for_rut")
     # ### end Alembic commands ###

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

@@ -20,7 +20,7 @@
             name="project_tags_project_id_fkey",
         ),
         nullable=True,  # <-- NULL means that project was deleted
-        doc="NOTE that project.c.id != project.c.uuid",
+        doc="NOTE that project.c.id != project.c.uuid. If project is deleted, we do not delete project in this table, we just set this column to NULL. Why? Because the `project_uuid_for_rut` is still used by resource usage tracker",
     ),
     sa.Column(
         "tag_id",
@@ -29,11 +29,11 @@
         nullable=False,
     ),
     sa.Column(
-        "project_uuid",
+        "project_uuid_for_rut",
         sa.String,
         nullable=False,
     ),
     sa.UniqueConstraint(
-        "project_uuid", "tag_id", name="project_tags_project_uuid_unique"
+        "project_uuid_for_rut", "tag_id", name="project_tags_project_uuid_unique"
     ),
 )

packages/postgres-database/src/simcore_postgres_database/utils_tags_sql.py

@@ -1,4 +1,5 @@
 import functools
+from uuid import UUID
 
 import sqlalchemy as sa
 from simcore_postgres_database.models.groups import user_to_groups
@@ -60,7 +61,7 @@ def get_tag_stmt(
             # aggregation ensures MOST PERMISSIVE policy of access-rights
             sa.func.bool_or(tags_access_rights.c.read).label("read"),
             sa.func.bool_or(tags_access_rights.c.write).label("write"),
-            sa.func.bool_or(tags_access_rights.c.delete).label("delete")
+            sa.func.bool_or(tags_access_rights.c.delete).label("delete"),
         )
         .select_from(
             _join_user_to_given_tag(
@@ -80,7 +81,7 @@ def list_tags_stmt(*, user_id: int):
             # aggregation ensures MOST PERMISSIVE policy of access-rights
             sa.func.bool_or(tags_access_rights.c.read).label("read"),
             sa.func.bool_or(tags_access_rights.c.write).label("write"),
-            sa.func.bool_or(tags_access_rights.c.delete).label("delete")
+            sa.func.bool_or(tags_access_rights.c.delete).label("delete"),
         )
         .select_from(
             _join_user_to_tags(
@@ -104,7 +105,7 @@ def count_groups_with_given_access_rights_stmt(
     tag_id: int,
     read: bool | None,
     write: bool | None,
-    delete: bool | None
+    delete: bool | None,
 ):
     """
     How many groups (from this user_id) are given EXACTLY these access permissions
@@ -192,12 +193,15 @@ def get_tags_for_project_stmt(*, project_index: int):
     )
 
 
-def add_tag_to_project_stmt(*, project_index: int, tag_id: int):
+def add_tag_to_project_stmt(
+    *, project_index: int, tag_id: int, project_uuid_for_rut: UUID
+):
     return (
         pg_insert(projects_tags)
         .values(
             project_id=project_index,
             tag_id=tag_id,
+            project_uuid_for_rut=f"{project_uuid_for_rut}",
         )
         .on_conflict_do_nothing()
     )

packages/postgres-database/tests/test_utils_tags.py

@@ -668,6 +668,7 @@ def _check(func_smt, **kwargs):
     user_id = 425  # 4
     tag_id = 4
     project_index = 1
+    project_uuid = "106f8b4b-ffb6-459a-a27b-981c779e6d3f"
     service_key = "simcore/services/comp/isolve"
     service_version = "2.0.85"
 
@@ -726,6 +727,7 @@ def _check(func_smt, **kwargs):
         add_tag_to_project_stmt,
         project_index=project_index,
         tag_id=tag_id,
+        project_uuid_for_rut=project_uuid,
     )
 
     _check(

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

@@ -216,11 +216,11 @@ async def get_service_run_by_id(
 
     _project_tags_subquery = (
         sa.select(
-            projects_tags.c.project_uuid,
+            projects_tags.c.project_uuid_for_rut,
             sa.func.array_agg(tags.c.name).label("project_tags"),
         )
         .select_from(projects_tags.join(tags, projects_tags.c.tag_id == tags.c.id))
-        .group_by(projects_tags.c.project_uuid)
+        .group_by(projects_tags.c.project_uuid_for_rut)
     ).subquery("project_tags_subquery")
 
     async def list_service_runs_by_product_and_user_and_wallet(
@@ -291,7 +291,7 @@ async def list_service_runs_by_product_and_user_and_wallet(
                     ).join(
                         self._project_tags_subquery,
                         resource_tracker_service_runs.c.project_id
-                        == self._project_tags_subquery.c.project_uuid,
+                        == self._project_tags_subquery.c.project_uuid_for_rut,
                         isouter=True,
                     )
                 )
@@ -481,7 +481,7 @@ async def export_service_runs_table_to_s3(
                     ).join(
                         self._project_tags_subquery,
                         resource_tracker_service_runs.c.project_id
-                        == self._project_tags_subquery.c.project_uuid,
+                        == self._project_tags_subquery.c.project_uuid_for_rut,
                         isouter=True,
                     )
                 )

services/web/server/src/simcore_service_webserver/projects/db.py

@@ -403,7 +403,9 @@ async def list_projects(  # pylint: disable=too-many-arguments,too-many-statemen
                 sa.select(
                     projects_tags.c.project_id,
                     sa.func.array_agg(projects_tags.c.tag_id).label("tags"),
-                ).group_by(projects_tags.c.project_id)
+                )
+                .where(projects_tags.c.project_id.is_not(None))
+                .group_by(projects_tags.c.project_id)
             ).subquery("project_tags_subquery")
 
             ###
@@ -1218,6 +1220,7 @@ async def add_tag(
                     projects_tags.insert().values(
                         project_id=project["id"],
                         tag_id=tag_id,
+                        project_uuid_for_rut=project["uuid"],
                     )
                 )
                 project_tags.append(tag_id)