refacotred moved aorund modules

Author: Andrei Neagu

packages/postgres-database/src/simcore_postgres_database/utils_projects_extensions.py

@@ -14,6 +14,7 @@
 from models_library.workspaces import WorkspaceID
 from pydantic import NonNegativeInt, PositiveInt
 from simcore_postgres_database.models.projects import projects
+from simcore_postgres_database.models.projects_extensions import projects_extensions
 from simcore_postgres_database.models.users import users
 from simcore_postgres_database.utils_repos import (
     get_columns_from_db_model,
@@ -289,3 +290,52 @@ async def delete_project(
         if row is None:
             raise ProjectNotFoundError(project_uuid=project_uuid)
         return ProjectDBGet.model_validate(row)
+
+
+async def allows_guests_to_push_states_and_output_ports(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_uuid: str,
+) -> bool:
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+        result: bool | None = await conn.scalar(
+            sa.select(
+                projects_extensions.c.allow_guests_to_push_states_and_output_ports
+            ).where(projects_extensions.c.project_uuid == project_uuid)
+        )
+        return result if result is not None else False
+
+
+async def _set_allow_guests_to_push_states_and_output_ports(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_uuid: str,
+) -> None:
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        await conn.execute(
+            sa.insert(projects_extensions).values(
+                project_uuid=project_uuid,
+                allow_guests_to_push_states_and_output_ports=True,
+            )
+        )
+
+
+async def copy_allow_guests_to_push_states_and_output_ports(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    from_project_uuid: str,
+    to_project_uuid: str,
+) -> None:
+    # get setting from template project
+    allow_guests = await allows_guests_to_push_states_and_output_ports(
+        app, connection, project_uuid=from_project_uuid
+    )
+
+    # set same setting in new project if True
+    if allow_guests:
+        await _set_allow_guests_to_push_states_and_output_ports(
+            app, connection, project_uuid=to_project_uuid
+        )

packages/postgres-database/tests/test_utils_projects_extensions.py

@@ -107,7 +107,6 @@
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
 from servicelib.utils import fire_and_forget_task, limited_gather, logged_gather
 from simcore_postgres_database.models.users import UserRole
-from simcore_postgres_database.utils_projects_extensions import ProjectsExtensionsRepo
 from simcore_postgres_database.utils_projects_nodes import (
     ProjectNodeCreate,
     ProjectNodesNodeNotFoundError,
@@ -117,7 +116,6 @@
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
 from ..constants import APP_FIRE_AND_FORGET_TASKS_KEY
-from ..db.plugin import get_asyncpg_engine
 from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..models import ClientSessionID
@@ -821,8 +819,8 @@ async def _start_dynamic_service(  # pylint: disable=too-many-statements  # noqa
         )
     if (
         user_role == UserRole.GUEST
-        and await ProjectsExtensionsRepo.allows_guests_to_push_states_and_output_ports(
-            get_asyncpg_engine(request.app), project_uuid=f"{project_uuid}"
+        and await _projects_repository.allows_guests_to_push_states_and_output_ports(
+            request.app, project_uuid=f"{project_uuid}"
         )
     ):
         save_state = True

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

@@ -25,13 +25,12 @@
 from models_library.projects import ProjectID
 from servicelib.aiohttp import status
 from servicelib.aiohttp.typing_extension import Handler
-from simcore_postgres_database.utils_projects_extensions import ProjectsExtensionsRepo
 
 from ..constants import INDEX_RESOURCE_NAME
-from ..db.plugin import get_asyncpg_engine
 from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
+from ..projects import _projects_repository
 from ..projects._groups_repository import get_project_group
 from ..projects._projects_repository_legacy import ProjectDBAPI
 from ..projects.api import check_user_project_permission
@@ -223,8 +222,8 @@ async def copy_study_to_account(
             request.app, project_id=ProjectID(project["uuid"])
         )
 
-        await ProjectsExtensionsRepo.copy_allow_guests_to_push_states_and_output_ports(
-            get_asyncpg_engine(request.app),
+        await _projects_repository.copy_allow_guests_to_push_states_and_output_ports(
+            request.app,
             from_project_uuid=template_project["uuid"],
             to_project_uuid=project["uuid"],
         )

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

@@ -1,13 +1,15 @@
+# pylint: disable=protected-access
 # pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-# pylint: disable=too-many-arguments
 
 from datetime import datetime, timedelta
 from uuid import UUID
 
 import arrow
 import pytest
+from aiohttp import web
 from aiohttp.test_utils import TestClient
 from common_library.users_enums import UserRole
 from models_library.basic_types import IDStr
@@ -195,3 +197,44 @@ async def test_batch_get_trashed_by_primary_gid(
         None,
         logged_user["primary_gid"],
     ]
+
+
+async def _assert_allows_to_psuh(
+    app: web.Application, project_uuid: str, *, expected: bool
+) -> None:
+    result = (
+        await projects_service_repository.allows_guests_to_push_states_and_output_ports(
+            app, project_uuid=project_uuid
+        )
+    )
+    assert result is expected
+
+
+async def test_guest_allowed_to_push(
+    client: TestClient, user_project: ProjectDict, shared_project: ProjectDict
+):
+    assert client.app
+
+    source_uuid = user_project["uuid"]
+    copy_uuid = shared_project["uuid"]
+
+    await _assert_allows_to_psuh(client.app, source_uuid, expected=False)
+
+    # add the entry in the table
+    await projects_service_repository._set_allow_guests_to_push_states_and_output_ports(  # noqa: SLF001
+        client.app, project_uuid=source_uuid
+    )
+
+    await _assert_allows_to_psuh(client.app, source_uuid, expected=True)
+
+    assert (
+        await projects_service_repository.allows_guests_to_push_states_and_output_ports(
+            client.app, project_uuid=copy_uuid
+        )
+        is False
+    )
+    await _assert_allows_to_psuh(client.app, copy_uuid, expected=False)
+    await projects_service_repository.copy_allow_guests_to_push_states_and_output_ports(
+        client.app, from_project_uuid=source_uuid, to_project_uuid=copy_uuid
+    )
+    await _assert_allows_to_psuh(client.app, copy_uuid, expected=True)