rm mapping

Author: pcrespov

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

@@ -1,5 +1,3 @@
-from aiopg.sa.result import RowProxy
-
 _GROUPS_SCHEMA_TO_DB = {
     "gid": "gid",
     "label": "name",
@@ -10,18 +8,6 @@
 }
 
 
-def convert_groups_db_to_schema(
-    db_row: RowProxy, *, prefix: str | None = "", **kwargs
-) -> dict:
-    converted_dict = {
-        k: db_row[f"{prefix}{v}"]
-        for k, v in _GROUPS_SCHEMA_TO_DB.items()
-        if f"{prefix}{v}" in db_row
-    }
-    converted_dict.update(**kwargs)
-    return converted_dict
-
-
 def convert_groups_schema_to_db(schema: dict) -> dict:
     return {
         v: schema[k]

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

@@ -31,7 +31,6 @@
 from simcore_postgres_database.utils_users import generate_alternative_username
 
 from ..db.plugin import get_database_engine
-from ..groups.models import convert_groups_db_to_schema
 from ..login.storage import AsyncpgStorage, get_plugin_storage
 from ..security.api import clean_auth_policy_cache
 from . import _db
@@ -47,6 +46,28 @@
 _logger = logging.getLogger(__name__)
 
 
+_GROUPS_SCHEMA_TO_DB = {
+    "gid": "gid",
+    "label": "name",
+    "description": "description",
+    "thumbnail": "thumbnail",
+    "accessRights": "access_rights",
+    "inclusionRules": "inclusion_rules",
+}
+
+
+def _convert_groups_db_to_schema(
+    db_row: RowProxy, *, prefix: str | None = "", **kwargs
+) -> dict:
+    converted_dict = {
+        k: db_row[f"{prefix}{v}"]
+        for k, v in _GROUPS_SCHEMA_TO_DB.items()
+        if f"{prefix}{v}" in db_row
+    }
+    converted_dict.update(**kwargs)
+    return converted_dict
+
+
 def _parse_as_user(user_id: Any) -> UserID:
     try:
         return TypeAdapter(UserID).validate_python(user_id)
@@ -64,7 +85,7 @@ async def get_user_profile(
 
     engine = get_database_engine(app)
     user_profile: dict[str, Any] = {}
-    user_primary_group = all_group = {}
+    user_primary_group = everyone_group = {}
     user_standard_groups = []
     user_id = _parse_as_user(user_id)
 
@@ -99,20 +120,20 @@ async def get_user_profile(
                 assert user_profile["id"] == user_id  # nosec
 
             if row.groups_type == GroupType.EVERYONE:
-                all_group = convert_groups_db_to_schema(
+                everyone_group = _convert_groups_db_to_schema(
                     row,
                     prefix="groups_",
                     accessRights=row["user_to_groups_access_rights"],
                 )
             elif row.groups_type == GroupType.PRIMARY:
-                user_primary_group = convert_groups_db_to_schema(
+                user_primary_group = _convert_groups_db_to_schema(
                     row,
                     prefix="groups_",
                     accessRights=row["user_to_groups_access_rights"],
                 )
             else:
                 user_standard_groups.append(
-                    convert_groups_db_to_schema(
+                    _convert_groups_db_to_schema(
                         row,
                         prefix="groups_",
                         accessRights=row["user_to_groups_access_rights"],
@@ -147,7 +168,7 @@ async def get_user_profile(
         groups={  # type: ignore[arg-type]
             "me": user_primary_group,
             "organizations": user_standard_groups,
-            "all": all_group,
+            "all": everyone_group,
         },
         privacy=MyProfilePrivacyGet(
             hide_fullname=user_profile["privacy_hide_fullname"],