From 1409f486adf8d06ae1051af76abb47f6766c92b1 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Fri, 10 Oct 2025 10:04:22 +0700 Subject: [PATCH] fix --- src/standard_scope/schema.py | 3 ++- src/standard_scope/service.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/standard_scope/schema.py b/src/standard_scope/schema.py index d2621f0..7eb0ab5 100644 --- a/src/standard_scope/schema.py +++ b/src/standard_scope/schema.py @@ -37,8 +37,9 @@ class ScopeEquipmentRead(ScopeEquipmentBase): master_equipment: Optional[MasterEquipmentBase] = Field(None) -class ScopeEquipmentPagination(Pagination): +class ScopeEquipmentPagination(DefultBase): items: List[ScopeEquipmentRead] = [] + total: int class MasterEquipmentRead(DefultBase): assetnum: Optional[str] = Field(None, title="Asset Number") diff --git a/src/standard_scope/service.py b/src/standard_scope/service.py index 5456c1c..8e0b831 100644 --- a/src/standard_scope/service.py +++ b/src/standard_scope/service.py @@ -60,8 +60,15 @@ async def get_all(*, common, oh_scope: Optional[str] = None): # ).distinct() ) - results = await search_filter_sort_paginate(model=query, **common) - return results + results = await common['db_session'].execute(query) + + items = results.scalars().all() + + + return { + "items": items, + "total": len(items) + } async def get_by_oh_session_id(*, db_session: DbSession, oh_session_id: UUID):