From adef9d53a2a7a27a08064db035dd91faea9ca0fd Mon Sep 17 00:00:00 2001
From: Cizz22 <cisatraa@gmail.com>
Date: Wed, 17 Sep 2025 13:54:45 +0700
Subject: [PATCH] fix

---
 src/overhaul_activity/service.py | 6 +++---
 src/standard_scope/model.py      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/overhaul_activity/service.py b/src/overhaul_activity/service.py
index 5e47d71..04b04e0 100644
--- a/src/overhaul_activity/service.py
+++ b/src/overhaul_activity/service.py
@@ -126,7 +126,7 @@ async def get_all(
         res = OverhaulActivityRead(
             id=equipment.id,
             material_cost=float(cost),
-            service_cost=float(service_cost),
+            service_cost=equipment.service_cost,
             overhaul_cost=float(oh_cost),
             location_tag=equipment.location_tag,
             equipment_name=equipment.master_equipment.name if equipment.master_equipment else None,
@@ -175,7 +175,7 @@ async def get_standard_scope_by_session_id(*, db_session: DbSession, overhaul_se
 
     results = []
     material_cost = await get_cm_cost_summary(collector_db=collector_db, last_oh_date=prev_oh_scope.end_date, upcoming_oh_date=overhaul.start_date)
-    service_cost = get_service_cost(scope=overhaul.maintenance_type.name, total_equipment=len(eqs))
+    #service_cost = get_service_cost(scope=overhaul.maintenance_type.name, total_equipment=len(eqs))
     overhaul_cost = await get_oh_cost_summary(collector_db=collector_db, last_oh_date=prev_oh_scope.end_date, upcoming_oh_date=overhaul.start_date)
 
     for equipment in eqs:
@@ -184,7 +184,7 @@ async def get_standard_scope_by_session_id(*, db_session: DbSession, overhaul_se
         res = OverhaulActivityRead(
             id=equipment.id,
             material_cost=float(cost),
-            service_cost=float(service_cost),
+            service_cost=equipment.service_cost,
             overhaul_cost=float(oh_cost),
             location_tag=equipment.location_tag,
             equipment_name=equipment.master_equipment.name if equipment.master_equipment else None,
diff --git a/src/standard_scope/model.py b/src/standard_scope/model.py
index e429a5b..c963fd9 100644
--- a/src/standard_scope/model.py
+++ b/src/standard_scope/model.py
@@ -13,6 +13,7 @@ class StandardScope(Base, DefaultMixin):
     location_tag = Column(String, nullable=False)
     is_alternating_oh = Column(Boolean, nullable=False, default=False)
     assigned_date = Column(Date, nullable=True)
+    service_cost = Column(Float, nullable=True)
 
     master_equipment = relationship(
         "MasterEquipment",