@ -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")
@ -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):