Skip to content

Commit 688b512

Browse files
review @pcrespov
1 parent 6cd08aa commit 688b512

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
from models_library.projects_nodes_io import NodeID
1313
from models_library.rest_ordering import OrderBy, OrderDirection
1414
from models_library.rest_pagination import PageQueryParameters
15-
from models_library.utils.common_validators import null_or_none_str_to_none_validator
15+
from models_library.utils.common_validators import (
16+
empty_str_to_none_pre_validator,
17+
null_or_none_str_to_none_validator,
18+
)
1619
from models_library.workspaces import WorkspaceID
1720
from pydantic import BaseModel, Extra, Field, Json, root_validator, validator
1821
from servicelib.common_headers import (
@@ -160,9 +163,6 @@ class ProjectListFullSearchParams(PageQueryParameters):
160163
example="My Project",
161164
)
162165

163-
@validator("text", pre=True)
164-
@classmethod
165-
def text_check_empty_string(cls, v):
166-
if not v:
167-
return None
168-
return v
166+
_empty_is_none = validator("text", allow_reuse=True, pre=True)(
167+
empty_str_to_none_pre_validator
168+
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ async def list_projects_full_search(
630630
private_workspace_query, shared_workspace_query
631631
)
632632

633-
count_query = sa.select([func.count()]).select_from(combined_query)
633+
count_query = sa.select(func.count()).select_from(combined_query)
634634
total_count = await conn.scalar(count_query)
635635

636636
list_query = combined_query.offset(offset).limit(limit)

0 commit comments

Comments
 (0)