fixes tests

Author: pcrespov

api/specs/web-server/_projects.py

@@ -67,8 +67,10 @@ class _ProjectCreateHeaderParams(BaseModel):
 @router.post(
     "/projects",
     response_model=Envelope[TaskGet],
-    description="Creates a new project or copies an existing one",
-    status_code=status.HTTP_201_CREATED,
+    description="Creates a new project or copies an existing one. "
+    "NOTE: implemented as a long running task, "
+    "i.e. requires polling `status_href` (HTTP_200_OK) to get status and `result_href` (HTTP_201_CREATED) to get created project",
+    status_code=status.HTTP_202_ACCEPTED,
 )
 async def create_project(
     _h: Annotated[_ProjectCreateHeaderParams, Depends()],

packages/models-library/src/models_library/projects_access.py

@@ -25,6 +25,7 @@ class AccessRights(BaseModel):
     read: bool = Field(..., description="has read access")
     write: bool = Field(..., description="has write access")
     delete: bool = Field(..., description="has deletion rights")
+
     model_config = ConfigDict(extra="forbid")
 
 

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

@@ -18,7 +18,6 @@
 from models_library.api_schemas_directorv2.dynamic_services import (
     GetProjectInactivityResponse,
 )
-from models_library.api_schemas_webserver.projects import ProjectCreateNew
 from models_library.products import ProductName
 from models_library.projects_state import ProjectState
 from pydantic import TypeAdapter
@@ -416,65 +415,73 @@ async def test_get_project(
 # POST --------
 
 
+@pytest.mark.parametrize(*standard_role_response())
+async def test_new_project(
+    mock_dynamic_scheduler: None,
+    client: TestClient,
+    logged_user: UserInfoDict,
+    primary_group,
+    expected: ExpectedResponse,
+    request_create_project: Callable[..., Awaitable[ProjectDict]],
+    storage_subsystem_mock,
+    project_db_cleaner,
+):
+    await request_create_project(
+        client, expected.accepted, expected.created, logged_user, primary_group
+    )
+
+
 @pytest.mark.parametrize(
     "user_role",
     [UserRole.USER],
 )
-async def test_create_get_patch_project_icon(
+async def test_create_get_and_patch_project_ui_field(
+    mock_dynamic_scheduler: None,
+    storage_subsystem_mock,
     client: TestClient,
     logged_user: UserInfoDict,
     primary_group: dict[str, str],
+    request_create_project: Callable[..., Awaitable[ProjectDict]],
+    catalog_subsystem_mock: Callable[[list[ProjectDict]], None],
+    project_db_cleaner,
 ):
-    # Step 1: Create a new project with a specific ui.icon
-    project_data = ProjectCreateNew.model_validate(
-        {
-            "name": "Test Project",
-            "description": "A project to test ui.icon",
-            "ui": {"icon": "http://example.com/icon.png"},
-            "workbench": {},
-            "acess_rights": primary_group,
-        }
-    ).model_dump(mode="json", exclude_defaults=True, by_alias=True)
-
-    url = client.app.router["create_project"].url_for()
-    resp = await client.post(f"{url}", json=project_data)
-    new_project, _ = await assert_status(resp, status.HTTP_201_CREATED)
-    assert new_project
+    assert client.app
+
+    gid = logged_user["primary_gid"]
+    assert primary_group["gid"] == gid
 
+    # Step 1: Create project (long running task)
+    new_project = await request_create_project(
+        client,
+        status.HTTP_202_ACCEPTED,
+        status.HTTP_201_CREATED,
+        logged_user,
+        primary_group,
+    )
     project_id = new_project["uuid"]
 
+    catalog_subsystem_mock([new_project])
+
     # Step 2: Get the project and check the ui.icon
     url = client.app.router["get_project"].url_for(project_id=project_id)
     resp = await client.get(f"{url}")
     got_project, _ = await assert_status(resp, status.HTTP_200_OK)
-    assert got_project["ui"]["icon"] == "http://example.com/icon.png"
+    assert got_project["ui"] == {}
 
     # Step 3: Patch the project to set ui.icon to null
-    patch_data = {"ui": {"icon": None}}
-    url = client.app.router["update_project"].url_for(project_id=project_id)
+    patch_data = {"ui": {"icon": "http://example.com/icon.png"}}
+    url = client.app.router["patch_project"].url_for(project_id=project_id)
     resp = await client.patch(f"{url}", json=patch_data)
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
     # Step 4: Get the project again and check the ui.icon is now null
     resp = await client.get(f"{url}")
     got_project, _ = await assert_status(resp, status.HTTP_200_OK)
-    assert got_project["ui"]["icon"] is None
-
+    assert got_project["ui"]["icon"] == "http://example.com/icon.png"
 
-@pytest.mark.parametrize(*standard_role_response())
-async def test_new_project(
-    mock_dynamic_scheduler: None,
-    client: TestClient,
-    logged_user: UserInfoDict,
-    primary_group,
-    expected: ExpectedResponse,
-    storage_subsystem_mock,
-    project_db_cleaner,
-    request_create_project: Callable[..., Awaitable[ProjectDict]],
-):
-    await request_create_project(
-        client, expected.accepted, expected.created, logged_user, primary_group
-    )
+    # Step 5: Delete project
+    resp = await client.delete(f"{url}")
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
 
 @pytest.mark.parametrize(*standard_user_role_response())