cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_core_utils.py

@@ -7,7 +7,7 @@
 from models_library.users import UserID
 from simcore_postgres_database.aiopg_errors import DatabaseError
 
-from ..groups.api import get_group_from_gid
+from ..groups.api import get_group_by_gid
 from ..projects._projects_repository_legacy import (
     APP_PROJECT_DBAPI,
     ProjectAccessRights,
@@ -83,7 +83,7 @@ async def get_new_project_owner_gid(
     standard_groups = {}  # groups of users, multiple users can be part of this
     primary_groups = {}  # each individual user has a unique primary group
     for other_gid in other_users_access_rights:
-        group: Group | None = await get_group_from_gid(app=app, group_id=int(other_gid))
+        group: Group | None = await get_group_by_gid(app=app, group_id=int(other_gid))
 
         # only process for users and groups with write access right
         if group is None:

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

@@ -148,19 +148,19 @@ async def _get_group_and_access_rights_or_raise(
 #
 
 
-async def get_group_from_gid(
+async def get_group_by_gid(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     group_id: GroupID,
 ) -> Group | None:
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        row = await conn.execute(
+        result = await conn.execute(
             sa.select(*_GROUP_COLUMNS).where(groups.c.gid == group_id)
         )
-        result = row.first()
-        if result:
-            return Group.model_validate(result, from_attributes=True)
+        row = result.one_or_none()
+        if row:
+            return Group.model_validate(row, from_attributes=True)
         return None
 
 

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

@@ -26,8 +26,8 @@
 #
 
 
-async def get_group_from_gid(app: web.Application, group_id: GroupID) -> Group | None:
-    group_db = await _groups_repository.get_group_from_gid(app, group_id=group_id)
+async def get_group_by_gid(app: web.Application, group_id: GroupID) -> Group | None:
+    group_db = await _groups_repository.get_group_by_gid(app, group_id=group_id)
 
     if group_db:
         return Group.model_construct(**group_db.model_dump())
@@ -107,7 +107,7 @@ async def get_user_profile_groups(
     product_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!
-        product_support_group = await get_group_from_gid(
+        product_support_group = await get_group_by_gid(
             app, product.support_standard_group_id
         )
 

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

@@ -5,7 +5,7 @@
     add_user_in_group,
     auto_add_user_to_groups,
     auto_add_user_to_product_group,
-    get_group_from_gid,
+    get_group_by_gid,
     get_product_group_for_user,
     get_user_profile_groups,
     is_user_by_email_in_group,
@@ -19,7 +19,7 @@
     "add_user_in_group",
     "auto_add_user_to_groups",
     "auto_add_user_to_product_group",
-    "get_group_from_gid",
+    "get_group_by_gid",
     "get_product_group_for_user",
     "get_user_profile_groups",
     "is_user_by_email_in_group",

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py

@@ -57,7 +57,7 @@
 from ..._meta import API_VTAG as VTAG
 from ...catalog import catalog_service
 from ...dynamic_scheduler import api as dynamic_scheduler_service
-from ...groups.api import get_group_from_gid, list_all_user_groups_ids
+from ...groups import api as groups_service
 from ...groups.exceptions import GroupNotFoundError
 from ...login.decorators import login_required
 from ...models import ClientSessionHeaderParams
@@ -578,7 +578,7 @@ async def get_project_services_access_for_gid(request: web.Request) -> web.Respo
     groups_to_compare = {EVERYONE_GROUP_ID}
 
     # Get the group from the provided group ID
-    _sharing_with_group: Group | None = await get_group_from_gid(
+    _sharing_with_group: Group | None = await groups_service.get_group_by_gid(
         app=request.app, group_id=query_params.for_gid
     )
 
@@ -591,7 +591,7 @@ async def get_project_services_access_for_gid(request: web.Request) -> web.Respo
         _user_id = await users_service.get_user_id_from_gid(
             app=request.app, primary_gid=query_params.for_gid
         )
-        user_groups_ids = await list_all_user_groups_ids(
+        user_groups_ids = await groups_service.list_all_user_groups_ids(
             app=request.app, user_id=_user_id
         )
         groups_to_compare.update(set(user_groups_ids))