model conversion and fitures

Author: pcrespov

packages/models-library/src/models_library/api_schemas_webserver/groups.py

@@ -1,5 +1,5 @@
 from contextlib import suppress
-from typing import Annotated
+from typing import Annotated, Self
 
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.basic_types import IDStr
@@ -16,6 +16,7 @@
 )
 
 from ..emails import LowerCaseEmailStr
+from ..groups import AccessRightsDict, Group
 from ..users import UserID
 from ..utils.common_validators import create__check_only_one_is_set__root_validator
 from ._base import InputSchema, OutputSchema
@@ -59,6 +60,16 @@ class GroupGet(OutputSchema):
         ),
     ] = DEFAULT_FACTORY
 
+    @classmethod
+    def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self:
+        # Fuses both dataset into GroupSet
+        return cls.model_validate(
+            {
+                **group.model_dump(),
+                "access_rights": access_rights,
+            }
+        )
+
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [

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

@@ -16,23 +16,19 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from models_library.api_schemas_webserver.groups import GroupGet
+from models_library.groups import GroupsByTypeTuple
 from models_library.users import UserID
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from simcore_service_webserver.groups import _groups_db
-from simcore_service_webserver.groups._common.types import GroupsByTypeTuple
 from simcore_service_webserver.groups._groups_api import (
+    add_user_in_group,
+    delete_organization,
     list_user_groups_with_read_access,
 )
-from simcore_service_webserver.groups.api import add_user_in_group, delete_user_group
 
 
 def _to_group_get_json(group, access_rights) -> dict[str, Any]:
-    return GroupGet.model_validate(
-        {
-            **group.model_dump(),
-            "access_rights": access_rights,
-        }
-    ).model_dump(mode="json")
+    return GroupGet.from_model(group, access_rights).model_dump(mode="json")
 
 
 #
@@ -72,7 +68,7 @@ async def logged_user_groups_by_type(
     assert client.app
 
     groups_by_type = await list_user_groups_with_read_access(
-        client.app, logged_user["id"]
+        client.app, user_id=logged_user["id"]
     )
     assert groups_by_type.primary
     assert groups_by_type.everyone
@@ -152,8 +148,12 @@ async def standard_groups(
         yield standard_groups
 
         # clean groups
-        await delete_user_group(client.app, owner_user["id"], sparc_group["gid"])
-        await delete_user_group(client.app, owner_user["id"], team_black_group["gid"])
+        await delete_organization(
+            client.app, user_id=owner_user["id"], group_id=sparc_group["gid"]
+        )
+        await delete_organization(
+            client.app, user_id=owner_user["id"], group_id=team_black_group["gid"]
+        )
 
 
 @pytest.fixture

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

@@ -11,7 +11,7 @@
     GroupUserUpdate,
     MyGroupsGet,
 )
-from models_library.groups import AccessRightsDict, Group, GroupMember
+from models_library.groups import GroupMember
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -38,16 +38,6 @@
 routes = web.RouteTableDef()
 
 
-def _to_groupget_model(group: Group, access_rights: AccessRightsDict) -> GroupGet:
-    # Fuses both dataset into GroupSet
-    return GroupGet.model_validate(
-        {
-            **group.model_dump(),
-            "access_rights": access_rights,
-        }
-    )
-
-
 @routes.get(f"/{API_VTAG}/groups", name="list_groups")
 @login_required
 @permission_required("groups.read")
@@ -78,10 +68,10 @@ async def list_groups(request: web.Request):
             )
 
     my_groups = MyGroupsGet(
-        me=_to_groupget_model(*groups_by_type.primary),
-        organizations=[_to_groupget_model(*gi) for gi in groups_by_type.standard],
-        all=_to_groupget_model(*groups_by_type.everyone),
-        product=_to_groupget_model(*my_product_group) if my_product_group else None,
+        me=GroupGet.from_model(*groups_by_type.primary),
+        organizations=[GroupGet.from_model(*gi) for gi in groups_by_type.standard],
+        all=GroupGet.from_model(*groups_by_type.everyone),
+        product=GroupGet.from_model(*my_product_group) if my_product_group else None,
     )
 
     return envelope_json_response(my_groups)
@@ -105,7 +95,7 @@ async def get_group(request: web.Request):
         request.app, user_id=req_ctx.user_id, group_id=path_params.gid
     )
 
-    group = _to_groupget_model(group, access_rights)
+    group = GroupGet.from_model(group, access_rights)
     return envelope_json_response(group)
 
 
@@ -125,7 +115,7 @@ async def create_group(request: web.Request):
         new_group_values=create.model_dump(mode="json", exclude_unset=True),
     )
 
-    created_group = _to_groupget_model(group, access_rights)
+    created_group = GroupGet.from_model(group, access_rights)
     return envelope_json_response(created_group, status_cls=web.HTTPCreated)
 
 
@@ -147,7 +137,7 @@ async def update_group(request: web.Request):
         new_group_values=new_group_values,
     )
 
-    updated_group = _to_groupget_model(group, access_rights)
+    updated_group = GroupGet.from_model(group, access_rights)
     return envelope_json_response(updated_group)