db, db_utils and projects_db -> projects_repository_*

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py

@@ -14,11 +14,16 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.services_resources import ServiceResourcesDictHelpers
 from simcore_postgres_database.utils_projects_nodes import ProjectNodeCreate
-from simcore_service_webserver.projects._db_utils import DB_EXCLUSIVE_COLUMNS
 from simcore_service_webserver.projects._groups_respository import (
     update_or_insert_project_group,
 )
-from simcore_service_webserver.projects.db import APP_PROJECT_DBAPI, ProjectDBAPI
+from simcore_service_webserver.projects._projects_repository_legacy import (
+    APP_PROJECT_DBAPI,
+    ProjectDBAPI,
+)
+from simcore_service_webserver.projects._projects_repository_legacy_utils import (
+    DB_EXCLUSIVE_COLUMNS,
+)
 from simcore_service_webserver.projects.models import ProjectDict
 from simcore_service_webserver.utils import now_str
 

services/web/server/src/simcore_service_webserver/db_listener/plugin.py

@@ -1,14 +1,15 @@
 """
-    computation module is the main entry-point for computational backend
+computation module is the main entry-point for computational backend
 
 """
+
 import logging
 
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
 from ..db.plugin import setup_db
-from ..projects.db import setup_projects_db
+from ..projects._projects_repository_legacy import setup_projects_db
 from ..rabbitmq import setup_rabbitmq
 from ..socketio.plugin import setup_socketio
 from ._db_comp_tasks_listening_task import create_comp_tasks_listening_task

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

@@ -10,7 +10,7 @@
 from ..db.plugin import get_asyncpg_engine
 from ..projects import _folders_repository as project_to_folders_db
 from ..projects import _groups_respository as project_groups_db
-from ..projects import _projects_db as projects_db
+from ..projects import _projects_repository as projects_db
 from ..projects._access_rights_service import check_user_project_permission
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access

services/web/server/src/simcore_service_webserver/garbage_collector/_core_guests.py

@@ -11,7 +11,7 @@
 from simcore_postgres_database.aiopg_errors import DatabaseError
 from simcore_postgres_database.models.users import UserRole
 
-from ..projects.db import ProjectDBAPI
+from ..projects._projects_repository_legacy import ProjectDBAPI
 from ..projects.exceptions import ProjectDeleteError, ProjectNotFoundError
 from ..projects.projects_service import get_project_for_user, submit_delete_project_task
 from ..redis import get_redis_lock_manager_client

services/web/server/src/simcore_service_webserver/garbage_collector/_core_utils.py

@@ -8,11 +8,14 @@
 from simcore_postgres_database.aiopg_errors import DatabaseError
 
 from ..groups.api import get_group_from_gid
+from ..projects._projects_repository_legacy import (
+    APP_PROJECT_DBAPI,
+    ProjectAccessRights,
+)
 from ..projects.api import (
     create_project_group_without_checking_permissions,
     delete_project_group_without_checking_permissions,
 )
-from ..projects.db import APP_PROJECT_DBAPI, ProjectAccessRights
 from ..projects.exceptions import ProjectNotFoundError
 from ..users.api import get_user, get_user_id_from_gid, get_users_in_group
 from ..users.exceptions import UserNotFoundError

services/web/server/src/simcore_service_webserver/garbage_collector/plugin.py

@@ -7,7 +7,7 @@
 from ..application_settings import get_application_settings
 from ..login.plugin import setup_login_storage
 from ..products.plugin import setup_products
-from ..projects.db import setup_projects_db
+from ..projects._projects_repository_legacy import setup_projects_db
 from ..socketio.plugin import setup_socketio
 from . import _tasks_api_keys, _tasks_core, _tasks_trash, _tasks_users
 from .settings import get_plugin_settings

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

@@ -6,8 +6,8 @@
 from ..db.plugin import get_database_engine
 from ..workspaces.api import get_workspace
 from ._access_rights_repository import get_project_owner
-from ._db_utils import PermissionStr
-from .db import APP_PROJECT_DBAPI, ProjectDBAPI
+from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
+from ._projects_repository_legacy_utils import PermissionStr
 from .exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 from .models import UserProjectAccessRightsWithWorkspace
 

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

@@ -10,7 +10,7 @@
 from models_library.users import UserID
 from pydantic import PositiveInt
 
-from .db import APP_PROJECT_DBAPI, ProjectDBAPI
+from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
 
 log = logging.getLogger(__name__)
 

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_pricing_unit_rest.py

@@ -17,7 +17,7 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import projects_service
-from ..db import ProjectDBAPI
+from .._projects_repository_legacy import ProjectDBAPI
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import RequestContext
 from .nodes_rest import NodePathParams

services/web/server/src/simcore_service_webserver/projects/_controller/ports_rest.py

@@ -31,7 +31,7 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _ports_service, projects_service
 from .._access_rights_service import check_user_project_permission
-from ..db import ProjectDBAPI
+from .._projects_repository_legacy import ProjectDBAPI
 from ..models import ProjectDict
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext