order-by conversion

Author: pcrespov

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

@@ -10,7 +10,6 @@
 from models_library.rest_ordering import OrderBy
 from models_library.rest_pagination import Page
 from models_library.rest_pagination_utils import paginate_data
-from pydantic import TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -82,7 +81,7 @@ async def list_folders(request: web.Request):
         trashed=query_params.filters.trashed,
         offset=query_params.offset,
         limit=query_params.limit,
-        order_by=OrderBy.model_validate(query_params.order_by),
+        order_by=OrderBy.model_construct(**query_params.order_by.model_dump()),
     )
 
     page = Page[FolderGet].model_validate(
@@ -121,7 +120,7 @@ async def list_folders_full_search(request: web.Request):
         trashed=query_params.filters.trashed,
         offset=query_params.offset,
         limit=query_params.limit,
-        order_by=TypeAdapter(OrderBy).validate_python(query_params.order_by),
+        order_by=OrderBy(**query_params.order_by.model_dump()),
     )
 
     page = Page[FolderGet].model_validate(

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

@@ -203,7 +203,7 @@ async def list_projects(request: web.Request):
         limit=query_params.limit,
         offset=query_params.offset,
         search=query_params.search,
-        order_by=OrderBy.model_validate(query_params.order_by),
+        order_by=OrderBy.model_construct(**query_params.order_by.model_dump()),
         folder_id=query_params.folder_id,
         workspace_id=query_params.workspace_id,
     )
@@ -241,7 +241,7 @@ async def list_projects_full_search(request: web.Request):
         limit=query_params.limit,
         offset=query_params.offset,
         text=query_params.text,
-        order_by=query_params.order_by,
+        order_by=OrderBy(**query_params.order_by.model_dump()),
         tag_ids_list=tag_ids_list,
     )
 

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

@@ -136,7 +136,7 @@ async def list_resource_usage_services(request: web.Request):
         wallet_id=query_params.wallet_id,
         offset=query_params.offset,
         limit=query_params.limit,
-        order_by=OrderBy.model_validate(query_params.order_by),
+        order_by=OrderBy.model_construct(**query_params.order_by.model_dump()),
         filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(
             query_params.filters
         ),
@@ -216,7 +216,7 @@ async def export_resource_usage_services(request: web.Request):
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
         wallet_id=query_params.wallet_id,
-        order_by=TypeAdapter(OrderBy | None).validate_python(query_params.order_by),
+        order_by=OrderBy(**query_params.order_by.model_dump()),
         filters=TypeAdapter(ServiceResourceUsagesFilters | None).validate_python(
             query_params.filters
         ),

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

@@ -79,7 +79,7 @@ async def list_workspaces(request: web.Request):
         filter_trashed=query_params.filters.trashed,
         offset=query_params.offset,
         limit=query_params.limit,
-        order_by=OrderBy.model_validate(query_params.order_by),
+        order_by=OrderBy.model_construct(**query_params.order_by.model_dump()),
     )
 
     page = Page[WorkspaceGet].model_validate(