✨ Refactor ProjectJobsRepository to streamline database column selection and enhance test coverage for job-marked projects

Author: pcrespov

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

@@ -25,13 +25,10 @@
 _logger = logging.getLogger(__name__)
 
 
-_PROJECT_JOB_DB_COLS = [
-    *get_columns_from_db_model(
-        projects,
-        ProjectDBGet,
-    ),
-    projects_to_jobs.c.job_parent_resource_name,  # Add job_parent_resource_name
-]
+_PROJECT_DB_COLS = get_columns_from_db_model(
+    projects,
+    ProjectDBGet,
+)
 
 
 class ProjectJobsRepository(BaseRepository):
@@ -81,7 +78,7 @@ async def list_projects_marked_as_jobs(
 
         # Step 2: Create access_query to filter projects based on product_name and read access
         access_query = (
-            sa.select(projects_to_jobs.c.project_uuid)
+            sa.select(projects_to_jobs)
             .select_from(
                 projects_to_jobs.join(
                     projects_to_products,
@@ -115,7 +112,10 @@ async def list_projects_marked_as_jobs(
 
         # Step 4: Query to get the paginated list with full selection
         list_query = (
-            sa.select(*_PROJECT_JOB_DB_COLS)
+            sa.select(
+                *_PROJECT_DB_COLS,
+                base_query.c.job_parent_resource_name,
+            )
             .select_from(
                 base_query.join(
                     projects,

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

@@ -1,5 +1,8 @@
+import pytest
 from aiohttp.test_utils import TestClient
+from common_library.users_enums import UserRole
 from models_library.products import ProductName
+from models_library.projects import ProjectID
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from simcore_service_webserver.projects._jobs_service import (
     list_my_projects_marked_as_jobs,
@@ -8,6 +11,12 @@
 from simcore_service_webserver.projects.models import ProjectDict
 
 
+@pytest.fixture
+def user_role() -> UserRole:
+    # for logged_user
+    return UserRole.USER
+
+
 async def test_list_my_projects_marked_as_jobs_empty(
     client: TestClient,
     logged_user: UserInfoDict,  # owns `user_project`
@@ -30,14 +39,19 @@ async def test_list_my_projects_marked_as_jobs_with_one_marked(
     client: TestClient,
     logged_user: UserInfoDict,  # owns `user_project`
     user_project: ProjectDict,
+    user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     assert client.app
 
     user_id = logged_user["id"]
-    project_uuid = user_project["uuid"]
-    job_parent_resource_name = "test/resource"
+    project_uuid = ProjectID(user_project["uuid"])
+    other_user_id = user["id"]
+
+    assert user_id != other_user_id
+    assert user_project["prjOwner"] == logged_user["email"]  # owns `user_project`
 
+    job_parent_resource_name = "test/resource"
     await set_project_as_job(
         app=client.app,
         product_name=osparc_product_name,
@@ -46,6 +60,7 @@ async def test_list_my_projects_marked_as_jobs_with_one_marked(
         job_parent_resource_name=job_parent_resource_name,
     )
 
+    # user can see the project
     total_count, result = await list_my_projects_marked_as_jobs(
         app=client.app,
         product_name=osparc_product_name,
@@ -58,6 +73,16 @@ async def test_list_my_projects_marked_as_jobs_with_one_marked(
     assert project.uuid == project_uuid
     assert project.job_parent_resource_name == job_parent_resource_name
 
+    # other-user cannot see the project even if it is marked as a job
+    total_count, result = await list_my_projects_marked_as_jobs(
+        app=client.app,
+        product_name=osparc_product_name,
+        user_id=other_user_id,
+    )
+    assert total_count == 0
+    assert len(result) == 0
+
+    # user can see the project with a filter
     total_count, result = await list_my_projects_marked_as_jobs(
         app=client.app,
         product_name=osparc_product_name,
@@ -71,6 +96,7 @@ async def test_list_my_projects_marked_as_jobs_with_one_marked(
     assert project.uuid == project_uuid
     assert project.job_parent_resource_name == job_parent_resource_name
 
+    # user can see the project with a wildcard filter
     total_count, result = await list_my_projects_marked_as_jobs(
         app=client.app,
         product_name=osparc_product_name,
@@ -81,9 +107,10 @@ async def test_list_my_projects_marked_as_jobs_with_one_marked(
     assert len(result) == 1
 
     project = result[0]
-    assert project.project_uuid == project_uuid
+    assert project.uuid == project_uuid
     assert project.job_parent_resource_name == job_parent_resource_name
 
+    # user cannot see the project with another wildcard filter
     total_count, result = await list_my_projects_marked_as_jobs(
         app=client.app,
         product_name=osparc_product_name,