fixing test

Author: pcrespov

packages/models-library/src/models_library/rest_ordering.py

@@ -51,7 +51,7 @@ def create_ordering_query_model_classes(
     msg_direction_options = "|".join(sorted(OrderDirection))
 
     class _OrderBy(OrderBy):
-        @validator("field", allow_reuse=True)
+        @validator("field", allow_reuse=True, always=True)
         @classmethod
         def _check_if_ordering_field(cls, v):
             if v not in ordering_fields:

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

@@ -91,7 +91,7 @@ class ServicesResourceUsagesReportQueryParams(
         example='{"started_at": {"from": "yyyy-mm-dd", "until": "yyyy-mm-dd"}}',
     )
 
-    @validator("order_by")
+    @validator("order_by", always=True)
     @classmethod
     def _post_rename_order_by_field(cls, v):
         if v.field == "credit_cost":

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

@@ -89,9 +89,11 @@ class WorkspacesListQueryParams(
     PageQueryParameters,
     WorkspacesListOrderQueryParams,  # type: ignore[misc, valid-type]
 ):
-    @validator("order_by", check_fields=False)
+    @validator("order_by", check_fields=False, always=True)
     @classmethod
     def _post_rename_order_by_field(cls, v):
+        # NOTE: PC->MD this is very error-prone (e.g. w/ defaults).
+        # Rather create a map to a db interface
         if v.field == "modified_at":
             v.field = "modified"
         return v

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces.py

@@ -8,6 +8,7 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from models_library.api_schemas_webserver.workspaces import WorkspaceGet
+from models_library.rest_ordering import OrderDirection
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import (
@@ -17,6 +18,26 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
+from simcore_service_webserver.workspaces._workspaces_handlers import (
+    WorkspacesListQueryParams,
+)
+
+
+def test_workspaces_order_query_model_post_validator():
+
+    # on default
+    query_params = WorkspacesListQueryParams.parse_obj({})
+    assert query_params.order_by
+    assert query_params.order_by.field == "modified"
+    assert query_params.order_by.direction == OrderDirection.DESC
+
+    # on partial default
+    query_params = WorkspacesListQueryParams.parse_obj(
+        {"order_by": {"field": "modified_at"}}
+    )
+    assert query_params.order_by
+    assert query_params.order_by.field == "modified"
+    assert query_params.order_by.direction == OrderDirection.ASC
 
 
 @pytest.mark.parametrize(*standard_role_response(), ids=str)