storage_data_deleted -> storage_assets_deleted

Author: bisgaard-itis

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

@@ -29,10 +29,10 @@
         "the parent resource name is shelves/shelf1.",
     ),
     sa.Column(
-        "storage_data_deleted",
+        "storage_assets_deleted",
         sa.Boolean,
         nullable=False,
-        doc="Indicates whether the job's S3 data has been actively deleted.",
+        doc="Indicates whether the job's S3 assets have been actively deleted.",
     ),
     # Composite key (project_uuid, job_parent_resource_name) uniquely identifies very row
     sa.UniqueConstraint(

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -43,14 +43,14 @@ async def mark_project_as_job(
         user_id: UserID,
         project_uuid: ProjectID,
         job_parent_resource_name: str,
-        storage_data_deleted: bool,
+        storage_assets_deleted: bool,
     ) -> None:
         assert rpc_client
 
         assert not job_parent_resource_name.startswith("/")  # nosec
         assert "/" in job_parent_resource_name  # nosec
         assert not job_parent_resource_name.endswith("/")  # nosec
-        assert isinstance(storage_data_deleted, bool)
+        assert isinstance(storage_assets_deleted, bool)
 
         assert product_name
         assert user_id

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -33,7 +33,7 @@ async def mark_project_as_job(
     user_id: UserID,
     project_uuid: ProjectID,
     job_parent_resource_name: str,
-    storage_data_deleted: bool,
+    storage_assets_deleted: bool,
 ) -> None:
 
     result = await rpc_client.request(
@@ -43,7 +43,7 @@ async def mark_project_as_job(
         user_id=user_id,
         project_uuid=project_uuid,
         job_parent_resource_name=job_parent_resource_name,
-        storage_data_deleted=storage_data_deleted,
+        storage_assets_deleted=storage_assets_deleted,
     )
     assert result is None
 

services/api-server/src/simcore_service_api_server/_service_jobs.py

@@ -145,7 +145,7 @@ async def create_job(
                 user_id=self.user_id,
                 project_uuid=new_project.uuid,
                 job_parent_resource_name=pre_job.runner_name,
-                storage_data_deleted=False,
+                storage_assets_deleted=False,
             )
 
         assert new_project  # nosec
@@ -203,5 +203,5 @@ async def delete_job_assets(
             user_id=self.user_id,
             project_uuid=job_id,
             job_parent_resource_name=job_parent_resource_name,
-            storage_data_deleted=True,
+            storage_assets_deleted=True,
         )

services/api-server/src/simcore_service_api_server/api/routes/studies_jobs.py

@@ -164,7 +164,7 @@ async def create_study_job(
         user_id=user_id,
         project_uuid=job.id,
         job_parent_resource_name=job.runner_name,
-        storage_data_deleted=False,
+        storage_assets_deleted=False,
     )
 
     project_inputs = await webserver_api.get_project_inputs(project_id=project.uuid)

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -249,15 +249,15 @@ async def mark_project_as_job(
         user_id: UserID,
         project_uuid: ProjectID,
         job_parent_resource_name: RelativeResourceName,
-        storage_data_deleted: bool,
+        storage_assets_deleted: bool,
     ):
         await projects_rpc.mark_project_as_job(
             rpc_client=self._client,
             product_name=product_name,
             user_id=user_id,
             project_uuid=project_uuid,
             job_parent_resource_name=job_parent_resource_name,
-            storage_data_deleted=storage_data_deleted,
+            storage_assets_deleted=storage_assets_deleted,
         )
 
     @_exception_mapper(

services/api-server/tests/unit/test_api_solver_jobs.py

@@ -364,7 +364,7 @@ async def test_start_solver_job_conflict(
                 job_parent_resource_name="studies/96642f2a-a72c-11ef-8776-02420a00087d",
                 storage_assets_deleted=True,
             ),
-            id="storage_data_deleted",
+            id="storage_assets_deleted",
         )
     ],
 )

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -38,7 +38,7 @@ async def mark_project_as_job(
     user_id: UserID,
     project_uuid: ProjectID,
     job_parent_resource_name: str,
-    storage_data_deleted: bool,
+    storage_assets_deleted: bool,
 ) -> None:
 
     try:
@@ -49,7 +49,7 @@ async def mark_project_as_job(
             user_id=user_id,
             project_uuid=project_uuid,
             job_parent_resource_name=job_parent_resource_name,
-            storage_data_deleted=storage_data_deleted,
+            storage_assets_deleted=storage_assets_deleted,
         )
     except ProjectInvalidRightsError as err:
         raise ProjectForbiddenRpcError.from_domain_error(err) from err
@@ -99,7 +99,7 @@ async def list_projects_marked_as_jobs(
             created_at=project.creation_date,
             modified_at=project.last_change_date,
             job_parent_resource_name=project.job_parent_resource_name,
-            storage_assets_deleted=project.storage_data_deleted,
+            storage_assets_deleted=project.storage_assets_deleted,
         )
         for project in projects
     ]
@@ -153,7 +153,7 @@ async def get_project_marked_as_job(
         created_at=project.creation_date,
         modified_at=project.last_change_date,
         job_parent_resource_name=project.job_parent_resource_name,
-        storage_assets_deleted=project.storage_data_deleted,
+        storage_assets_deleted=project.storage_assets_deleted,
     )
 
 

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

@@ -32,7 +32,7 @@ async def set_project_as_job(
     job_parent_resource_name: Annotated[
         str, AfterValidator(_validate_job_parent_resource_name)
     ],
-    storage_data_deleted: bool,
+    storage_assets_deleted: bool,
 ) -> None:
 
     await check_user_project_permission(
@@ -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_assets_deleted=storage_data_deleted,
+        storage_assets_deleted=storage_assets_deleted,
     )
 
 

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

@@ -81,7 +81,7 @@ class ProjectJobDBGet(ProjectDBGet):
     workbench: NodesDict
 
     job_parent_resource_name: str
-    storage_data_deleted: bool
+    storage_assets_deleted: bool
 
 
 class ProjectWithTrashExtra(ProjectDBGet):