importing user_services

Author: pcrespov

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

@@ -18,7 +18,7 @@
 from ..projects._projects_service import create_user_notification_cb
 from ..redis import get_redis_lock_manager_client_sdk
 from ..security.decorators import permission_required
-from ..users.users_service import get_user_fullname
+from ..users import users_service
 from ._formatter.archive import get_sds_archive_path
 from .exceptions import SDSException
 from .utils import CleanupFileResponse
@@ -52,7 +52,8 @@ async def export_project(request: web.Request):
         project_uuid=project_uuid,
         status=ProjectStatus.EXPORTING,
         owner=Owner(
-            user_id=user_id, **await get_user_fullname(request.app, user_id=user_id)
+            user_id=user_id,
+            **await users_service.get_user_fullname(request.app, user_id=user_id),
         ),
         notification_cb=create_user_notification_cb(
             user_id, ProjectID(f"{project_uuid}"), request.app

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

@@ -208,7 +208,9 @@ async def create_function_job(  # noqa: PLR0913
 
         registered_function_job = RegisteredFunctionJobDB.model_validate(row)
 
-        user_primary_group_id = await get_user_primary_group_id(app, user_id=user_id)
+        user_primary_group_id = await users_service.get_user_primary_group_id(
+            app, user_id=user_id
+        )
         await set_group_permissions(
             app,
             connection=transaction,
@@ -293,7 +295,9 @@ async def create_function_job_collection(
             )  # nosec
             job_collection_entries.append(entry)
 
-        user_primary_group_id = await get_user_primary_group_id(app, user_id=user_id)
+        user_primary_group_id = await users_service.get_user_primary_group_id(
+            app, user_id=user_id
+        )
         await set_group_permissions(
             app,
             connection=transaction,

services/web/server/src/simcore_service_webserver/groups/_groups_service.py

@@ -267,7 +267,7 @@ async def add_user_in_group(
 
     if new_by_user_id is not None:
         new_user = await users_service.get_user(app, new_by_user_id)
-        new_by_user_name = new_user.name
+        new_by_user_name = new_user["name"]
 
     return await _groups_repository.add_new_user_in_group(
         app,

services/web/server/src/simcore_service_webserver/login_accounts/_controller_rest.py

@@ -28,7 +28,7 @@
 from ..security import security_service, security_web
 from ..security.decorators import permission_required
 from ..session import api as session_service
-from ..users import api as users_service
+from ..users import users_service
 from ..users._common.schemas import PreRegisteredUserGet
 from ..utils import MINUTE
 from ..utils_rate_limiting import global_rate_limit_route

services/web/server/src/simcore_service_webserver/payments/_onetime_api.py

@@ -391,8 +391,10 @@ async def pay_with_payment_method(
     )
 
     # user info
-    user = await get_user_display_and_id_names(app, user_id=user_id)
-    user_invoice_address = await get_user_invoice_address(app, user_id=user_id)
+    user_info = await users_service.get_user_display_and_id_names(app, user_id=user_id)
+    user_invoice_address = await users_service.get_user_invoice_address(
+        app, user_id=user_id
+    )
 
     settings: PaymentsSettings = get_plugin_settings(app)
     if settings.PAYMENTS_FAKE_COMPLETION:
@@ -405,8 +407,8 @@ async def pay_with_payment_method(
             wallet_id=wallet_id,
             wallet_name=user_wallet.name,
             user_id=user_id,
-            user_name=user.full_name,
-            user_email=user.email,
+            user_name=user_info.full_name,
+            user_email=user_info.email,
             comment=comment,
         )
 
@@ -421,8 +423,8 @@ async def pay_with_payment_method(
         wallet_id=wallet_id,
         wallet_name=user_wallet.name,
         user_id=user_id,
-        user_name=user.full_name,
-        user_email=user.email,
+        user_name=user_info.full_name,
+        user_email=user_info.email,
         user_address=user_invoice_address,
         stripe_price_id=product_stripe_info.stripe_price_id,
         stripe_tax_rate_id=product_stripe_info.stripe_tax_rate_id,

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

@@ -562,7 +562,7 @@ async def get_project_services_access_for_gid(request: web.Request) -> web.Respo
 
     # Update groups to compare based on the type of sharing group
     if _sharing_with_group.group_type == GroupType.PRIMARY:
-        _user_id = await get_user_id_from_gid(
+        _user_id = await users_service.get_user_id_from_gid(
             app=request.app, primary_gid=query_params.for_gid
         )
         user_groups_ids = await list_all_user_groups_ids(

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

@@ -323,7 +323,7 @@ async def patch_project(
             "write": True,
             "delete": True,
         }
-        user: dict = await get_user(app, project_db.prj_owner)
+        user: dict = await users_service.get_user(app, project_db.prj_owner)
         _prj_owner_primary_group = f"{user['primary_gid']}"
         if _prj_owner_primary_group not in new_prj_access_rights:
             raise ProjectOwnerNotFoundInTheProjectAccessRightsError
@@ -333,7 +333,7 @@ async def patch_project(
     # 4. If patching template type
     if new_template_type := patch_project_data.get("template_type"):
         # 4.1 Check if user is a tester
-        current_user: dict = await get_user(app, user_id)
+        current_user: dict = await users_service.get_user(app, user_id)
         if UserRole(current_user["role"]) < UserRole.TESTER:
             raise InsufficientRoleForProjectTemplateTypeUpdateError
         # 4.2 Check the compatibility of the template type with the project
@@ -668,7 +668,9 @@ async def _start_dynamic_service(  # noqa: C901
         raise
 
     save_state = False
-    user_role: UserRole = await get_user_role(request.app, user_id=user_id)
+    user_role: UserRole = await users_service.get_user_role(
+        request.app, user_id=user_id
+    )
     if user_role > UserRole.GUEST:
         save_state = await has_user_project_access_rights(
             request.app, project_id=project_uuid, user_id=user_id, permission="write"