From 3d0df4408bf4c6e5be50218f773bac0ae5919b4c Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Wed, 4 Feb 2026 15:33:42 +0700 Subject: [PATCH] refactor: relocate the `get_equipment` endpoint to an earlier position in the router. --- .../__pycache__/router.cpython-311.pyc | Bin 16275 -> 16275 bytes src/equipment/router.py | 76 +++++++++--------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc index 8fc6a3cbedf644ba825d77ac902081e8a87ee3be..0a606b157456e9323954257eeb3c1ed968117c2e 100644 GIT binary patch delta 1105 zcmZXTU2GIp6vw$UbGKdGA(SrNmbUB%EZf;_-Lmas3A9Z&f+$o7L`q3z-R|7ATiMxq zJ8fz;>4Oc%C~A8W^ub^gO--yO-~?3v}osc(Py@Z!Aii4ENkm1*dUd6&JMv9 zwXLC5>=%j{hD%y1=xa5z4W^V#`;K*ndi?pv+$wTjEzN9)&y-B0=zFe3(Cnf)QxW-V82o%lZO%PmjaLkA0LVU~Vxo>fMU@w_;Y^ zj#cV&mMITm7Un|-o8?KgWENqlev1Y8AvD0pF*4;e=_3tn3{Hh@R)8DfC_4xD!xvcz z=C@yomQdoVVxcTes_`PZjpcf6lKRC(9BMhkUUe?F4D$drBW<|Tp5zN;I(o+|T3~|A z7vSw!JXAq*QJb(PEcrZq6+4?hM>+4>7+I4DSDz_KyIMM56jIhD_S^WM=m1$$a3nr> z_$4x{glR$z;i~6_e{nX9C%gC?7};zBIueVG|U!AL&)v_(=E0Nxd(%6y)mNccL(c~&j e4(wtp&V_+%3dDz=QjRgF|G-^^wK~&72Kxtp+a>$} delta 1077 zcmZXSZEQoyq7@lP$u=kiB`?y576!Vyir@7{jn- z!faknf)64D6A^+N5)p~ulf)OFq(MX^f{5V*5eetC^Fchx{pFnhbIxrTpG_{mMn8wQ``qU_i z_^y1jUsW`lTBP|@C&YO(^Xp!tpF>&t%xUqd!Dv*A^=|Kh+VtBj0Kd|6Y*(bXIT{Pb zwny7T5mk#DRV@|_Z-rdz61ZTon-qiaq7fnhTdkFR1%?6riZw8W)xbwv3=iqZbg%~4 zmpRHBA#47q(y5_HPiMGSQ}LLW_7=8YugI$A#sC$l(C={ZEf}uU zFFAI~##N-Q0jD!RwF$#r^2Xkcy`ml(oo&_z+Do+6P_!2AIkU`(yo&M`c1#|fU%%4Hcg8OU`m}e!j-c!qmQGE`lJJW9LdI-}IN?LNLWG$(O2}=nhgd>De!WiKw;TR%5t2;u!tGy@K7w(C)3oR58 zsyG2N(yIAMEO-k|X)oZj=MK&{Ub+tXv$UM0>YjxmmY?`Fhv+OCOp%jAoFU;9VGwk$ zkJZ6@?>uY5^n`jkx#cMHuxx#G*>h%09swo3C0N|;TgDc_HQ!g(3g;?5vCS~H=wfMH zR>Pr~*hIZ_HwE1zLG}wWUXa^@EEeRe7>3Tu0=8ctuDmVjBUP^?HUrA58l(oMcl#Cg E2k1W-`~Uy| diff --git a/src/equipment/router.py b/src/equipment/router.py index 262b47a..bb4d58f 100644 --- a/src/equipment/router.py +++ b/src/equipment/router.py @@ -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])