From 2bcf55ea7fed25416e51a162a4ca6033415d2b79 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Thu, 2 Jan 2025 12:52:58 +0700 Subject: [PATCH] feat: items per page for all equipment masters --- .../__pycache__/router.cpython-311.pyc | Bin 2468 -> 2574 bytes .../__pycache__/service.cpython-311.pyc | Bin 2560 -> 2653 bytes src/equipment_master/router.py | 7 ++++++- src/equipment_master/service.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/equipment_master/__pycache__/router.cpython-311.pyc b/src/equipment_master/__pycache__/router.cpython-311.pyc index 13400543166ca91360a61206743b9684b2d1c1c7..5f0cfad240c841d9decabd77e9a57cf15a266102 100644 GIT binary patch delta 853 zcmZ`$O=uHA6n^`gG(T<9bo0|RCN?QGh*0pNAVm*KwbV;Mum~YIlMpa9?rude(n51v}36+lP~%mqefe5@-qlEnIt6mPn9lWROP45EZCIZhfd7 zKA;f$6=Zn7fP=1=sc!gjo<^4b0vJ z05rsg)Q}s{5ZXc$b*-Lu1qj@hF2R~~SH7c|Qnw*$6e6~zrij(JVBBSJF!^F$(c>8D zqa2bPq8wuEi8Os&?F2ltzse5N8;jL?jV_qQTFEe}ZW#EQka;ARF7un?Pia&UzTvkF zJ0VCPvxbw_kY>dutVjwS$FHWMSjTy%u7VuaIRw&^}xPJ+Z zIZBxQ^5#x*$_qj5LE+wDMBr*%YbTE!_`Mgriv{PhjWn_DZ;6&sR9U- z*KjRk0_p@}2mrf5Bvm4fB}KG_1X#~4NC8Ov;;_lhPbtkwwJS0Oav6cRc+F%-j`tEDIC&U>P684)1SCH& z1L+4mG9OrZCI@q>XoI9U70v@6rIV;ypJTWCND`%G_^w0hJqSDpl+fdN_G__*hLn`v@@*%o5p!jkiI~m z(T$sAvSc4xBN1rzHkK#!l?&8V_kHE8e^c~sU%3a|xVTo8~xPcZe9`72JICli) zt~j$ud7?`zE{~MabZYmT8=511yIGT>(W=&Y-|$3DEq+PPS&15mf~;K*knt0TM5Ouz}&L zz~mg(YR0FVKeJ9?WR#oS!fwb7)~^OsQlvcj0J|Ei9+0Uu`89hVqtN6kjzC74$!9o> zc#1%#6@lc6WGC};N^qG1nT$YOEIiqebA`(XPBBK|4-7Ekfq>)(RuG4cK|o>#b5HFD Yb`Xz)fmd`waE~vVYKT6g$$DJ+05pMS_5c6? diff --git a/src/equipment_master/router.py b/src/equipment_master/router.py index 4341000..a9844ae 100644 --- a/src/equipment_master/router.py +++ b/src/equipment_master/router.py @@ -16,9 +16,14 @@ async def get_all_equipment_master_tree( common: CommonParameters, parent_id: Annotated[Optional[str], Query(description="Parent ID")] = None, search: Optional[str] = Query(None), + items_per_page: Optional[int] = Query(5), ): equipment_masters = await get_all_master( - parent_id=parent_id, search=search, db_session=db_session, common=common + parent_id=parent_id, + search=search, + items_per_page=items_per_page, + db_session=db_session, + common=common, ) return StandardResponse( diff --git a/src/equipment_master/service.py b/src/equipment_master/service.py index 99ddd9e..8c50001 100644 --- a/src/equipment_master/service.py +++ b/src/equipment_master/service.py @@ -19,6 +19,7 @@ async def get_all_master( db_session: DbSession, parent_id: Optional[str] = None, search: Optional[str] = None, + items_per_page: Optional[int] = 5, common, ): @@ -32,6 +33,7 @@ async def get_all_master( query = query.options(recursive_load(5)) + common["items_per_page"] = items_per_page results = await search_filter_sort_paginate(model=query, **common) # results = await db_session.execute(query) # results = results.unique().scalars().all()