new cols

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/migration/versions/17eea8ba5d4f_new_trashed_colums.py

@@ -0,0 +1,73 @@
+"""project and folder trash columns
+
+Revision ID: 5ad02358751a
+Revises: fce5d231e16d
+Create Date: 2024-11-07 17:14:01.094583+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "5ad02358751a"
+down_revision = "fce5d231e16d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "folders_v2",
+        sa.Column(
+            "trashed_at",
+            sa.DateTime(timezone=True),
+            nullable=True,
+            comment="The date and time when the folder was marked as trashed.Null if the folder has not been trashed [default].",
+        ),
+    )
+    op.add_column(
+        "folders_v2",
+        sa.Column(
+            "trashed_explicitly",
+            sa.Boolean(),
+            server_default=sa.text("false"),
+            nullable=False,
+            comment="Indicates whether the folder was explicitly trashed by the user (true) or inherited its trashed status from a parent (false) [default].",
+        ),
+    )
+    op.add_column(
+        "projects",
+        sa.Column(
+            "trashed_explicitly",
+            sa.Boolean(),
+            server_default=sa.text("false"),
+            nullable=False,
+            comment="Indicates whether the project was explicitly trashed by the user (true) or inherited its trashed status from a parent (false) [default].",
+        ),
+    )
+    op.alter_column(
+        "projects",
+        "trashed_at",
+        existing_type=postgresql.TIMESTAMP(timezone=True),
+        comment="The date and time when the project was marked as trashed. Null if the project has not been trashed [default].",
+        existing_nullable=True,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "projects",
+        "trashed_at",
+        existing_type=postgresql.TIMESTAMP(timezone=True),
+        comment=None,
+        existing_comment="The date and time when the project was marked as trashed. Null if the project has not been trashed [default].",
+        existing_nullable=True,
+    )
+    op.drop_column("projects", "trashed_explicitly")
+    op.drop_column("folders_v2", "trashed_explicitly")
+    op.drop_column("folders_v2", "trashed_at")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/migration/versions/5ad02358751a_project_and_folder_trash_columns.py

@@ -79,13 +79,15 @@
         "trashed_at",
         sa.DateTime(timezone=True),
         nullable=True,
-        doc="The date and time when the folder was marked as trashed. Null if the folder has not been trashed.",
+        comment="The date and time when the folder was marked as trashed."
+        "Null if the folder has not been trashed [default].",
     ),
     sa.Column(
         "trashed_explicitly",
         sa.Boolean,
         nullable=False,
         server_default=expression.false(),
-        doc="Indicates whether the folder was explicitly trashed by the user (true) or inherited its trashed status from a parent (false).",
+        comment="Indicates whether the folder was explicitly trashed by the user (true)"
+        " or inherited its trashed status from a parent (false) [default].",
     ),
 )

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

@@ -5,7 +5,7 @@
 
 import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import ARRAY, JSONB
-from sqlalchemy.sql import func
+from sqlalchemy.sql import expression, func
 
 from .base import metadata
 
@@ -145,8 +145,16 @@ class ProjectType(enum.Enum):
         "trashed_at",
         sa.DateTime(timezone=True),
         nullable=True,
-        doc="The date and time when the project was marked as trashed. Null if the project has not been trashed."
-        "When a project is implicitly trashed (e.g. a parent is trashed) then it also has hidden=True",
+        comment="The date and time when the project was marked as trashed. "
+        "Null if the project has not been trashed [default].",
+    ),
+    sa.Column(
+        "trashed_explicitly",
+        sa.Boolean,
+        nullable=False,
+        server_default=expression.false(),
+        comment="Indicates whether the project was explicitly trashed by the user (true)"
+        " or inherited its trashed status from a parent (false) [default].",
     ),
     sa.Column(
         "workspace_id",