renameing groups

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py

@@ -19,7 +19,7 @@
 from models_library.groups import GroupsByTypeTuple, StandardGroupCreate
 from models_library.users import UserID
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
-from simcore_service_webserver.groups._groups_api import (
+from simcore_service_webserver.groups._groups_service import (
     add_user_in_group,
     create_standard_group,
     delete_standard_group,

services/web/server/src/simcore_service_webserver/groups/_classifiers_handlers.py renamed to services/web/server/src/simcore_service_webserver/groups/_classifiers_rest.py

@@ -1,9 +1,11 @@
 import re
 from copy import deepcopy
+from datetime import datetime
 
 import sqlalchemy as sa
 from aiohttp import web
 from common_library.groups_enums import GroupType
+from common_library.users_enums import UserRole, UserStatus
 from models_library.basic_types import IDStr
 from models_library.groups import (
     AccessRightsDict,
@@ -15,8 +17,10 @@
     StandardGroupCreate,
     StandardGroupUpdate,
 )
+from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.errors import UniqueViolation
+from simcore_postgres_database.models.users import users
 from simcore_postgres_database.utils_products import execute_get_or_create_product_group
 from simcore_postgres_database.utils_repos import (
     pass_or_acquire_connection,
@@ -747,3 +751,34 @@ async def auto_add_user_to_product_group(
             .on_conflict_do_nothing()  # in case the user was already added to this group
         )
         return product_group_id
+
+
+async def auto_create_guest_user_and_add_to_product_group(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    random_user_name: str,
+    email: str,
+    password_hash: str,
+    expires_at: datetime,
+    product_name: ProductName,
+):
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        query = (
+            users.insert()
+            .values(
+                name=random_user_name,
+                email=email,
+                password_hash=password_hash,
+                status=UserStatus.ACTIVE,
+                role=UserRole.GUEST,
+                expires_at=expires_at,
+            )
+            .returning(users.c.id)
+        )
+
+        user_id = await conn.scalar(query)
+
+        await auto_add_user_to_product_group(
+            app, connection, user_id=user_id, product_name=product_name
+        )

services/web/server/src/simcore_service_webserver/groups/_classifiers_api.py renamed to services/web/server/src/simcore_service_webserver/groups/_classifiers_service.py

@@ -22,7 +22,7 @@
 from ..products.api import Product, get_current_product
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from . import _groups_api
+from . import _groups_service
 from ._common.exceptions_handlers import handle_plugin_requests_exceptions
 from ._common.schemas import (
     GroupsPathParams,
@@ -48,7 +48,7 @@ async def list_groups(request: web.Request):
     product: Product = get_current_product(request)
     req_ctx = GroupsRequestContext.model_validate(request)
 
-    groups_by_type = await _groups_api.list_user_groups_with_read_access(
+    groups_by_type = await _groups_service.list_user_groups_with_read_access(
         request.app, user_id=req_ctx.user_id
     )
 
@@ -60,7 +60,7 @@ async def list_groups(request: web.Request):
     if product.group_id:
         with suppress(GroupNotFoundError):
             # Product is optional
-            my_product_group = await _groups_api.get_product_group_for_user(
+            my_product_group = await _groups_service.get_product_group_for_user(
                 app=request.app,
                 user_id=req_ctx.user_id,
                 product_gid=product.group_id,
@@ -90,7 +90,7 @@ async def get_group(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
 
-    group, access_rights = await _groups_api.get_associated_group(
+    group, access_rights = await _groups_service.get_associated_group(
         request.app, user_id=req_ctx.user_id, group_id=path_params.gid
     )
 
@@ -107,7 +107,7 @@ async def create_group(request: web.Request):
 
     create = await parse_request_body_as(GroupCreate, request)
 
-    group, access_rights = await _groups_api.create_standard_group(
+    group, access_rights = await _groups_service.create_standard_group(
         request.app,
         user_id=req_ctx.user_id,
         create=create.to_model(),
@@ -127,7 +127,7 @@ async def update_group(request: web.Request):
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
     update: GroupUpdate = await parse_request_body_as(GroupUpdate, request)
 
-    group, access_rights = await _groups_api.update_standard_group(
+    group, access_rights = await _groups_service.update_standard_group(
         request.app,
         user_id=req_ctx.user_id,
         group_id=path_params.gid,
@@ -147,7 +147,7 @@ async def delete_group(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
 
-    await _groups_api.delete_standard_group(
+    await _groups_service.delete_standard_group(
         request.app, user_id=req_ctx.user_id, group_id=path_params.gid
     )
 
@@ -168,7 +168,7 @@ async def get_all_group_users(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
 
-    users_in_group = await _groups_api.list_group_members(
+    users_in_group = await _groups_service.list_group_members(
         request.app, req_ctx.user_id, path_params.gid
     )
 
@@ -189,7 +189,7 @@ async def add_group_user(request: web.Request):
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
     added: GroupUserAdd = await parse_request_body_as(GroupUserAdd, request)
 
-    await _groups_api.add_user_in_group(
+    await _groups_service.add_user_in_group(
         request.app,
         req_ctx.user_id,
         path_params.gid,
@@ -212,7 +212,7 @@ async def get_group_user(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsUsersPathParams, request)
 
-    user = await _groups_api.get_group_member(
+    user = await _groups_service.get_group_member(
         request.app, req_ctx.user_id, path_params.gid, path_params.uid
     )
 
@@ -228,7 +228,7 @@ async def update_group_user(request: web.Request):
     path_params = parse_request_path_parameters_as(GroupsUsersPathParams, request)
     update: GroupUserUpdate = await parse_request_body_as(GroupUserUpdate, request)
 
-    user = await _groups_api.update_group_member(
+    user = await _groups_service.update_group_member(
         request.app,
         user_id=req_ctx.user_id,
         group_id=path_params.gid,
@@ -246,7 +246,7 @@ async def update_group_user(request: web.Request):
 async def delete_group_user(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsUsersPathParams, request)
-    await _groups_api.delete_group_member(
+    await _groups_service.delete_group_member(
         request.app, req_ctx.user_id, path_params.gid, path_params.uid
     )
 

services/web/server/src/simcore_service_webserver/groups/_groups_db.py renamed to services/web/server/src/simcore_service_webserver/groups/_groups_repository.py

@@ -15,7 +15,7 @@
 from pydantic import EmailStr
 
 from ..users.api import get_user
-from . import _groups_db
+from . import _groups_repository
 from .exceptions import GroupsError
 
 #
@@ -24,7 +24,7 @@
 
 
 async def get_group_from_gid(app: web.Application, group_id: GroupID) -> Group | None:
-    group_db = await _groups_db.get_group_from_gid(app, group_id=group_id)
+    group_db = await _groups_repository.get_group_from_gid(app, group_id=group_id)
 
     if group_db:
         return Group.model_construct(**group_db.model_dump())
@@ -45,21 +45,23 @@ async def list_user_groups_with_read_access(
     # NOTE: Careful! It seems we are filtering out groups, such as Product Groups,
     # because they do not have read access. I believe this was done because the
     # frontend did not want to display them.
-    return await _groups_db.get_all_user_groups_with_read_access(app, user_id=user_id)
+    return await _groups_repository.get_all_user_groups_with_read_access(
+        app, user_id=user_id
+    )
 
 
 async def list_user_groups_ids_with_read_access(
     app: web.Application, *, user_id: UserID
 ) -> list[GroupID]:
-    return await _groups_db.get_ids_of_all_user_groups_with_read_access(
+    return await _groups_repository.get_ids_of_all_user_groups_with_read_access(
         app, user_id=user_id
     )
 
 
 async def list_all_user_groups_ids(
     app: web.Application, *, user_id: UserID
 ) -> list[GroupID]:
-    return await _groups_db.get_ids_of_all_user_groups(app, user_id=user_id)
+    return await _groups_repository.get_ids_of_all_user_groups(app, user_id=user_id)
 
 
 async def get_product_group_for_user(
@@ -69,7 +71,7 @@ async def get_product_group_for_user(
     Returns product's group if user belongs to it, otherwise it
     raises GroupNotFoundError
     """
-    return await _groups_db.get_product_group_for_user(
+    return await _groups_repository.get_product_group_for_user(
         app, user_id=user_id, product_gid=product_gid
     )
 
@@ -90,7 +92,7 @@ async def create_standard_group(
     raises GroupNotFoundError
     raises UserInsufficientRightsError: needs WRITE access
     """
-    return await _groups_db.create_standard_group(
+    return await _groups_repository.create_standard_group(
         app,
         user_id=user_id,
         create=create,
@@ -108,7 +110,9 @@ async def get_associated_group(
     raises GroupNotFoundError
     raises UserInsufficientRightsError: needs READ access
     """
-    return await _groups_db.get_user_group(app, user_id=user_id, group_id=group_id)
+    return await _groups_repository.get_user_group(
+        app, user_id=user_id, group_id=group_id
+    )
 
 
 async def update_standard_group(
@@ -124,7 +128,7 @@ async def update_standard_group(
     raises UserInsufficientRightsError: needs WRITE access
     """
 
-    return await _groups_db.update_standard_group(
+    return await _groups_repository.update_standard_group(
         app,
         user_id=user_id,
         group_id=group_id,
@@ -140,7 +144,7 @@ async def delete_standard_group(
     raises GroupNotFoundError
     raises UserInsufficientRightsError: needs DELETE access
     """
-    return await _groups_db.delete_standard_group(
+    return await _groups_repository.delete_standard_group(
         app, user_id=user_id, group_id=group_id
     )
 
@@ -153,7 +157,9 @@ async def delete_standard_group(
 async def list_group_members(
     app: web.Application, user_id: UserID, group_id: GroupID
 ) -> list[GroupMember]:
-    return await _groups_db.list_users_in_group(app, user_id=user_id, group_id=group_id)
+    return await _groups_repository.list_users_in_group(
+        app, user_id=user_id, group_id=group_id
+    )
 
 
 async def get_group_member(
@@ -163,7 +169,7 @@ async def get_group_member(
     the_user_id_in_group: UserID,
 ) -> GroupMember:
 
-    return await _groups_db.get_user_in_group(
+    return await _groups_repository.get_user_in_group(
         app,
         user_id=user_id,
         group_id=group_id,
@@ -178,7 +184,7 @@ async def update_group_member(
     the_user_id_in_group: UserID,
     access_rights: AccessRightsDict,
 ) -> GroupMember:
-    return await _groups_db.update_user_in_group(
+    return await _groups_repository.update_user_in_group(
         app,
         user_id=user_id,
         group_id=group_id,
@@ -193,7 +199,7 @@ async def delete_group_member(
     group_id: GroupID,
     the_user_id_in_group: UserID,
 ) -> None:
-    return await _groups_db.delete_user_from_group(
+    return await _groups_repository.delete_user_from_group(
         app,
         user_id=user_id,
         group_id=group_id,
@@ -205,7 +211,7 @@ async def is_user_by_email_in_group(
     app: web.Application, user_email: LowerCaseEmailStr, group_id: GroupID
 ) -> bool:
 
-    return await _groups_db.is_user_by_email_in_group(
+    return await _groups_repository.is_user_by_email_in_group(
         app,
         email=user_email,
         group_id=group_id,
@@ -214,19 +220,24 @@ async def is_user_by_email_in_group(
 
 async def auto_add_user_to_groups(app: web.Application, user_id: UserID) -> None:
     user: dict = await get_user(app, user_id)
-    return await _groups_db.auto_add_user_to_groups(app, user=user)
+    return await _groups_repository.auto_add_user_to_groups(app, user=user)
 
 
 async def auto_add_user_to_product_group(
     app: web.Application,
     user_id: UserID,
     product_name: ProductName,
 ) -> GroupID:
-    return await _groups_db.auto_add_user_to_product_group(
+    return await _groups_repository.auto_add_user_to_product_group(
         app, user_id=user_id, product_name=product_name
     )
 
 
+auto_create_guest_user_and_add_to_product_group = (
+    _groups_repository.auto_create_guest_user_and_add_to_product_group
+)
+
+
 def _only_one_true(*args):
     return sum(bool(arg) for arg in args) == 1
 
@@ -254,12 +265,12 @@ async def add_user_in_group(
         raise GroupsError(msg=msg)
 
     if new_by_user_email:
-        user = await _groups_db.get_user_from_email(
+        user = await _groups_repository.get_user_from_email(
             app, email=new_by_user_email, caller_user_id=user_id
         )
         new_by_user_id = user.id
 
-    return await _groups_db.add_new_user_in_group(
+    return await _groups_repository.add_new_user_in_group(
         app,
         user_id=user_id,
         group_id=group_id,

services/web/server/src/simcore_service_webserver/groups/_groups_handlers.py renamed to services/web/server/src/simcore_service_webserver/groups/_groups_rest.py

@@ -1,7 +1,7 @@
 #
 # Domain-Specific Interfaces
 #
-from ._groups_api import (
+from ._groups_service import (
     add_user_in_group,
     auto_add_user_to_groups,
     auto_add_user_to_product_group,

services/web/server/src/simcore_service_webserver/groups/_groups_api.py renamed to services/web/server/src/simcore_service_webserver/groups/_groups_service.py

@@ -5,7 +5,7 @@
 
 from .._constants import APP_SETTINGS_KEY
 from ..products.plugin import setup_products
-from . import _classifiers_handlers, _groups_handlers
+from . import _classifiers_handlers, _groups_rest
 
 _logger = logging.getLogger(__name__)
 
@@ -23,5 +23,5 @@ def setup_groups(app: web.Application):
     # plugin dependencies
     setup_products(app)
 
-    app.router.add_routes(_groups_handlers.routes)
+    app.router.add_routes(_groups_rest.routes)
     app.router.add_routes(_classifiers_handlers.routes)

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

@@ -37,7 +37,7 @@
 from simcore_service_webserver.garbage_collector import _core as gc_core
 from simcore_service_webserver.garbage_collector._tasks_core import _GC_TASK_NAME
 from simcore_service_webserver.garbage_collector.plugin import setup_garbage_collector
-from simcore_service_webserver.groups._groups_api import create_standard_group
+from simcore_service_webserver.groups._groups_service import create_standard_group
 from simcore_service_webserver.groups.api import add_user_in_group
 from simcore_service_webserver.login.plugin import setup_login
 from simcore_service_webserver.projects._crud_api_delete import get_scheduled_tasks