Skip to content

Commit f60ca0a

Browse files
committed
updates search on names
1 parent c555613 commit f60ca0a

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

api/specs/web-server/_groups.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# pylint: disable=too-many-arguments
55

66

7+
from enum import Enum
78
from typing import Annotated, Any
89

910
from fastapi import APIRouter, Depends, status
@@ -87,19 +88,24 @@ async def delete_group(_path: Annotated[GroupsPathParams, Depends()]):
8788
"""
8889

8990

91+
_extra_tags: list[str | Enum] = ["users"]
92+
93+
9094
@router.get(
9195
"/groups/{gid}/users",
9296
response_model=Envelope[list[GroupUserGet]],
97+
tags=_extra_tags,
9398
)
9499
async def get_all_group_users(_path: Annotated[GroupsPathParams, Depends()]):
95100
"""
96-
Gets users in organization groups
101+
Gets users in organization or primary groups
97102
"""
98103

99104

100105
@router.post(
101106
"/groups/{gid}/users",
102107
status_code=status.HTTP_204_NO_CONTENT,
108+
tags=_extra_tags,
103109
)
104110
async def add_group_user(
105111
_path: Annotated[GroupsPathParams, Depends()],
@@ -113,6 +119,7 @@ async def add_group_user(
113119
@router.get(
114120
"/groups/{gid}/users/{uid}",
115121
response_model=Envelope[GroupUserGet],
122+
tags=_extra_tags,
116123
)
117124
async def get_group_user(
118125
_path: Annotated[GroupsUsersPathParams, Depends()],
@@ -125,6 +132,7 @@ async def get_group_user(
125132
@router.patch(
126133
"/groups/{gid}/users/{uid}",
127134
response_model=Envelope[GroupUserGet],
135+
tags=_extra_tags,
128136
)
129137
async def update_group_user(
130138
_path: Annotated[GroupsUsersPathParams, Depends()],
@@ -138,6 +146,7 @@ async def update_group_user(
138146
@router.delete(
139147
"/groups/{gid}/users/{uid}",
140148
status_code=status.HTTP_204_NO_CONTENT,
149+
tags=_extra_tags,
141150
)
142151
async def delete_group_user(
143152
_path: Annotated[GroupsUsersPathParams, Depends()],

api/specs/web-server/_users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from simcore_service_webserver.users._notifications_rest import _NotificationPathParams
3434
from simcore_service_webserver.users._tokens_rest import _TokenPathParams
3535

36-
router = APIRouter(prefix=f"/{API_VTAG}", tags=["user"])
36+
router = APIRouter(prefix=f"/{API_VTAG}", tags=["users"])
3737

3838

3939
@router.get(

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ async def search_public_user(
139139
_is_public(users.c.privacy_hide_email, caller_id)
140140
& users.c.email.ilike(_pattern)
141141
)
142+
| (
143+
_is_public(users.c.privacy_hide_fullname, caller_id)
144+
& (
145+
users.c.first_name.ilike(_pattern)
146+
| users.c.last_name.ilike(_pattern)
147+
)
148+
)
142149
)
143150
.limit(limit)
144151
)

0 commit comments

Comments
 (0)