add method for getting job which also checks parent resource

Author: bisgaard-itis

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

@@ -17,11 +17,13 @@
     PageMetaInfoLimitOffset,
     PageOffsetInt,
 )
+from models_library.rpc.webserver.projects import ProjectJobRpcGet
 from models_library.rpc_pagination import PageLimitInt
 from models_library.users import UserID
 from pydantic import HttpUrl
 from servicelib.logging_utils import log_context
 
+from .models.api_resources import RelativeResourceName
 from .models.basic_types import NameValueTuple
 from .models.schemas.jobs import Job, JobID, JobInputs
 from .models.schemas.programs import Program
@@ -175,20 +177,31 @@ async def start_log_export(
         )
         return async_job_get
 
+    async def get_job(
+        self, job_parent_resource_name: RelativeResourceName, job_id: JobID
+    ) -> ProjectJobRpcGet:
+        """This method can be used to check that the project exists and has the correct parent resource."""
+        return await self._web_rpc_client.get_project_marked_as_job(
+            product_name=self.product_name,
+            user_id=self.user_id,
+            project_uuid=job_id,
+            job_parent_resource_name=job_parent_resource_name,
+        )
+
     async def delete_job_assets(
-        self, solver_or_program: Solver | Program, project_id: ProjectID
+        self, job_parent_resource_name: RelativeResourceName, job_id: JobID
     ):
         """Marks job project as hidden and deletes S3 assets associated it"""
         await self._web_rest_client.patch_project(
-            project_id=project_id, patch_params=ProjectPatch(hidden=True)
+            project_id=job_id, patch_params=ProjectPatch(hidden=True)
         )
         await self._storage_rest_client.delete_project_s3_assets(
-            user_id=self.user_id, project_id=project_id
+            user_id=self.user_id, project_id=job_id
         )
         await self._web_rpc_client.mark_project_as_job(
             product_name=self.product_name,
             user_id=self.user_id,
-            project_uuid=project_id,
-            job_parent_resource_name=solver_or_program.name,
+            project_uuid=job_id,
+            job_parent_resource_name=job_parent_resource_name,
             storage_data_deleted=True,
         )

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

@@ -167,14 +167,17 @@ async def delete_job_assets(
     version: VersionStr,
     job_id: JobID,
     job_service: Annotated[JobService, Depends(get_job_service)],
-    solver_service: Annotated[SolverService, Depends(get_solver_service)],
 ):
-    solver = await solver_service.get_solver(
-        solver_key=solver_key,
-        solver_version=version,
+    job_parent_resource_name = compose_job_resource_name(solver_key, version, job_id)
+
+    # check that job exists and is accessible to user
+    project_job_rpc_get = await job_service.get_job(
+        job_parent_resource_name=job_parent_resource_name, job_id=job_id
     )
+    assert project_job_rpc_get.uuid == job_id  # nosec
+
     await job_service.delete_job_assets(
-        job_parent_resource_name=solver.name, project_id=job_id
+        job_parent_resource_name=job_parent_resource_name, job_id=job_id
     )
 
 

services/api-server/src/simcore_service_api_server/exceptions/backend_errors.py

@@ -57,6 +57,11 @@ class ServiceForbiddenAccessError(BaseBackEndError):
     status_code = status.HTTP_403_FORBIDDEN
 
 
+class JobForbiddenAccessError(BaseBackEndError):
+    msg_template = "Forbidden access to job {project_id}"
+    status_code = status.HTTP_403_FORBIDDEN
+
+
 class JobNotFoundError(BaseBackEndError):
     msg_template = "Could not get solver/study job {project_id}"
     status_code = status.HTTP_404_NOT_FOUND

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

@@ -63,6 +63,10 @@
     NotEnoughAvailableSeatsError,
 )
 from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
+from servicelib.rabbitmq.rpc_interfaces.webserver.errors import (
+    ProjectForbiddenRpcError,
+    ProjectNotFoundRpcError,
+)
 from servicelib.rabbitmq.rpc_interfaces.webserver.functions import (
     functions_rpc_interface,
 )
@@ -83,6 +87,8 @@
 from ..exceptions.backend_errors import (
     CanNotCheckoutServiceIsNotRunningError,
     InsufficientNumberOfSeatsError,
+    JobForbiddenAccessError,
+    JobNotFoundError,
     LicensedItemCheckoutNotFoundError,
 )
 from ..exceptions.service_errors_utils import service_exception_mapper
@@ -253,6 +259,28 @@ async def mark_project_as_job(
             storage_data_deleted=storage_data_deleted,
         )
 
+    @_exception_mapper(
+        rpc_exception_map={
+            ProjectForbiddenRpcError: JobForbiddenAccessError,
+            ProjectNotFoundRpcError: JobNotFoundError,
+        }
+    )
+    async def get_project_marked_as_job(
+        self,
+        *,
+        product_name: ProductName,
+        user_id: UserID,
+        project_uuid: ProjectID,
+        job_parent_resource_name: RelativeResourceName,
+    ):
+        return await projects_rpc.get_project_marked_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,
+        )
+
     async def list_projects_marked_as_jobs(
         self,
         *,