refactor: relocate the `get_equipment` endpoint to an earlier position in the router.

rest-api
MrWaradana 1 month ago
parent 0af5cceabd
commit 3d0df4408b

@ -62,6 +62,45 @@ async def get_equipments(
message="Data retrieved successfully",
)
@router.get("/{assetnum}", response_model=StandardResponse[EquipmentRead])
async def get_equipment(db_session: DbSession, collector_db_session: CollectorDbSession, assetnum: str):
(
equipment_master_record,
equipment_data,
chart_data,
min_eac_value,
min_seq,
min_eac_year,
last_actual_year,
maximo_data,
joined_maximo_record,
min_eac_disposal_cost,
historical_records
) = 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:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail="A data with this id does not exist.",
)
return StandardResponse(
data=EquipmentRead(
equipment_master_record=equipment_master_record,
equipment_data=equipment_data,
chart_data=chart_data,
min_eac_value=min_eac_value,
min_seq=min_seq,
min_eac_year=min_eac_year,
last_actual_year=last_actual_year,
maximo_data=maximo_data,
joined_maximo=joined_maximo_record,
min_eac_disposal_cost=min_eac_disposal_cost,
historical_data=historical_records
),
message="Data retrieved successfully",
)
@router.get("/maximo/{assetnum}", response_model=StandardResponse[List[dict]])
async def get_maximo_record_by_assetnum(db_session: CollectorDbSession, assetnum: str):
record = await get_maximo_by_assetnum(db_session=db_session, assetnum=assetnum)
@ -225,44 +264,7 @@ async def get_generated_equipment_transaction(db_session: DbSession, token: Toke
)
@router.get("/{assetnum}", response_model=StandardResponse[EquipmentRead])
async def get_equipment(db_session: DbSession, collector_db_session: CollectorDbSession, assetnum: str):
(
equipment_master_record,
equipment_data,
chart_data,
min_eac_value,
min_seq,
min_eac_year,
last_actual_year,
maximo_data,
joined_maximo_record,
min_eac_disposal_cost,
historical_records
) = 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:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail="A data with this id does not exist.",
)
return StandardResponse(
data=EquipmentRead(
equipment_master_record=equipment_master_record,
equipment_data=equipment_data,
chart_data=chart_data,
min_eac_value=min_eac_value,
min_seq=min_seq,
min_eac_year=min_eac_year,
last_actual_year=last_actual_year,
maximo_data=maximo_data,
joined_maximo=joined_maximo_record,
min_eac_disposal_cost=min_eac_disposal_cost,
historical_data=historical_records
),
message="Data retrieved successfully",
)
@router.post("", response_model=StandardResponse[EquipmentDataMaster])

Loading…
Cancel
Save