fixes engines

Author: pcrespov

services/web/server/src/simcore_service_webserver/users/_handlers.py

@@ -20,7 +20,7 @@
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from . import _api, api
+from . import _users_service, api
 from ._constants import FMSG_MISSING_CONFIG_WITH_OEC
 from ._schemas import PreUserProfile
 from .exceptions import (
@@ -121,7 +121,7 @@ async def search_users(request: web.Request) -> web.Response:
         _SearchQueryParams, request
     )
 
-    found = await _api.search_users(
+    found = await _users_service.search_users(
         request.app, email_glob=query_params.email, include_products=True
     )
 
@@ -139,7 +139,7 @@ async def pre_register_user(request: web.Request) -> web.Response:
     pre_user_profile = await parse_request_body_as(PreUserProfile, request)
 
     try:
-        user_profile = await _api.pre_register_user(
+        user_profile = await _users_service.pre_register_user(
             request.app, profile=pre_user_profile, creator_user_id=req_ctx.user_id
         )
         return envelope_json_response(

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py

@@ -17,7 +17,7 @@
 from ..redis import get_redis_user_notifications_client
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from . import _api
+from . import _users_service
 from ._handlers import UsersRequestContext
 from ._notifications import (
     MAX_NOTIFICATIONS_FOR_USER_TO_KEEP,
@@ -125,7 +125,7 @@ async def mark_notification_as_read(request: web.Request) -> web.Response:
 @permission_required("user.permissions.read")
 async def list_user_permissions(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
-    list_permissions: list[Permission] = await _api.list_user_permissions(
+    list_permissions: list[Permission] = await _users_service.list_user_permissions(
         request.app, req_ctx.user_id, req_ctx.product_name
     )
     return envelope_json_response(

services/web/server/src/simcore_service_webserver/users/_users_repository.py

@@ -5,7 +5,7 @@
 from models_library.users import GroupID, UserBillingDetails, UserID
 from simcore_postgres_database.models.groups import groups, user_to_groups
 from simcore_postgres_database.models.products import products
-from simcore_postgres_database.models.users import UserStatus, users
+from simcore_postgres_database.models.users import UserStatus, user_to_groups, users
 from simcore_postgres_database.models.users_details import (
     users_pre_registration_details,
 )
@@ -22,7 +22,6 @@
 from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
-from ..db.models import user_to_groups
 from ..db.plugin import get_asyncpg_engine
 from .exceptions import BillingDetailsNotFoundError
 from .schemas import Permission

services/web/server/src/simcore_service_webserver/users/_api.py renamed to services/web/server/src/simcore_service_webserver/users/_users_service.py

@@ -9,7 +9,7 @@
 from pydantic import TypeAdapter
 from simcore_postgres_database.models.users import UserStatus
 
-from ..db.plugin import get_database_engine
+from ..db.plugin import get_asyncpg_engine
 from . import _schemas, _users_repository
 from ._users_repository import get_user_or_raise
 from ._users_repository import list_user_permissions as db_list_of_permissions
@@ -39,7 +39,7 @@ async def get_user_credentials(
     app: web.Application, *, user_id: UserID
 ) -> UserCredentialsTuple:
     row = await get_user_or_raise(
-        get_database_engine(app),
+        get_asyncpg_engine(app),
         user_id=user_id,
         return_column_names=[
             "name",
@@ -58,7 +58,7 @@ async def get_user_credentials(
 
 async def set_user_as_deleted(app: web.Application, user_id: UserID) -> None:
     await update_user_status(
-        get_database_engine(app), user_id=user_id, new_status=UserStatus.DELETED
+        get_asyncpg_engine(app), user_id=user_id, new_status=UserStatus.DELETED
     )
 
 
@@ -74,13 +74,13 @@ async def search_users(
 ) -> list[_schemas.UserProfile]:
     # NOTE: this search is deploy-wide i.e. independent of the product!
     rows = await _users_repository.search_users_and_get_profile(
-        get_database_engine(app), email_like=_glob_to_sql_like(email_glob)
+        get_asyncpg_engine(app), email_like=_glob_to_sql_like(email_glob)
     )
 
     async def _list_products_or_none(user_id):
         if user_id is not None and include_products:
             products = await _users_repository.get_user_products(
-                get_database_engine(app), user_id=user_id
+                get_asyncpg_engine(app), user_id=user_id
             )
             return [_.product_name for _ in products]
         return None
@@ -137,7 +137,7 @@ async def pre_register_user(
             details[f"pre_{key}"] = details.pop(key)
 
     await _users_repository.new_user_details(
-        get_database_engine(app),
+        get_asyncpg_engine(app),
         email=profile.email,
         created_by=creator_user_id,
         **details,
@@ -154,7 +154,7 @@ async def get_user_invoice_address(
 ) -> UserInvoiceAddress:
     user_billing_details: UserBillingDetails = (
         await _users_repository.get_user_billing_details(
-            get_database_engine(app), user_id=user_id
+            get_asyncpg_engine(app), user_id=user_id
         )
     )
     _user_billing_country = pycountry.countries.lookup(user_billing_details.country)

services/web/server/src/simcore_service_webserver/users/api.py

@@ -35,9 +35,13 @@
 from ..login.storage import AsyncpgStorage, get_plugin_storage
 from ..security.api import clean_auth_policy_cache
 from . import _users_repository
-from ._api import get_user_credentials, get_user_invoice_address, set_user_as_deleted
 from ._models import ToUserUpdateDB
 from ._preferences_api import get_frontend_user_preferences_aggregation
+from ._users_service import (
+    get_user_credentials,
+    get_user_invoice_address,
+    set_user_as_deleted,
+)
 from .exceptions import (
     MissingGroupExtraPropertiesForProductError,
     UserNameDuplicateError,