From 50153ef2301138177455532e6d559b22dd0c2d57 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Wed, 4 Feb 2026 15:44:08 +0700 Subject: [PATCH] refactor: reorder the `get_equipment` endpoint definition within the router. --- .../__pycache__/router.cpython-311.pyc | Bin 16275 -> 16275 bytes src/equipment/router.py | 77 +++++++++--------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc index 0a606b157456e9323954257eeb3c1ed968117c2e..c9b1bbb8921c842c5f0d436faaed1654852bcb50 100644 GIT binary patch delta 1077 zcmZXST}TvB6vw->bJwOrEYjEJBb>Lr3G=q-BbA%=?RB`Tz^ha!SHXSW`r3-jZg|2^lnM+fBLz5;w0?MPjwp!by`e+cC*d#V5H`yXODX zkqLVxufzHOewUz;Zw~d3mn3M4Jnrm z@LdJgpsHvNwO9+NZZLQY3+jGzkVAR;tQp4iP%Ng!d;5A|Mfx392S3wu9M>en8jFYG zeX)*kRMiZ#s>MT*oses zVX*W9I{-Ng=kbG>KZE*(_t^+A-x_3tZv`Ji)qr!p7KmC4VZ!>$d#Y$3rgbaj|mK-WsOX?BAQo>QfIN=!KIN=20B*K{89i`vZ(G%*A^h7&^7LE#4 zoQ9ccwfqbgyo2Vn7x2+{7w4NS+lc&8R>3lK-=Z)pNc@_^bQTS!$jKolNH|Lv0o@;9 zE8(4gzCB@jLOqw7Iz1hu^PA$_`+J@Lgf_O2FDj)E;D2` z5{`?l)Ju0$&^;1lzaZlUxh=?ILB5JH*j`o04(MZ5HzZc1k5<2zpsISc)X4Pipu&Cw D=RO%} delta 1105 zcmZXTU1%It6vumK=5Dfer!;1p&1d(c*=}Yxannt6ns&T!3SwUv{DNCWQ){uX3!Te?2q&D zzlU?qorM)x(LdGo?c4B7X|Gqmy{_M8tQj`6XxA<=V77?iO2CY)YMUt7B9(W}jleav zt)W#M5Q-Ru%UUYvYc;bCW|T}v`zAv@{`_O^6gjV!W_G}5N+#0z|9nL;yP#Xm@ZDIo zl{$cXYMMpiike|DIHiuWIJ9aRmLOZ*v#LQwGk7QJGsCJhqJwj?QUafeqPwtLJgLC9|gv+ ze_4Q)z8)xsBJg?NP52_z_MB|OxUoa#DD7*=I!YKOJWY6paEx%AFitpuaKp3pswK=~ zt+Z6F)r(S;>(Z2`;JYVA`Lie(gXZi{!R5!Zz5w3SRF)>yc#+)3a=kW9{o*1Hx143KI#*god4QUcHr(k*@+C4Iz4H|+1zoy(u6oOf-4tZ9U+&y}QIEnO%IDeDsZZTwGkkgORv8XrFL z5}8%PETM*Q)eFLMg92Yl$dWB&k}?({MVLbvK{xpCbI!|`;hT7`-?j;V$2*w~?TJBl z-8q@~Q;96lr9}e$84Sf=oDGx79{vVKww#N}ImX{Y^9Oji_bz)Aeo3wIOX&X$ul3wU zzi6!RchUbH?id?v4OY_$zK;H1u$8{S0IHc|$S*TT_+^YfTJN2J``NEBwAp_K`JjK0 z?QpXD$}H~f=P49(2<_qiqT+RQ%s<5&D9<$(`CqL=;mMQ70b2YPCwk3Tf(tA-FThhRirj#_AT!-nQ dJ#5XnICNEE-OxUALOITy!Gm`d#~Mkpe*k(iCItWh diff --git a/src/equipment/router.py b/src/equipment/router.py index bb4d58f..b626dd8 100644 --- a/src/equipment/router.py +++ b/src/equipment/router.py @@ -62,44 +62,7 @@ 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): @@ -267,6 +230,46 @@ 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]) async def create_equipment( db_session: DbSession,