unify functions

Author: Andrei Neagu

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

@@ -25,7 +25,7 @@ async def allows_guests_to_push_states_and_output_ports(
             return result if result is not None else False
 
     @classmethod
-    async def set_allow_guests_to_push_states_and_output_ports(
+    async def _set_allow_guests_to_push_states_and_output_ports(
         cls, async_engine: AsyncEngine, *, project_uuid: str
     ) -> None:
         async with transaction_context(async_engine) as connection:
@@ -35,3 +35,22 @@ async def set_allow_guests_to_push_states_and_output_ports(
                     allow_guests_to_push_states_and_output_ports=True,
                 )
             )
+
+    @classmethod
+    async def copy_allow_guests_to_push_states_and_output_ports(
+        cls,
+        async_engine: AsyncEngine,
+        *,
+        from_project_uuid: str,
+        to_project_uuid: str,
+    ) -> None:
+        # get setting from template project
+        allow_guests = await cls.allows_guests_to_push_states_and_output_ports(
+            async_engine, project_uuid=from_project_uuid
+        )
+
+        # set same setting in new project if True
+        if allow_guests:
+            await cls._set_allow_guests_to_push_states_and_output_ports(
+                async_engine, project_uuid=to_project_uuid
+            )

packages/postgres-database/tests/test_utils_projects_extensions.py

@@ -1,3 +1,4 @@
+# pylint: disable=protected-access
 # pylint: disable=redefined-outer-name
 
 from collections.abc import Awaitable, Callable
@@ -25,35 +26,50 @@ async def fake_project(
     create_fake_project: Callable[..., Awaitable[RowProxy]],
     create_fake_nodes: Callable[..., Awaitable[RowProxy]],
 ) -> RowProxy:
-    project: RowProxy = await create_fake_project(connection, fake_user, hidden=True)
+    project: RowProxy = await create_fake_project(connection, fake_user)
     await create_fake_nodes(project)
     return project
 
 
+async def _assert_allows_to_psuh(
+    asyncpg_engine: AsyncEngine, project_uuid: str, *, expected: bool
+) -> None:
+    result = await ProjectsExtensionsRepo.allows_guests_to_push_states_and_output_ports(
+        asyncpg_engine, project_uuid=project_uuid
+    )
+    assert result is expected
+
+
 async def test_workflow(
     asyncpg_engine: AsyncEngine,
     connection: SAConnection,
     create_fake_user: Callable[..., Awaitable[RowProxy]],
     create_fake_project: Callable[..., Awaitable[RowProxy]],
 ):
     user: RowProxy = await create_fake_user(connection)
-    project: RowProxy = await create_fake_project(connection, user, hidden=True)
+    project: RowProxy = await create_fake_project(connection, user)
 
-    assert (
-        await ProjectsExtensionsRepo.allows_guests_to_push_states_and_output_ports(
-            asyncpg_engine, project_uuid=project["uuid"]
-        )
-        is False
-    )
+    await _assert_allows_to_psuh(asyncpg_engine, project["uuid"], expected=False)
 
     # add the entry in the table
-    await ProjectsExtensionsRepo.set_allow_guests_to_push_states_and_output_ports(
+    await ProjectsExtensionsRepo._set_allow_guests_to_push_states_and_output_ports(
         asyncpg_engine, project_uuid=project["uuid"]
     )
 
+    await _assert_allows_to_psuh(asyncpg_engine, project["uuid"], expected=True)
+
+    copy_project: RowProxy = await create_fake_project(connection, user)
+
     assert (
         await ProjectsExtensionsRepo.allows_guests_to_push_states_and_output_ports(
-            asyncpg_engine, project_uuid=project["uuid"]
+            asyncpg_engine, project_uuid=copy_project["uuid"]
         )
-        is True
+        is False
+    )
+    await _assert_allows_to_psuh(asyncpg_engine, copy_project["uuid"], expected=False)
+    await ProjectsExtensionsRepo.copy_allow_guests_to_push_states_and_output_ports(
+        asyncpg_engine,
+        from_project_uuid=project["uuid"],
+        to_project_uuid=copy_project["uuid"],
     )
+    await _assert_allows_to_psuh(asyncpg_engine, copy_project["uuid"], expected=True)

services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py

@@ -223,13 +223,11 @@ async def copy_study_to_account(
             request.app, project_id=ProjectID(project["uuid"])
         )
 
-        # set the same option in the new project from the template
-        if await ProjectsExtensionsRepo.allows_guests_to_push_states_and_output_ports(
-            get_asyncpg_engine(request.app), project_uuid=template_project["uuid"]
-        ):
-            await ProjectsExtensionsRepo.set_allow_guests_to_push_states_and_output_ports(
-                get_asyncpg_engine(request.app), project_uuid=project["uuid"]
-            )
+        await ProjectsExtensionsRepo.copy_allow_guests_to_push_states_and_output_ports(
+            get_asyncpg_engine(request.app),
+            from_project_uuid=template_project["uuid"],
+            to_project_uuid=project["uuid"],
+        )
 
     return project_uuid