fixing tests

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

@@ -195,7 +195,9 @@ class Config:
 
 
 class GroupUserUpdate(InputSchema):
-    access_rights: GroupAccessRights | None = None
+    # NOTE: since it is a single item, it is required. Cannot
+    # update for the moment partial attributes e.g. {read: False}
+    access_rights: GroupAccessRights
 
     class Config:
         schema_extra: ClassVar[dict[str, Any]] = {

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

@@ -358,8 +358,12 @@ async def update_user_in_group(
     user_id: UserID,
     gid: GroupID,
     the_user_id_in_group: int,
-    new_values_for_user_in_group: dict,
+    access_rights: dict,
 ) -> dict[str, str]:
+    if not access_rights:
+        msg = f"Cannot update empty {access_rights}"
+        raise ValueError(msg)
+
     # first check if the group exists
     group: RowProxy = await _get_user_group(conn, user_id, gid)
     check_group_permissions(group, user_id, gid, "write")
@@ -368,7 +372,7 @@ async def update_user_in_group(
         conn, gid, the_user_id_in_group
     )
     # modify the user access rights
-    new_db_values = {"access_rights": new_values_for_user_in_group["accessRights"]}
+    new_db_values = {"access_rights": access_rights}
     await conn.execute(
         # pylint: disable=no-value-for-parameter
         user_to_groups.update()

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

@@ -98,6 +98,7 @@ async def list_groups(request: web.Request):
 
     if product.group_id:
         with suppress(GroupNotFoundError):
+            # Product is optional
             my_group["product"] = await api.get_product_group_for_user(
                 app=request.app,
                 user_id=req_ctx.user_id,
@@ -260,10 +261,10 @@ async def update_group_user(request: web.Request):
 
     user = await api.update_user_in_group(
         request.app,
-        req_ctx.user_id,
-        path_params.gid,
-        path_params.uid,
-        update.dict(exclude_unset=True),
+        user_id=req_ctx.user_id,
+        gid=path_params.gid,
+        the_user_id_in_group=path_params.uid,
+        access_rights=update.access_rights.dict(),
     )
     assert parse_obj_as(GroupUserGet, user) is not None  # nosec
     return envelope_json_response(user)

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

@@ -173,15 +173,15 @@ async def update_user_in_group(
     user_id: UserID,
     gid: GroupID,
     the_user_id_in_group: int,
-    new_values_for_user_in_group: dict,
+    access_rights: dict,
 ) -> dict[str, str]:
     async with get_database_engine(app).acquire() as conn:
         return await _db.update_user_in_group(
             conn,
             user_id=user_id,
             gid=gid,
             the_user_id_in_group=the_user_id_in_group,
-            new_values_for_user_in_group=new_values_for_user_in_group,
+            access_rights=access_rights,
         )
 
 

services/web/server/tests/unit/with_dbs/01/test_groups.py

@@ -4,7 +4,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import random
 from collections.abc import AsyncIterator, Callable
 from contextlib import AsyncExitStack
 from copy import deepcopy
@@ -160,7 +159,7 @@ async def test_list_groups(
             )
             response = await client.patch(
                 f"{url}",
-                json={"access_rights": {"read": True, "write": True, "delete": True}},
+                json={"accessRights": {"read": True, "write": True, "delete": True}},
             )
             await assert_status(response, status.HTTP_403_FORBIDDEN)
 
@@ -285,6 +284,7 @@ async def test_add_remove_users_from_group(
     logged_user: UserInfoDict,
     user_role: UserRole,
     expected: ExpectedResponse,
+    faker: Faker,
 ):
     assert client.app
     new_group = {
@@ -295,7 +295,7 @@ async def test_add_remove_users_from_group(
     }
 
     # check that our group does not exist
-    url = client.app.router["get_group_users"].url_for(gid=new_group["gid"])
+    url = client.app.router["get_all_group_users"].url_for(gid=new_group["gid"])
     assert f"{url}" == f"/{API_VTAG}/groups/{new_group['gid']}/users"
     resp = await client.get(f"{url}")
     data, error = await assert_status(resp, expected.not_found)
@@ -323,7 +323,7 @@ async def test_add_remove_users_from_group(
         assert assigned_group["accessRights"] == _DEFAULT_GROUP_OWNER_ACCESS_RIGHTS
 
     # check that our user is in the group of users
-    get_group_users_url = client.app.router["get_group_users"].url_for(
+    get_group_users_url = client.app.router["get_all_group_users"].url_for(
         gid=f"{assigned_group['gid']}"
     )
     assert (
@@ -345,7 +345,7 @@ async def test_add_remove_users_from_group(
     assert (
         f"{add_group_user_url}" == f"/{API_VTAG}/groups/{assigned_group['gid']}/users"
     )
-    num_new_users = random.randint(1, 10)
+    num_new_users = faker.random_int(1, 10)
     created_users_list = []
 
     async with AsyncExitStack() as users_stack: