crud operations

Author: pcrespov

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

@@ -17,7 +17,7 @@
     pass_or_acquire_connection,
     transaction_context,
 )
-from sqlalchemy import and_, literal_column
+from sqlalchemy import and_
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncConnection
@@ -96,7 +96,7 @@ async def _get_group_and_access_rights_or_raise(
 ) -> Row:
     result = await conn.stream(
         sa.select(
-            groups,
+            *_GROUP_COLUMNS,
             user_to_groups.c.access_rights,
         )
         .select_from(user_to_groups.join(groups, user_to_groups.c.gid == groups.c.gid))
@@ -302,22 +302,24 @@ async def update_user_group(
             k: v for k, v in convert_groups_schema_to_db(new_group_values).items() if v
         }
 
-        group = await _get_group_and_access_rights_or_raise(
+        row = await _get_group_and_access_rights_or_raise(
             conn, user_id=user_id, gid=gid
         )
-        _check_group_permissions(group, user_id, gid, "write")
+        assert row.gid == gid  # nosec
+        _check_group_permissions(row, user_id, gid, "write")
+        access_rights = AccessRightsDict(**row.access_rights)
 
         result = await conn.stream(
             # pylint: disable=no-value-for-parameter
             groups.update()
             .values(**new_values)
-            .where(groups.c.gid == group.gid)
-            .returning(literal_column("*"))
+            .where(groups.c.gid == row.gid)
+            .returning(*_GROUP_COLUMNS)
         )
         row = await result.fetchone()
         assert row  # nosec
 
-        group, access_rights = _to_group_info_tuple(row)
+        group = _row_to_model(row)
         return group, access_rights
 
 

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

@@ -128,13 +128,12 @@ async def update_group(request: web.Request):
     req_ctx = GroupsRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(GroupsPathParams, request)
     update: GroupUpdate = await parse_request_body_as(GroupUpdate, request)
-    new_group_values = update.model_dump(exclude_unset=True)
 
     group, access_rights = await _groups_api.update_organization(
         request.app,
         user_id=req_ctx.user_id,
         group_id=path_params.gid,
-        new_group_values=new_group_values,
+        new_group_values=update.model_dump(exclude_unset=True),
     )
 
     updated_group = GroupGet.from_model(group, access_rights)

services/web/server/tests/unit/with_dbs/01/groups/conftest.py

@@ -0,0 +1,43 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-statements
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+
+from collections.abc import Callable
+
+import pytest
+import sqlalchemy as sa
+from aiohttp.test_utils import TestClient
+from pytest_simcore.helpers.typing_env import EnvVarsDict
+from servicelib.aiohttp.application import create_safe_application
+from simcore_service_webserver.application_settings import setup_settings
+from simcore_service_webserver.db.plugin import setup_db
+from simcore_service_webserver.groups.plugin import setup_groups
+from simcore_service_webserver.login.plugin import setup_login
+from simcore_service_webserver.rest.plugin import setup_rest
+from simcore_service_webserver.security.plugin import setup_security
+from simcore_service_webserver.session.plugin import setup_session
+from simcore_service_webserver.users.plugin import setup_users
+
+
+@pytest.fixture
+def client(
+    event_loop,
+    aiohttp_client: Callable,
+    app_environment: EnvVarsDict,
+    postgres_db: sa.engine.Engine,
+) -> TestClient:
+    app = create_safe_application()
+
+    setup_settings(app)
+    setup_db(app)
+    setup_session(app)
+    setup_security(app)
+    setup_rest(app)
+    setup_login(app)
+    setup_users(app)
+    setup_groups(app)
+
+    return event_loop.run_until_complete(aiohttp_client(app))