From d1aa0ced704f4c66dfcd632b7dea119f8c944947 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Tue, 23 Dec 2025 10:33:07 +0700
Subject: [PATCH] refactor: refine EAC year difference calculation logic and
 add an explanatory comment for EM.

---
 .../__pycache__/service.cpython-311.pyc       | Bin 28138 -> 27937 bytes
 src/equipment/service.py                      |   8 --------
 src/modules/equipment/where_query_sql.py      |   2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc
index 52128380ec84374df9c93915f1f9499edcc97374..c619640b67417f4fa759935de47760f5b27bcb5f 100644
GIT binary patch
delta 412
zcmaELn{nYSM!w~|yj%=G5X$A1`7?bZU#1-wJCNH9#Gi9EH`)a<PWHCuoxI<HbF!ZU
z+hhX=ZB`}*hSf})6C6G<F=kC(<(WQtmoqQ(Q&G9eZ=992xY>BQJ~9A_FCgMO4+FPA
zm+A!pg^OH@SGW{E@^f&qePI9+--RYyx|FcVGO%)eRhi7??MSq>#f+N+JVF@R<}fla
z6oVX40<~O0S6t!)(0)FU{d^$%`GEHGi*%)45K+0vr+S4?6=XlqWk3RG{{%0X{hPVG
z1DF^OPmcE8%(!PWzu!wn#$%g*`p;rywA(x-@HYqJq|FnexR@B-H_wilz{<E_vrf`t
zW=6ry7gGPR`O7j2ZP5I{0HjW^oQOQb4`!khc5;kDJ1jpi0I3Usp%=p9uLLH5dFX`0
IWVzfk03zdjBme*a

delta 535
zcmZ2@i}BTMM!w~|yj%=G@QckWGca=_U#1-w2awwg#Glt~ZnO(zWU67FT;L$aR|Qm;
z!kEnpQVkJe0|})ufn+DYus397W?)#&yjjlS6BA?4WI^W=)d!-AOFgfs*j*I0J79Q8
z#N`Hp|ACcRQ0OZcgP8o}YEK1SVUZ8QT)bQ#8GytW5b<4vfm@(U^@4!HMJ~lFT#6sX
zc{tg=FaU|~Qj@Pbm$0cauyTFXne6Z4NV$WH88@$T4`F0mz{tQ*403w<<ZMq~qMfg-
z1#~+f$nAU}xAOtr&M(rHdO<|xBA@CNK2?z0fxZF~K)0XpM0We;W-opw#?zB0`)p=B
zvf17DB_rdx&4&K77#ZC*p9%QQ!8mL4iAXLcM*q#1qbIO3uGpNCxR{wyXfsFZKehlx
zMxhOw9~gkt36>L)XZXQPbi$2MiBV{W<p%~Jbs;eHLRkEjzyvT4o$#0(nsWvKgaV$#

diff --git a/src/equipment/service.py b/src/equipment/service.py
index 91bc657..83ecf29 100644
--- a/src/equipment/service.py
+++ b/src/equipment/service.py
@@ -391,10 +391,6 @@ async def get_top_10_economic_life(*, db_session: DbSession, common) -> list[Equ
     query = (
         query.add_columns(
             case(
-                (
-                    (current_year - Equipment.minimum_eac_year) >= 0,
-                    (current_year - Equipment.minimum_eac_year),
-                ),
                 (
                     (Equipment.minimum_eac_year - current_year) >= 0,
                     (Equipment.minimum_eac_year - current_year),
@@ -427,10 +423,6 @@ async def get_top_10_replacement_priorities(*, db_session: DbSession, common) ->
     query = (
         query.add_columns(
             case(
-                (
-                    (current_year - Equipment.minimum_eac_year) >= 0,
-                    (current_year - Equipment.minimum_eac_year),
-                ),
                 (
                     (Equipment.minimum_eac_year - current_year) >= 0,
                     (Equipment.minimum_eac_year - current_year),
diff --git a/src/modules/equipment/where_query_sql.py b/src/modules/equipment/where_query_sql.py
index f8bb101..e33d325 100644
--- a/src/modules/equipment/where_query_sql.py
+++ b/src/modules/equipment/where_query_sql.py
@@ -14,7 +14,7 @@ def get_where_query_sql(assetnum, worktype):
         )
         )
     """
-
+    # EM = Emergency Maintainance 
     return where_query
 
 def get_where_query_sql_all_worktype(assetnum):