From a1d51f902968bc17927a0c8a9cdb844af11ef606 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Wed, 17 Dec 2025 09:58:29 +0700 Subject: [PATCH] add filter out minimum eac --- src/equipment/service.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/equipment/service.py b/src/equipment/service.py index afca9e3..ab267ba 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -394,6 +394,7 @@ async def get_top_10_economic_life(*, db_session: DbSession, common) -> list[Equ ).label("economic_life") ) .filter(Equipment.minimum_eac_year != None) + .filter(Equipment.minimum_eac != None or Equipment.minimum_eac != 0) # .filter((current_year - Equipment.minimum_eac_year) >= 0) .order_by((current_year - Equipment.minimum_eac_year).desc()) .order_by(func.abs(Equipment.minimum_eac).desc()) @@ -425,6 +426,7 @@ async def get_top_10_replacement_priorities(*, db_session: DbSession, common) -> ).label("economic_life") ) .filter(Equipment.minimum_eac_year != None) + .filter(Equipment.minimum_eac != None or Equipment.minimum_eac != 0) # .filter((current_year - Equipment.minimum_eac_year) >= 0) .order_by((current_year - Equipment.minimum_eac_year).asc()) .order_by(func.abs(Equipment.minimum_eac).desc())