From d651441a8a1ed1977a0ff9315ed9e8478af80aac Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Tue, 7 Oct 2025 11:49:24 +0700 Subject: [PATCH] fix --- src/calculation_time_constrains/model.py | 1 + src/calculation_time_constrains/service.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calculation_time_constrains/model.py b/src/calculation_time_constrains/model.py index e848aca..b4cd8c2 100644 --- a/src/calculation_time_constrains/model.py +++ b/src/calculation_time_constrains/model.py @@ -152,6 +152,7 @@ class CalculationEquipmentResult(Base, DefaultMixin): optimum_day = Column(Integer, default=1) is_included = Column(Boolean, default=True) procurement_details = Column(JSON, nullable=True) + is_initial = Column(Boolean, default=True) master_equipment = relationship( "MasterEquipment", diff --git a/src/calculation_time_constrains/service.py b/src/calculation_time_constrains/service.py index 0b10b5c..81ee019 100644 --- a/src/calculation_time_constrains/service.py +++ b/src/calculation_time_constrains/service.py @@ -1045,10 +1045,12 @@ async def get_calculation_result(db_session: DbSession, calculation_id: str): urgent_items = [r for r in recommendations if r.get("priority") == "CRITICAL"] if urgent_items: urgent_procurements += 1 + + is_included_eq = False if eq.is_initial else eq.is_included # Add detailed procurement info for this equipment month_result["procurement_details"][eq.location_tag] = { - "is_included": eq.is_included, + "is_included": is_included_eq, "location_tag": eq.location_tag, "details": procurement_detail.get("procurement_needed", []), "detailed_message": procurement_detail.get("detailed_message", ""), @@ -1583,7 +1585,8 @@ async def bulk_update_equipment( { "is_included": case( *when_clauses - ) # Unpack the when clauses as separate arguments + ) , + "is_initial" : False } ) )