Skip to content

Commit 58fb915

Browse files
review @pcrespov
1 parent 2865426 commit 58fb915

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

services/web/server/src/simcore_service_webserver/projects/_projects_repository_legacy.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from aiopg.sa.result import ResultProxy, RowProxy
1818
from models_library.basic_types import IDStr
1919
from models_library.folders import FolderQuery, FolderScope
20+
from models_library.groups import GroupID
2021
from models_library.products import ProductName
2122
from models_library.projects import ProjectID, ProjectIDStr
2223
from models_library.projects_comments import CommentID, ProjectsCommentsDB
@@ -354,7 +355,7 @@ def _create_private_workspace_query(
354355
user_id: UserID,
355356
workspace_query: WorkspaceQuery,
356357
is_search_by_multi_columns: bool,
357-
user_groups: list[int],
358+
user_groups: list[GroupID],
358359
) -> sql.Select | None:
359360
private_workspace_query = None
360361
if workspace_query.workspace_scope is not WorkspaceScope.SHARED:
@@ -402,10 +403,12 @@ def _create_private_workspace_query(
402403
).label("access_rights"),
403404
)
404405
.where(
405-
project_to_groups.c.read, # Filters out entries where "read" is False
406-
project_to_groups.c.gid.in_(
407-
user_groups
408-
), # Filters gid to be in user_groups
406+
(
407+
project_to_groups.c.read
408+
) # Filters out entries where "read" is False
409+
& (
410+
project_to_groups.c.gid.in_(user_groups)
411+
) # Filters gid to be in user_groups
409412
)
410413
.group_by(project_to_groups.c.project_uuid)
411414
).subquery("my_access_rights_subquery")
@@ -457,7 +460,7 @@ def _create_shared_workspace_query(
457460
product_name: ProductName,
458461
workspace_query: WorkspaceQuery,
459462
is_search_by_multi_columns: bool,
460-
user_groups: list[int],
463+
user_groups: list[GroupID],
461464
) -> sql.Select | None:
462465

463466
if workspace_query.workspace_scope is not WorkspaceScope.PRIVATE:
@@ -655,7 +658,7 @@ async def list_projects_dicts( # pylint: disable=too-many-arguments,too-many-st
655658
user_groups_proxy: list[RowProxy] = await self._list_user_groups(
656659
conn, user_id
657660
)
658-
user_groups: list[int] = [group.gid for group in user_groups_proxy]
661+
user_groups: list[GroupID] = [group.gid for group in user_groups_proxy]
659662

660663
###
661664
# Private workspace query

0 commit comments

Comments
 (0)