diff --git a/src/calculation_time_constrains/service.py b/src/calculation_time_constrains/service.py index a44bf76..3d2a456 100644 --- a/src/calculation_time_constrains/service.py +++ b/src/calculation_time_constrains/service.py @@ -1036,7 +1036,7 @@ class OptimumCostModel: location_tag: str, token: str ): - failure_rate_url = f"{self.api_base_url}/reliability/asset/failure-rate/{self.location_tag}" + failure_rate_url = f"{self.api_base_url}/reliability/asset/failure-rate/{location_tag}" try: response = requests.get( failure_rate_url, diff --git a/src/overhaul_activity/service.py b/src/overhaul_activity/service.py index 48702d3..b6d5402 100644 --- a/src/overhaul_activity/service.py +++ b/src/overhaul_activity/service.py @@ -95,6 +95,10 @@ async def get_all( ).distinct() ) + num_equipments = len((await common['db_session'].execute(query)).scalars().all()) + + material_cost = get_material_cost("B", num_equipments) + equipments = await search_filter_sort_paginate(model=query, **common) data = equipments['items'] @@ -106,7 +110,7 @@ async def get_all( continue res = OverhaulActivityRead( id=equipment.id, - material_cost=350000000000, + material_cost=material_cost, service_cost=200000000, location_tag=equipment.location_tag, equipment_name=equipment.master_equipment.name if equipment.master_equipment else None,