From 2926794fbe3e285a05750acb860cc9085dbc48c1 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Fri, 12 Dec 2025 16:20:07 +0700
Subject: [PATCH] paginate the top 10 equipments service

---
 .../__pycache__/service.cpython-311.pyc       | Bin 5563 -> 6538 bytes
 src/database/service.py                       |  34 ++++++++++++++++--
 .../__pycache__/router.cpython-311.pyc        | Bin 11559 -> 11604 bytes
 .../__pycache__/schema.cpython-311.pyc        | Bin 13535 -> 13820 bytes
 .../__pycache__/service.cpython-311.pyc       | Bin 24836 -> 24229 bytes
 src/equipment/router.py                       |  15 ++++----
 src/equipment/schema.py                       |   4 ++-
 src/equipment/service.py                      |  30 +++++-----------
 8 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/database/__pycache__/service.cpython-311.pyc b/src/database/__pycache__/service.cpython-311.pyc
index 1146faf6c725dd09d50b8f659139886dc74b3045..1744fccb026e4c13a755b3e11987f46de43cc0d1 100644
GIT binary patch
delta 1289
zcmZuxU2NM_6ux%iIEkIaNt&N+?Qm9gO(<c~nhL2EY=f0*TiMnQG%12cUgEXZoTR$G
zrL=OC3KgkT6>GUejd;osbQOC*&_^VA;)SOK{16#}$^)+u2_f;o1J_AfHG<=Nj_*A`
z-#PX<_SYkuquwVTj~fsg{dq!J4(@oP)K^~)U!$YB^Xnijx<K!hi{p3c8{F_ZlaA%6
zJ0OubXwY|^XDJJ!ODwtD2><yD(e45rR58W&;oliwxkSx_60K8L!COC;Y{>HJl5X20
z-cOHlN_O3@QCoewJx857asnj=F~<j>GdX&XCQ*bt1Qldu?~-oI*>d(hlI3Y9lZzNi
z4&4DS<6Dj>{)6%MlS)S3B=IG-<V4(2Bmg>#cs$2NpM`$pJE3NDR(GC&Bqj=MJ*U%E
zC%(dlUSxV7gV;Vo!4vWJUVDyt&@LW^j}RjNMfj#`3zvI?3AmxtqzR7InVUtJmsDj{
z7VpeVUs1CQa(+dGvbLlm5f+y<Q7NFJcx(1GQ7#|_DY7OmD`-JfrF*g}=frGLUCI|U
zQ9?)}!MW$5RhQ|?WRP@El`|RBnaP)>#YLqse-m0SD&aPr_hpn_kW|%V(9)tR!;4l7
zJ1-*w15HLja$Ymtil!7aBo(r<Y14?F)jAGv)N;3}av|X|9i3uLyHzcmY+K0IbQ6(z
zTT+)~%`CHvP{~Vh#booHQcT+edBtQpcB{SO5y4>#B9xKeK~Tz~Ob0&GE(y*O+ik*{
zlMLJ%XgL5Mcz9{^Ql0BJxc;@P4c@ypdFTtaK#)na#fGgJI$f@e?xY{3H{1>1sTQDI
zp$6Y~80fFeJW6h`zj1->7b-XET-@N|Ex@}H&G0}aTOHp=^>E4vr#7Y<zHkfJJY$V>
zi6_ZVl8-NZdZ7hq|5#h>T;G1B5^6?b)xpoSdSt|ijF23mv1as{D!U)tm+R3?%7~_F
z(bV4!-v4lVbGj0#^D%>u)!OSX2M~hW<L{TZ%GKBpzQLMrupxwY`49QZ-MTPj2t&2@
zI_xUbbs=sD@mhNwa>Cj)PH<<a^@B<7HpN^d-)(!O@fZ9+U(XDCJ7b8wo&o%;CxkD1
z1}M&&eyn+>{@?W<&o0w$D*o7e*1^M9$;-#zd0(R8EcW{5xHrfdUbn;~UiD45=g77|
zSo;8f>-&jo3PaWVbs=d8Nqis_xh5a0p0D!>gHPZI|266ye$W3s1E)v?emxL(Sp9`_
hxD+_;E|RVFSJ7ezj{`+o7(YY#Ti{r{jQyd{{{@6}O@jac

delta 354
zcmeA&-mT5IoR^o20SFG}@?>%dOyrYbT(eQ#lSzn^0TrgGPwrsy=2mNAjZ#Qq3}(>O
z*nE#EoMUo1zbNB_&At2qjEtU>?+KW()bK6focxegiD>~Bh?;C5D9XqUWQk0U5|m}+
z0ke7pJuuXL5bQU)#hO`?np<2X0d&wUu9Ezc#GHV{^wi=aIgkJ=SU{8a7FT9*W?peg
zVqS9U<P}18+_%_^lM{0ii;9a>CchAh<8uP3W-Cf9F3l+^a+n+_Y|Z5d6bb<1;#HHU
z3E!5yAs{xLZxY`{0fj393fBcxE(xey6i~Y&pf<TiBwz9dk5Io~m)}JmnJYXp*Lf5!
z@hDv6QM$sTH2Ir|C!^wI2hmfkx0s7diYD`mX)yXtwiT1&N&p(p2(mzEbD~&26QjfA
H2NJ6Q1?Xt!

diff --git a/src/database/service.py b/src/database/service.py
index fb82d27..b797248 100644
--- a/src/database/service.py
+++ b/src/database/service.py
@@ -77,6 +77,36 @@ def search(*, query_str: str, query: Query, model, sort=False):
     return query.params(term=query_str)
 
 
+def _extract_result_items(result):
+    """Normalize SQLAlchemy result rows into ORM entities with labeled columns attached."""
+
+    rows = result.fetchall()
+    items = []
+
+    for row in rows:
+        row_values = tuple(row)
+        if not row_values:
+            continue
+
+        primary = row_values[0]
+
+        if hasattr(primary, "__table__"):
+            mapping = getattr(row, "_mapping", None)
+            if mapping:
+                for key, value in mapping.items():
+                    if isinstance(key, str):
+                        setattr(primary, key, value)
+            items.append(primary)
+        else:
+            # Fall back to first column (scalar or tuple) if no ORM entity is present.
+            if len(row_values) == 1:
+                items.append(primary)
+            else:
+                items.append(row_values)
+
+    return items
+
+
 async def search_filter_sort_paginate(
     db_session: DbSession,
     model,
@@ -106,7 +136,7 @@ async def search_filter_sort_paginate(
     total = await db_session.scalar(count_query)
     if all:
         result = await db_session.execute(query)
-        items = result.scalars().all()
+        items = _extract_result_items(result)
         return {
             "items": items,
             "itemsPerPage": total,
@@ -118,7 +148,7 @@ async def search_filter_sort_paginate(
     query = query.offset((page - 1) * items_per_page).limit(items_per_page)
 
     result = await db_session.execute(query)
-    items = result.scalars().all()
+    items = _extract_result_items(result)
 
     # try:
     #     query, pagination = apply_pagination(
diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc
index a8404e004ee015c873efd4fc4173996f592b55da..9e291407b3621d2749ebb281798e66fe5823662d 100644
GIT binary patch
delta 2557
zcmcIkZ%kWN6o2ovuatH;C=@6yw1v_?lmTTFx{VDsVR0(ibdHQSH)#7VTW23-x9xP8
z2s87;k~xF-t8tqjToyHcAjWAlS&T6zi?K_HF-?~2n;H{?iN>gj@tphG@-Ok5(4O9N
z&hMP_JLjGIZY!%w&Fz{RivWMGKirr4V7bO2`j!J3t7cd1qM!<DReJeWXi@VjUap$c
z?OKQ8<LByhr{-7u{A@`Fw4f5yLQ071)^wK^R>E4h(#`c9>0Mfn(xde%y<D$J_h}I&
zA_|f~jPFAE_mBhsQ~F8&&D~{<|FY|nNfy+{NQ4~|kBo#>8wslQL?Q!@3QlbRJ-V*X
znpOK1c}wa+OwBG!_0@vfNFqceL+mXnAa|=xB+5LJU5=FzY(i>qhtWQ3R9miWCAp`J
zs}fWvWNKjli0)S41!&hc^xh5V)-C9^ZRmX)&~8B2L2hT0=ZdhUo8dAJy7BUEqP&~1
z+D>{|!C;s7ml43ySIXq}b`sw2tV#86t9<|>MsPw90rMs{?5i_CY-*77U|yJOXj{}M
zL>(+eVI4a}c>_^3K<t$`i`um<?hwSamEyt>w-c)wy5U)j%69Q_HYr~ftJouXJoMQ3
zg?wsWBXhauGV_tXV)JJGSo~~iE}lze=2k{cBT{V`_JZz0(SxF!y<v{Jn(!C^5t1nf
zbfZB>u}5Y_9t1tOGEzM%nz%p4Ub86Xh#t|#ez3H+^KgS69s@_wL`gD3)vN&&kH<r!
zENtzNM?o8A$F1|?(8`zADR~Dj^nzrughU!+p}L4^91L_fo2k2OMqfyxW9+B8!zNT{
zKa1L8qKD1dT)kspC>qF1NqPibPoZi~X0$|Vj;ItlWKAHTw#Tys<v+0<6pya_ZM$Y@
z)|<enNrZ8VGf449W3zk`Oo!QLjT7P!vo!fwq1w(qZ8=?iM=A}6z0))j=FLkK?-d{2
zol@_7bOV*Fym3==f9!cM<<a~kh#%p9N%-9&xb}Z-DV&NIoQVg{#Huq<uy6e^t=R)a
zt~Wc&L?o&(r(@7vV$cftI0JeL)31*^;|RshfN2TMo2w4oT_`+zvf!M0;G9}@P8IB1
zKkOR^R{h2C^vDc^(;*a55JlTrlA9*wotw^4LTDTu*WjD20ipM{W)kG;r7=3hF16g!
zmnOkH&fSg@YZoB(l`G9H!O~8b7-d(TA(?>lP4=<#I4p_P)gW5=^P0tw80%^cdH2CF
zWG*(X^U&hi9HG<t&d~vuYds<Mu|;2t|3JAC-HB0F{UPef(3L_lz;?E|dT9pESt|&>
zG`i5+uG!Q!od?X@>_ppFFeI1zL!ICS%#>i?x!vb^m&T%TF0PTHB}qv<N7U)WCEARb
zjaQ8aQ634RSY2r;D}&A{=nQK0EbFtUF9P5moA$f_B<_3uSlo+Q&Y|G*G3uROM1xKZ
zP798)crNbA&#TDDlg%fSB%7Vhr_+}xCvB#U7=Sm2R-xeY%fYE=DMeu)*aB?<5i;pz
zVgdm5I+boH)?UAaaKSK5t)6B>BMV^umMyk_0nhtThe@>a=lwE*4O;eWsV8>Y=bhHy
z0^otVcKF#!)QL7e-_l-T7M(}sW`LzwtCBRykqsnX0rSu7q3?zXmpwGbUhRBBoM87m
zCnZ|X+Wby-z#oxl8%z6rRySrniisTTg1>QbJf5T;R2#B1*#onUC*oPslO^<GDoLmp
z;qB<J+vJBAB%vMX^r5pBo$-9`TqUp*eSY*=(5Gd9c9!=C@7GKoR=#L}&18K6)8aFT
z9Ym~AO(k=56m@)=QGEB%Gbr$;QoLS#gNw%bOg6{&sA!na=O{i1ii4mtC@Q!9FY_>z
z&Zo%%x(p5xzS*m=pKAtD6u%d|1^BR!0_PR8D6I+qhp@3*!K3VEuzzJO_`c{X_=Z>O
z_pix<wBuL7AW6TWSToC_>E50-0e%XTv+VP(UH<{R8`6Ojrvd0*=?ecT8nNMj0oe{+
A_5c6?

delta 2519
zcmb_dZ)jUp6n{7WnkLIk+q6ydnkN05zGQ9FHcj`hYu7(I$}AgQl|30<n|C+k@|x_v
zblRb`!a&3^Ecc5F;`(J{Y~Y|@27(I0P!R2)A4WiM?u&mw_GKuF;5qjtwQc<12Ve3|
z?m72&&iUPQ&%N1HZ>pY~9*;|c$9gT9KE3K`Ao0~m)=eZ$(ke2wdY!turYs26nQ7Kr
z)K)RB%(Ut4YP%S_G97wEjp&_fr_kLQMUSdcJ*LKlz9+L!?^3(;ZnazJo=lG(SK~yo
zNYr)%Qs2h>;!%5P@AW?3Yptn}w7oP=z5K2%z;mQaj%w93qSa6f?QbZ-CCvwVg5M({
z`#{OFQqt<clh7o8&#DCLY2uts^IzGWX|ROnCoR5ER5NjbGTi<W4&urpZVmsPMC9l>
zi`H0%KClfP+=Xr`Lmw=mVYMMZSHWs!POa7UL!}wW+AQKEFe~tEq1~{a*0NZKOCAub
ztr#oV8r9lqOsvhJb(HxGfzJ`Fwp~=4pRk1@Q7uBNwNBb4GC4J+%xf6DMv8lcnS8)H
z7!wr)U*DFmON*BI9tGcEF=LFzxz`?oo!uw)sH+S;$|vn_69?b4Pso9Zi;L-;P8ag0
zvbo;)L@K+G)zhit>2q{_)G=)FMxiU%J``OjVtmy(&{&7V4iJi+2|x@DCW`;yRP6(x
zN7j#4ju3~KALMVjRA=1u2=bp?EiJ;`YPt`?M8UymD$6v(3Q9N}W(nTqZnY1Cc8Jfo
zb0oQb-+kJ?rw<I5EiRWr*dUKp^*YAE!20-n)tgS7Q!H$Z|5Ej=0~OZG2dnp!5YJUN
z_Kbm{V5P66*fE@%MAezf>htLZsxjnXI6y$|aCimMe^PyvOs)S_ebwqW7lB?g2on^~
zBE_{jzx_opP4G|ao+nAZr@oC4{>bekr}zVZz2y$!Uwh;z$)ij0d7WsMJJuT(IHK^H
z&$Oi2rfv}y<+tmH+eM))%nx&-%(pCNo%+FGppPg|t-o*JB~bEceGbHr@L7?bx}?UT
zFI^k*^aFW%Q=Z<a-Tmdu{xER8?w9|CYv+IC%1-m1hGbKbX(MD8Oqq&gwkTd{P)5#x
zWf`qIDJJe+-jF9B$djA$<VNl8@5<D7Zuy}{e&`+LcipwX))6@Fp2ajt6bXJN;BPz&
z!*}2{JRr=~KXFL*%9U}J<g0--v-#%uez`wcWGVyFY~5n-&4Hn?mzIvfY$k2wxAowf
ztk^YxtnzQ=Y3RY$MjvsDcAyw(kdFoxa*$_&A=1yU24`k_&@7TUSPhP`r&tAwAr#p6
z>=_V>+uT$$4q9JEfqTr-C|*Hv0YwIdj$(n2H2E45Ff4e^)BNlfZ<Ynyhg@&E54B2!
zJ~lb#&}WYS8VZp(-y8OytVe@5dc~6~5ElguM4@skpkW6cj{>wg&UjOd&gJR0jF-Ut
z8Gki=0Wv-g|JHl}bao!aK@f_~T;3uYiah>o4lRq)I9V;4ca_EfTfw!M(;$yFJHKSs
z3jdcB$3GW^8ElI(!vqFK5@btk%_!U0E&<{jN#gIfd=A^FwmL|y*v89XFIaWse33d|
zY-^r1?+%!O#6I}h%`|{EQO05yVHA_e*7XIJf>)y%x}#`sfca<swCy7Y_OUX?KWINj
zj`PRuFYqHBej9cSpXuo1S38>BO`xzT5QPSQt)p&qVlKr(sQL_+>V_)K&CeOM+o0@H
zIz?F+;mtT-wPPM`Rmxg$vXy%yb<1ryY)706ae5X=8e%nY2WJ=alohPdTLo)+A<s@A
zcmTmREuG4<Vbt-)V|ev2JlyOo3OppD2@AGd*2pvLj)FC}m}gjdhU;eH{5F{f81z4!
zhavf5h8|(>f=b{umiQNur4tpz@<jUogqJ_+O!DtL2jTUt*DH63`}+8XGPc<^zF9ND
azlzFyC>G$3*xnuXKulgAiq%+b$oOxtPd1GJ

diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc
index 2b051e61ee03552f71bed49bb44e643debd2d633..a5e2cd8a3f7b3b1f704ab19ad2054ee4f6243c1d 100644
GIT binary patch
delta 439
zcmcbg`6ruqIWI340}vSAv(B72kyny2ZKJvjqd(U&W(J1UKnwv<!b}YA3@PF*3@H++
zJZN$vU^z*koKz~hKG78EU<OT@&1H-)HTd~l3rjN#a#Qn4Lh=g?4K`P4O=X&#Y-q(V
zfhsY1xuJ?c4bbKy77$SeB6KHTlo58Q1~EZI9S|3*1BnJCctc60!L`F=0^b#G`3o#6
zKy(pI0vSa{V4af<H6%An=x$=-0vS*QA{sYe(XV4<teYHc7^hJLvei$My+{)ztpy^q
zK?K4vV0~c6a5aErK*W^EKMc*-K`cK_vB{=JrEFkT4U<<J$#S&<g&BdkSby^+qlt{R
m6JkFy@G{zc0TCa-gd8KI>IVi)Vn)?RkmwhL6x-x7lS}|)hiI?>

delta 255
zcmey9eLs_TIWI340}$*gG0XIs$ScX{wNYJ$(U@l$GXukFAclY_VI~H5h7|D@h7^fZ
zE;Koj6v<!)O{vY37+-2gOSu-7W)|e8=9Prx7Z@72Cg<nn=Vm7RWTvHV?$VmdwE4g8
zZl=lWbvYU9Hy<&mV`QwJ%&+S;xz|W!a*?i-ZXM9RA{G!)4I*?wgdvD90uja_q83I>
zn*7Yjj2*=F(-fVoY+TA%J9(b5ELSs7gb|2~SvMawp2#S?K=va8FQeTT5b*&_C`_Jg
Gnh5}SH9#Q%

diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc
index a3d79d860a0f80f6b45bc47073e034eee9618e87..bd6abfe552e522bc0f635197129da80b8ad63ca9 100644
GIT binary patch
delta 812
zcmb7>OK4L;6o&8ISLLROn#62^R20#q+QeE~leQ@>NfAVoAPEVmZ7>nyqs6(QC`}Qx
z3SuqDK?GMW6m_9B-qr`A7M0qjT7$SMx^P=J*(g3hJSV9NUFlhT^UrY3%>Umz{ES_D
z%q-W<W=+5vf8UxN-dC`EX@r>$vv^yCzE}u$cujELcae$kZEHx9@*;FLZDtaDY;wSu
zf8vj_!D#Ci?~s_=KzCIuEvIoH%ku0h8)c`2v^Xfmg-g;Ic}UL7y9Jj5Cz?IA{06pj
znseFVX>-4Ylb@Rk@1pZt5NUBLx`G-;TGne1QN)-a=r-^MN^ox53axAs6z#KBuzR4`
z=&!i<O8@QNAouln`(pir`}%f|>92VQn%@}V1)S%133~_zK_!e6ju9pZ+X;sWeS`tR
zJp!fY_Yu|5U)vkBN4Psgp?!uopfas&ro{He#KugAO=M@`L+6<C96L`M7rJt+W)kHt
z{sd}+ZuJFfJ_&6>zfwdwVhje4GWTrdlyDHC%ZN2t+=XIZ-On?rT!z2Fjcho&e=K7O
zu!cjw@7fz~W3S<III#9Dc5qIZqd|Ef#r1h5o68*0xs{HK@ICBQtFIZ(NDX6VV_h_*
zusJv#cPk6nbHEsnuN2u7OeN~nmo!v>Pl^6I`rVx3b4td^e8my(Cba;^ldH9#DDmS6
zdXI4>xl;|>ne~pVEZ{ONPbXh3ugIm?w2E0D_{st<rD&`a?|B#Pt?ZVf0ero)zW~7M
B+W7zg

delta 1262
zcmb`GUr19?9LMk3cCXvQIc<0AYD--xTclQ+mTBdmMUeBMtPqT0bJ;|<b$0th-BD2w
z(}cnkBvD||AF7AcYo$T4{uo9=O9f>w*-KC_4T2y7>HMavv>truaL?!b&hMP_yXXAA
z=iGdP&OS%F+sVmVhL)SxOFS*kKHax<Iz+o1t!HTcdXUVNd_;(RFSIKa5+W5vc}PJ%
z6d6f*=~B{Nbp2P)j+T<s)qI-r77cI@g2YP@NhDHgBIma2iB_MiQ8qI{m89(9$u+B`
zsG8ZgI><_FlS)V|V1gX&v%mWi=QJh;B~_1!E;NvXyk3i#&OAxAi?MNJczr?YCpZXJ
z08%Mz%esnvmMGimY4eD92e=)8UWzE!==Zz5O?Q%TB?%U1WJh)GLx(;7Hn&%Fwt50$
zREd2@aSNRqNTSHfB3FxZv`?wIo1QGNpP0)c<VuO2f3MMX@FCnTbPBO#hSkQ>7{dzk
zInUBE&6`fuPNneYk9QnzmpY{wqhxJygp^YTQ#ZP}Eu@*U<n%P&$PH;G)R|Li<D}X=
zrZ#tb-l?q<YHK9^O)n85Dgj&Rzg@J(%RGrbFIu8k3YvDR5&ySFOph_1*M%}cwihka
zvc&$VOv1lpD%@0{@1v9cP$|8u*m@H8gHr}H00sbX2k`^IF~CE>c0en@3pfIJ1Q-O&
z7a0$M?=i)khFMUsjXI*)&2G^t`uxtdYn<3kW;XHKFw6#VL$bMyL-UkP0c8zy%GUm0
zW##(vYz4YRPHef)j?g_^kPEhoC~26QwfF_OTd|6J4O<%~(TY;`Ej2I8LggXEMP|Jh
zsxsLLYNp8pRX^0|0O_r<CszEZDMMpqgJbiONtlcQ<K(o%Xn{CUjs2L*?H4^hug!of
zVGwRSo((JyIg${{ke}5yvS^&FtXsu?p`)U_vo2MU`v%qv0qn|e^EDlAbqDf)J)nGh
zqYIBhpnlT6$CnAO28RJ~JPd!vuwlFn@P(N6nzc%rc(~Mo26^*d2UnAU(tGJ+p-os7
iu78;lHy5IGIZ7Yg7-MKNVi@s^X2#8hC?nB*Z+-$MNm1qi

diff --git a/src/equipment/router.py b/src/equipment/router.py
index 69bf13a..2905947 100644
--- a/src/equipment/router.py
+++ b/src/equipment/router.py
@@ -9,7 +9,8 @@ from src.equipment.schema import (
     EquipmentPagination,
     EquipmentRead,
     EquipmentCreate,
-    EquipmentTop10EconomicLife,
+    EquipmentTop10,
+    EquipmentTop10Pagination,
     EquipmentUpdate,
 )
 from src.equipment.service import (
@@ -115,10 +116,10 @@ async def simulate_equipment(db_session: DbSession, assetnum: str):
 
 @router.get(
     "/top-10-replacement-priorities",
-    response_model=StandardResponse[List[EquipmentTop10EconomicLife]],
+    response_model=StandardResponse[EquipmentTop10Pagination],
 )
-async def get_calculated_top_10_replacement_priorities(db_session: DbSession):
-    equipment_data = await get_top_10_replacement_priorities(db_session=db_session)
+async def get_calculated_top_10_replacement_priorities(db_session: DbSession, common: CommonParameters):
+    equipment_data = await get_top_10_replacement_priorities(db_session=db_session, common=common)
     return StandardResponse(
         data=equipment_data,
         message="Top 10 Replacement Priorities Data retrieved successfully",
@@ -126,10 +127,10 @@ async def get_calculated_top_10_replacement_priorities(db_session: DbSession):
 
 @router.get(
     "/top-10-economic-life",
-    response_model=StandardResponse[List[EquipmentTop10EconomicLife]],
+    response_model=StandardResponse[EquipmentTop10Pagination],
 )
-async def get_calculated_top_10_economic_life(db_session: DbSession):
-    equipment_data = await get_top_10_economic_life(db_session=db_session)
+async def get_calculated_top_10_economic_life(db_session: DbSession, common: CommonParameters):
+    equipment_data = await get_top_10_economic_life(db_session=db_session, common=common)
     return StandardResponse(
         data=equipment_data,
         message="Top 10 Economic Life Data retrieved successfully",
diff --git a/src/equipment/schema.py b/src/equipment/schema.py
index ef11c1f..20f91a7 100644
--- a/src/equipment/schema.py
+++ b/src/equipment/schema.py
@@ -108,7 +108,7 @@ class EquipmentRead(DefaultBase):
     maximo_data: Optional[List[dict]] = Field(None, nullable=True)
 
 
-class EquipmentTop10EconomicLife(EquipmentBase):
+class EquipmentTop10(EquipmentBase):
     id: UUID
     equipment_master: EquipmentMasterBase
     forecasting_target_year: Optional[int] = Field(None, nullable=True)
@@ -123,6 +123,8 @@ class EquipmentTop10EconomicLife(EquipmentBase):
     harga_saat_ini: Optional[float] = Field(None, nullable=True, le=MAX_PRICE)
     economic_life: Optional[int] = Field(None, nullable=True)
 
+class EquipmentTop10Pagination(Pagination):
+    items: List[EquipmentTop10] = []
 
 class EquipmentDataMaster(EquipmentBase):
     id: UUID
diff --git a/src/equipment/service.py b/src/equipment/service.py
index 98447e6..5987ac3 100644
--- a/src/equipment/service.py
+++ b/src/equipment/service.py
@@ -338,7 +338,7 @@ async def get_all(
     return result
 
 
-async def get_top_10_economic_life(*, db_session: DbSession) -> list[Equipment]:
+async def get_top_10_economic_life(*, db_session: DbSession, common) -> list[Equipment]:
     """Returns top 10 economic life."""
     query = (
         Select(Equipment)
@@ -354,20 +354,13 @@ async def get_top_10_economic_life(*, db_session: DbSession) -> list[Equipment]:
         )
         .filter(Equipment.minimum_eac_year != None)
         .order_by(func.abs(current_year - Equipment.minimum_eac_year).desc())
-        .limit(10)
     )
 
-    result = await db_session.execute(query)
-    
-    equipment_list = []
-    for row in result.all():
-        equipment = row[0]
-        equipment.economic_life = row[1]
-        equipment_list.append(equipment)
-
-    return equipment_list
+    # result = await db_session.execute(query)
+    result = await search_filter_sort_paginate(model=query, **common)
+    return result
 
-async def get_top_10_replacement_priorities(*, db_session: DbSession) -> list[Equipment]:
+async def get_top_10_replacement_priorities(*, db_session: DbSession, common) -> list[Equipment]:
     """Returns top 10 replacement priorities."""
     query = (
         Select(Equipment)
@@ -384,18 +377,11 @@ async def get_top_10_replacement_priorities(*, db_session: DbSession) -> list[Eq
         .filter(Equipment.minimum_eac_year != None)
         .order_by(func.abs(current_year - Equipment.minimum_eac_year).asc())
         .order_by(func.abs(Equipment.minimum_eac).desc())
-        .limit(10)
     )
 
-    result = await db_session.execute(query)
-    
-    equipment_list = []
-    for row in result.all():
-        equipment = row[0]
-        equipment.economic_life = row[1]
-        equipment_list.append(equipment)
-
-    return equipment_list
+    # result = await db_session.execute(query)
+    result = await search_filter_sort_paginate(model=query, **common)
+    return result
 
 async def generate_all_transaction(*, db_session: DbSession, token):
     """Generate transaction for all equipments in the database based on equipments assetnum."""