Revert "only require project_uuid to get project_marked as job"

This reverts commit 6cecc0f.

Author: bisgaard-itis

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

@@ -128,6 +128,7 @@ async def get_project_marked_as_job(
     product_name: ProductName,
     user_id: UserID,
     project_uuid: ProjectID,
+    job_parent_resource_name: str,
 ) -> ProjectJobRpcGet:
 
     try:
@@ -136,6 +137,7 @@ async def get_project_marked_as_job(
             product_name=product_name,
             user_id=user_id,
             project_uuid=project_uuid,
+            job_parent_resource_name=job_parent_resource_name,
         )
     except ProjectInvalidRightsError as err:
         raise ProjectForbiddenRpcError.from_domain_error(err) from err

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

@@ -213,6 +213,7 @@ async def get_project_marked_as_job(
         connection: AsyncConnection | None = None,
         *,
         project_uuid: ProjectID,
+        job_parent_resource_name: str,
     ) -> ProjectJobDBGet | None:
         """
         Returns the project associated with the given project_uuid and job_parent_resource_name
@@ -232,6 +233,7 @@ async def get_project_marked_as_job(
             )
             .where(
                 projects_to_jobs.c.project_uuid == f"{project_uuid}",
+                projects_to_jobs.c.job_parent_resource_name == job_parent_resource_name,
                 projects.c.workspace_id.is_(None),
             )
             .limit(1)

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

@@ -91,6 +91,9 @@ async def get_project_marked_as_job(
     product_name: ProductName,
     user_id: UserID,
     project_uuid: ProjectID,
+    job_parent_resource_name: Annotated[
+        str, AfterValidator(_validate_job_parent_resource_name)
+    ],
 ) -> ProjectJobDBGet:
     """
     Retrieves the project associated with the given project_uuid and job_parent_resource_name.
@@ -107,6 +110,7 @@ async def get_project_marked_as_job(
     repo = ProjectJobsRepository.create_from_app(app)
     project_id = await repo.get_project_marked_as_job(
         project_uuid=project_uuid,
+        job_parent_resource_name=job_parent_resource_name,
     )
     if not project_id:
         raise ProjectNotFoundError(

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -341,6 +341,7 @@ async def test_rpc_client_get_project_marked_as_job_found(
         product_name=product_name,
         user_id=user_id,
         project_uuid=project_uuid,
+        job_parent_resource_name=job_parent_resource_name,
     )
     assert project_job.uuid == project_uuid
     assert project_job.job_parent_resource_name == job_parent_resource_name
@@ -359,6 +360,7 @@ async def test_rpc_client_get_project_marked_as_job_not_found(
 
     project_uuid = ProjectID(user_project["uuid"])
     user_id = logged_user["id"]
+    job_parent_resource_name = "solvers/solver123/version/1.2.3"
 
     # Do NOT mark the project as a job, so it should not be found
     with pytest.raises(ProjectNotFoundRpcError):
@@ -367,6 +369,7 @@ async def test_rpc_client_get_project_marked_as_job_not_found(
             product_name=product_name,
             user_id=user_id,
             project_uuid=project_uuid,
+            job_parent_resource_name=job_parent_resource_name,
         )
 
 
@@ -400,6 +403,7 @@ async def test_rpc_client_get_project_marked_as_job_forbidden(
             product_name=product_name,
             user_id=other_user["id"],
             project_uuid=project_uuid,
+            job_parent_resource_name=job_parent_resource_name,
         )
 
 
@@ -433,6 +437,7 @@ async def test_mark_and_get_project_job_storage_data_deleted(
         product_name=product_name,
         user_id=user_id,
         project_uuid=project_uuid,
+        job_parent_resource_name=job_parent_resource_name,
     )
     assert project_job.storage_data_deleted is True
 
@@ -452,5 +457,6 @@ async def test_mark_and_get_project_job_storage_data_deleted(
         product_name=product_name,
         user_id=user_id,
         project_uuid=project_uuid,
+        job_parent_resource_name=job_parent_resource_name,
     )
     assert project_job.storage_data_deleted is False