use consistent naming

Author: bisgaard-itis

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

@@ -20,14 +20,14 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.add_column(
         "projects_to_jobs",
-        sa.Column("storage_data_deleted", sa.Boolean(), nullable=True),
+        sa.Column("storage_assets_deleted", sa.Boolean(), nullable=True),
     )
 
-    op.execute("UPDATE projects_to_jobs SET storage_data_deleted = false")
+    op.execute("UPDATE projects_to_jobs SET storage_assets_deleted = false")
 
     op.alter_column(
         "projects_to_jobs",
-        "storage_data_deleted",
+        "storage_assets_deleted",
         existing_type=sa.BOOLEAN(),
         nullable=False,
     )
@@ -36,5 +36,5 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("projects_to_jobs", "storage_data_deleted")
+    op.drop_column("projects_to_jobs", "storage_assets_deleted")
     # ### end Alembic commands ###

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

@@ -67,21 +67,21 @@ async def set_project_as_job(
         *,
         project_uuid: ProjectID,
         job_parent_resource_name: str,
-        storage_data_deleted: bool,
+        storage_assets_deleted: bool,
     ) -> None:
         async with transaction_context(self.engine, connection) as conn:
             stmt = (
                 pg_insert(projects_to_jobs)
                 .values(
                     project_uuid=f"{project_uuid}",
                     job_parent_resource_name=job_parent_resource_name,
-                    storage_data_deleted=storage_data_deleted,
+                    storage_assets_deleted=storage_assets_deleted,
                 )
                 .on_conflict_do_update(
                     index_elements=["project_uuid", "job_parent_resource_name"],
                     set_={
                         "job_parent_resource_name": job_parent_resource_name,
-                        "storage_data_deleted": storage_data_deleted,
+                        "storage_assets_deleted": storage_assets_deleted,
                     },
                 )
             )
@@ -180,7 +180,7 @@ async def list_projects_marked_as_jobs(
                 *_PROJECT_DB_COLS,
                 projects.c.workbench,
                 base_query.c.job_parent_resource_name,
-                base_query.c.storage_data_deleted,
+                base_query.c.storage_assets_deleted,
             )
             .select_from(
                 base_query.join(
@@ -223,7 +223,7 @@ async def get_project_marked_as_job(
                 *_PROJECT_DB_COLS,
                 projects.c.workbench,
                 projects_to_jobs.c.job_parent_resource_name,
-                projects_to_jobs.c.storage_data_deleted,
+                projects_to_jobs.c.storage_assets_deleted,
             )
             .select_from(
                 projects_to_jobs.join(

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

@@ -48,7 +48,7 @@ async def set_project_as_job(
     await repo.set_project_as_job(
         project_uuid=project_uuid,
         job_parent_resource_name=job_parent_resource_name,
-        storage_data_deleted=storage_data_deleted,
+        storage_assets_deleted=storage_data_deleted,
     )