reduced duplication

Author: pcrespov

packages/postgres-database/src/simcore_postgres_database/utils_users.py

@@ -229,3 +229,30 @@ def is_private(hide_attribute: Column, caller_id: int):
 
 def is_public(hide_attribute: Column, caller_id: int):
     return hide_attribute.is_(False) | (users.c.id == caller_id)
+
+
+def visible_user_profile_cols(caller_id: int):
+    """Returns user profile columns with visibility constraints applied based on privacy settings."""
+    return (
+        sa.case(
+            (
+                is_private(users.c.privacy_hide_email, caller_id),
+                None,
+            ),
+            else_=users.c.email,
+        ).label("email"),
+        sa.case(
+            (
+                is_private(users.c.privacy_hide_fullname, caller_id),
+                None,
+            ),
+            else_=users.c.first_name,
+        ).label("first_name"),
+        sa.case(
+            (
+                is_private(users.c.privacy_hide_fullname, caller_id),
+                None,
+            ),
+            else_=users.c.last_name,
+        ).label("last_name"),
+    )

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

@@ -25,7 +25,7 @@
     pass_or_acquire_connection,
     transaction_context,
 )
-from simcore_postgres_database.utils_users import is_private, is_public
+from simcore_postgres_database.utils_users import is_public, visible_user_profile_cols
 from sqlalchemy import and_
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine.row import Row
@@ -443,28 +443,7 @@ def _group_user_cols(caller_id: UserID):
     return (
         users.c.id,
         users.c.name,
-        # privacy settings
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_email, caller_id),
-                None,
-            ),
-            else_=users.c.email,
-        ).label("email"),
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_fullname, caller_id),
-                None,
-            ),
-            else_=users.c.first_name,
-        ).label("first_name"),
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_fullname, caller_id),
-                None,
-            ),
-            else_=users.c.last_name,
-        ).label("last_name"),
+        *visible_user_profile_cols(caller_id),
         users.c.primary_gid,
     )
 

services/web/server/src/simcore_service_webserver/users/_users_repository.py

@@ -30,8 +30,8 @@
 from simcore_postgres_database.utils_users import (
     UsersRepo,
     generate_alternative_username,
-    is_private,
     is_public,
+    visible_user_profile_cols,
 )
 from sqlalchemy import delete
 from sqlalchemy.engine.row import Row
@@ -59,28 +59,7 @@ def _public_user_cols(caller_id: int):
         # Fits PublicUser model
         users.c.id.label("user_id"),
         users.c.name.label("user_name"),
-        # privacy settings
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_email, caller_id),
-                None,
-            ),
-            else_=users.c.email,
-        ).label("email"),
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_fullname, caller_id),
-                None,
-            ),
-            else_=users.c.first_name,
-        ).label("first_name"),
-        sa.case(
-            (
-                is_private(users.c.privacy_hide_fullname, caller_id),
-                None,
-            ),
-            else_=users.c.last_name,
-        ).label("last_name"),
+        *visible_user_profile_cols(caller_id),
         users.c.primary_gid.label("group_id"),
     )