only group

Author: pcrespov

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

@@ -79,25 +79,12 @@ async def get_product_group_for_user(
     )
 
 
-async def get_support_group_for_user_or_none(
-    app: web.Application, *, user_id: UserID, support_gid: GroupID
-) -> tuple[Group, AccessRightsDict] | None:
-    """
-    Returns support's group if user belongs to it, otherwise it
-    """
-    with suppress(GroupNotFoundError):
-        return await _groups_repository.get_any_group_for_user(
-            app, user_id=user_id, group_gid=support_gid
-        )
-    return None
-
-
 async def get_user_profile_groups(
     app: web.Application, *, user_id: UserID, product: Product
 ) -> tuple[
     GroupsByTypeTuple,
     tuple[Group, AccessRightsDict] | None,
-    tuple[Group, AccessRightsDict] | None,
+    Group | None,
 ]:
     """
     Get all groups needed for user profile including standard groups,
@@ -120,10 +107,8 @@ async def get_user_profile_groups(
     my_support_group = None
     if product.support_standard_group_id:  # Support group is optional
         # NOTE: my_support_group can be part of groups_by_type.standard!
-        my_support_group = await get_support_group_for_user_or_none(
-            app=app,
-            user_id=user_id,
-            support_gid=product.support_standard_group_id,
+        my_support_group = await get_group_from_gid(
+            app, product.support_standard_group_id
         )
 
     return groups_by_type, my_product_group, my_support_group

services/web/server/tests/unit/with_dbs/03/test_users_rest_profile.py

@@ -7,12 +7,14 @@
 
 
 import functools
+from collections.abc import Iterator
 from copy import deepcopy
 from http import HTTPStatus
 from typing import Any
 from unittest.mock import patch
 
 import pytest
+import sqlalchemy as sa
 from aiohttp.test_utils import TestClient
 from aiopg.sa.connection import SAConnection
 from common_library.users_enums import UserRole
@@ -22,6 +24,7 @@
 from psycopg2 import OperationalError
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
+from pytest_simcore.helpers.postgres_tools import sync_insert_and_get_row_lifespan
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
@@ -47,6 +50,41 @@ def app_environment(
     )
 
 
+@pytest.fixture(scope="module")
+def support_group(
+    postgres_db: sa.engine.Engine,
+    product_name: str,
+) -> Iterator[dict[str, Any]]:
+    """Creates a standard support group and assigns it to the current product"""
+    from simcore_postgres_database.models.groups import groups
+    from simcore_postgres_database.models.products import products
+
+    # Create support group using direct database insertion
+    group_values = {
+        "name": "Support Group",
+        "description": "Support group for product",
+        "type": "STANDARD",
+    }
+
+    with sync_insert_and_get_row_lifespan(
+        postgres_db,
+        table=groups,
+        values=group_values,
+        pk_col=groups.c.gid,
+    ) as group_row:
+        group_id = group_row["gid"]
+
+        # Update product to set support_standard_group_id
+        with postgres_db.begin() as conn:
+            conn.execute(
+                sa.update(products)
+                .where(products.c.name == product_name)
+                .values(support_standard_group_id=group_id)
+            )
+
+        yield group_row
+
+
 @pytest.mark.parametrize(
     "user_role,expected",
     [
@@ -100,6 +138,7 @@ async def test_get_profile(
     primary_group: dict[str, Any],
     standard_groups: list[dict[str, Any]],
     all_group: dict[str, str],
+    support_group: dict[str, Any],
 ):
     assert client.app
 
@@ -130,13 +169,25 @@ async def test_get_profile(
         "thumbnail": None,
     }
 
-    assert got_profile_groups["support"] is None
+    # support group exists
+    assert got_profile_groups["support"]
+    support_group_id = got_profile_groups["support"]["gid"]
 
+    assert support_group_id == support_group["gid"]
+    assert got_profile_groups["support"]["description"] == support_group["description"]
+    assert "accessRights" not in got_profile_groups["support"]
+
+    # standard groups with at least read access
     sorted_by_group_id = functools.partial(sorted, key=lambda d: d["gid"])
     assert sorted_by_group_id(
         got_profile_groups["organizations"]
     ) == sorted_by_group_id(standard_groups)
 
+    # user is NOT part of the support group
+    all_standard_groups_ids = {g["gid"] for g in standard_groups}
+    assert support_group_id not in all_standard_groups_ids
+
+    # preferences
     assert profile.preferences == await get_frontend_user_preferences_aggregation(
         client.app, user_id=logged_user["id"], product_name="osparc"
     )