imports

Author: pcrespov

services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py

@@ -8,7 +8,7 @@
 from simcore_postgres_database.utils_repos import transaction_context
 
 from ..db.plugin import get_asyncpg_engine
-from ..projects import _folders_repository as project_to_folders_db
+from ..projects import _folders_repository as _folders_repository
 from ..projects import _groups_respository as project_groups_db
 from ..projects import _projects_repository as projects_db
 from ..projects._access_rights_service import check_user_project_permission
@@ -106,15 +106,15 @@ async def move_folder_into_workspace(
 
         # 7. Remove all records of project to folders that are not in the folders that we are moving
         # (ex. If we are moving from private workspace, the same project can be in different folders for different users)
-        await project_to_folders_db.delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
+        await _folders_repository.delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
             app,
             connection=conn,
             project_id_or_ids=set(project_ids),
             not_in_folder_ids=set(folder_ids),
         )
 
         # 8. Update the user id field for the remaining folders
-        await project_to_folders_db.update_project_to_folder(
+        await _folders_repository.update_project_to_folder(
             app,
             connection=conn,
             folders_id_or_ids=set(folder_ids),

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

@@ -30,7 +30,7 @@
 from ..catalog import catalog_service
 from ..director_v2 import api as director_v2_api
 from ..dynamic_scheduler import api as dynamic_scheduler_api
-from ..folders import _folders_repository as _folders_repository
+from ..folders import _folders_repository as folders_folders_repository
 from ..redis import get_redis_lock_manager_client_sdk
 from ..storage.api import (
     copy_data_folders_from_project,
@@ -39,8 +39,7 @@
 from ..users.api import get_user_fullname
 from ..workspaces.api import check_user_workspace_access, get_user_workspace
 from ..workspaces.errors import WorkspaceAccessForbiddenError
-from . import _folders_repository as project_to_folders_db
-from . import _projects_service
+from . import _folders_repository, _projects_service
 from ._metadata_service import set_project_ancestors
 from ._permalink_service import update_or_pop_permalink_in_project
 from ._projects_repository_legacy import ProjectDBAPI
@@ -293,7 +292,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
                 )
             if folder_id := predefined_project.get("folderId", None):
                 # Check user has access to folder
-                await _folders_repository.get_for_user_or_workspace(
+                await folders_folders_repository.get_for_user_or_workspace(
                     request.app,
                     folder_id=folder_id,
                     product_name=product_name,
@@ -322,7 +321,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
 
             # 1.2 does project belong to some folder?
             workspace_id = new_project["workspaceId"]
-            prj_to_folder_db = await project_to_folders_db.get_project_to_folder(
+            prj_to_folder_db = await _folders_repository.get_project_to_folder(
                 request.app,
                 project_id=from_study,
                 private_workspace_user_id_or_none=(
@@ -369,7 +368,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
 
         # 3.2 move project to proper folder
         if folder_id:
-            await project_to_folders_db.insert_project_to_folder(
+            await _folders_repository.insert_project_to_folder(
                 request.app,
                 project_id=new_project["uuid"],
                 folder_id=folder_id,

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

@@ -6,8 +6,8 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 
-from ..folders import _folders_repository as _folders_repository
-from . import _folders_repository as project_to_folders_db
+from ..folders import _folders_repository as folders_folders_repository
+from . import _folders_repository as _folders_repository
 from ._access_rights_service import get_user_project_access_rights
 from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import ProjectInvalidRightsError
@@ -45,7 +45,7 @@ async def move_project_into_folder(
 
     if folder_id:
         # Check user has access to folder
-        await _folders_repository.get_for_user_or_workspace(
+        await folders_folders_repository.get_for_user_or_workspace(
             app,
             folder_id=folder_id,
             product_name=product_name,
@@ -54,31 +54,31 @@ async def move_project_into_folder(
         )
 
     # Move project to folder
-    prj_to_folder_db = await project_to_folders_db.get_project_to_folder(
+    prj_to_folder_db = await _folders_repository.get_project_to_folder(
         app,
         project_id=project_id,
         private_workspace_user_id_or_none=user_id if workspace_is_private else None,
     )
     if prj_to_folder_db is None:
         if folder_id is None:
             return
-        await project_to_folders_db.insert_project_to_folder(
+        await _folders_repository.insert_project_to_folder(
             app,
             project_id=project_id,
             folder_id=folder_id,
             private_workspace_user_id_or_none=user_id if workspace_is_private else None,
         )
     else:
         # Delete old
-        await project_to_folders_db.delete_project_to_folder(
+        await _folders_repository.delete_project_to_folder(
             app,
             project_id=project_id,
             folder_id=prj_to_folder_db.folder_id,
             private_workspace_user_id_or_none=user_id if workspace_is_private else None,
         )
         # Create new
         if folder_id is not None:
-            await project_to_folders_db.insert_project_to_folder(
+            await _folders_repository.insert_project_to_folder(
                 app,
                 project_id=project_id,
                 folder_id=folder_id,

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

@@ -10,7 +10,7 @@
 from ..db.plugin import get_asyncpg_engine
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
-from . import _folders_repository as project_to_folders_db
+from . import _folders_repository as _folders_repository
 from . import _groups_respository as project_groups_db
 from . import _projects_repository
 from ._access_rights_service import get_user_project_access_rights
@@ -46,7 +46,7 @@ async def move_project_into_workspace(
 
     async with transaction_context(get_asyncpg_engine(app)) as conn:
         # 3. Delete project to folders (for everybody)
-        await project_to_folders_db.delete_all_project_to_folder_by_project_id(
+        await _folders_repository.delete_all_project_to_folder_by_project_id(
             app,
             connection=conn,
             project_id=project_id,