diff --git a/src/database/__pycache__/core.cpython-311.pyc b/src/database/__pycache__/core.cpython-311.pyc index 30be8c6..565023f 100644 Binary files a/src/database/__pycache__/core.cpython-311.pyc and b/src/database/__pycache__/core.cpython-311.pyc differ diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc index 9e29140..859b57e 100644 Binary files a/src/equipment/__pycache__/router.cpython-311.pyc and b/src/equipment/__pycache__/router.cpython-311.pyc differ diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc index a5e2cd8..e62b7cd 100644 Binary files a/src/equipment/__pycache__/schema.cpython-311.pyc and b/src/equipment/__pycache__/schema.cpython-311.pyc differ diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc index bd6abfe..34d045d 100644 Binary files a/src/equipment/__pycache__/service.cpython-311.pyc and b/src/equipment/__pycache__/service.cpython-311.pyc differ diff --git a/src/equipment/router.py b/src/equipment/router.py index 2905947..e8ec625 100644 --- a/src/equipment/router.py +++ b/src/equipment/router.py @@ -165,7 +165,8 @@ async def get_equipment(db_session: DbSession, collector_db_session: CollectorDb min_seq, min_eac_year, last_actual_year, - maximo_data + maximo_data, + min_eac_disposal_cost ) = await get_master_by_assetnum(db_session=db_session, collector_db_session=collector_db_session, assetnum=assetnum) # raise Exception(equipment[0]) if not chart_data: @@ -183,7 +184,8 @@ async def get_equipment(db_session: DbSession, collector_db_session: CollectorDb min_seq=min_seq, min_eac_year=min_eac_year, last_actual_year=last_actual_year, - maximo_data=maximo_data + maximo_data=maximo_data, + min_eac_disposal_cost=min_eac_disposal_cost ), message="Data retrieved successfully", ) diff --git a/src/equipment/schema.py b/src/equipment/schema.py index 7450552..f4b2516 100644 --- a/src/equipment/schema.py +++ b/src/equipment/schema.py @@ -106,7 +106,7 @@ class EquipmentRead(DefaultBase): min_eac_year: Optional[float] = Field(None, nullable=True) last_actual_year: Optional[int] = Field(None, nullable=True) maximo_data: Optional[List[dict]] = Field(None, nullable=True) - + min_eac_disposal_cost: Optional[float] = Field(None, nullable=True, le=MAX_PRICE) class EquipmentTop10(EquipmentBase): id: UUID diff --git a/src/equipment/service.py b/src/equipment/service.py index 6fdb325..4f0d6f7 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -293,7 +293,11 @@ async def get_master_by_assetnum( maximo_record = await _fetch_maximo_records( session=collector_db_session, assetnum=assetnum ) - + min_eac_disposal_cost = next( + (record.eac_disposal_cost for record in records if record.tahun == min_eac_year), + None, + ) + print(min_eac_disposal_cost) return ( equipment_master_record, equipment_record, @@ -302,7 +306,8 @@ async def get_master_by_assetnum( min_seq, min_eac_year, last_actual_year, - maximo_record + maximo_record, + min_eac_disposal_cost, ) # return result.scalars().all() diff --git a/src/masterdata/__pycache__/service.cpython-311.pyc b/src/masterdata/__pycache__/service.cpython-311.pyc index 2024b4c..47aea57 100644 Binary files a/src/masterdata/__pycache__/service.cpython-311.pyc and b/src/masterdata/__pycache__/service.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc index c4aabcf..0d30746 100644 Binary files a/src/modules/equipment/__pycache__/run.cpython-311.pyc and b/src/modules/equipment/__pycache__/run.cpython-311.pyc differ