Skip to content

Commit 90fa182

Browse files
committed
@odeimaiz review: wrong field
1 parent a9346b8 commit 90fa182

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

services/web/server/src/simcore_service_webserver/folders/_models.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ class FolderFilters(Filters):
4141

4242

4343
_FolderOrderQueryParams: type[RequestParameters] = create_ordering_query_model_classes(
44-
ordering_fields={"modified", "name", "description"},
45-
default=OrderBy(field=IDStr("modified"), direction=OrderDirection.DESC),
44+
ordering_fields={
45+
"modified_at",
46+
"name",
47+
},
48+
default=OrderBy(field=IDStr("modified_at"), direction=OrderDirection.DESC),
4649
)
4750

4851

@@ -70,6 +73,13 @@ class Config:
7073
"workspace_id", allow_reuse=True, pre=True
7174
)(null_or_none_str_to_none_validator)
7275

76+
@validator("order_by", always=True)
77+
@classmethod
78+
def _post_rename_order_by_field_as_db_column(cls, v):
79+
if v.field == "modified_at": # API field
80+
v.field = "modified" # DB column
81+
return v
82+
7383

7484
class FolderSearchQueryParams(
7585
PageQueryParameters, _FolderOrderQueryParams, FiltersQueryParameters[FolderFilters] # type: ignore[misc, valid-type]

services/web/server/src/simcore_service_webserver/resource_usage/_service_runs_handlers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ class ServicesResourceUsagesReportQueryParams(
9393

9494
@validator("order_by", always=True)
9595
@classmethod
96-
def _post_rename_order_by_field(cls, v):
97-
if v.field == "credit_cost":
98-
v.field = "osparc_credits"
96+
def _post_rename_order_by_field_as_db_column(cls, v):
97+
if v.field == "credit_cost": # API field
98+
v.field = "osparc_credits" # DB column
9999
return v
100100

101101
class Config:

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_handlers.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class WorkspacesPathParams(StrictRequestParameters):
7979
ordering_fields={
8080
"modified_at",
8181
"name",
82-
"description",
8382
},
8483
default=OrderBy(field=IDStr("modified_at"), direction=OrderDirection.DESC),
8584
)
@@ -89,13 +88,13 @@ class WorkspacesListQueryParams(
8988
PageQueryParameters,
9089
WorkspacesListOrderQueryParams, # type: ignore[misc, valid-type]
9190
):
92-
@validator("order_by", check_fields=False, always=True)
91+
@validator("order_by", always=True)
9392
@classmethod
94-
def _post_rename_order_by_field(cls, v):
93+
def _post_rename_order_by_field_as_db_column(cls, v):
9594
# NOTE: PC->MD this is very error-prone (e.g. w/ defaults).
9695
# Rather create a map to a db interface
97-
if v.field == "modified_at":
98-
v.field = "modified"
96+
if v.field == "modified_at": # API field
97+
v.field = "modified" # DB column
9998
return v
10099

101100

0 commit comments

Comments
 (0)