From 30e7679a186fa9d9d6cab951b96c934b42ac200e Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Tue, 17 Dec 2024 10:55:52 +0700 Subject: [PATCH] refactor: get equipment by assetnum --- .../__pycache__/schema.cpython-311.pyc | Bin 2756 -> 2799 bytes .../__pycache__/service.cpython-311.pyc | Bin 3321 -> 3325 bytes src/equipment/schema.py | 5 +++-- src/equipment/service.py | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc index 8d544809219a019ffc83ba90b18ac81aeb31c06e..ea19e4380a4e41ec923945a73aa1ead639279186 100644 GIT binary patch delta 269 zcmX>i`d*ZGIWI340}vehnvkBhk@p@8Bj@HfEbkZ@#U|fot7ep%9L}!6s4}^MUD7|5 zHI*fW$p)x6g*li(ljRn#Yhh_-L2hbZNlIhD{F0ELNZVmR&;VhLGq577)4!CV`B}oE-Ixx|2IOl(=+2T0n&I ze2dq$ur#wEH#M&$C^a$V7E@-5pC;?%v+Ponk8|)({>{#*Bo8#NSQ1DyAi*0P zJPjTV9*scU;4#^Rqn=S`@)iyyE^VN?A`qc8`2mM1qxNJm&LkjN$tf#r2oz-m;$n9o l`GJ{{k@3Ogm7Gtt7#Vp#FkliBd_RIjzaXU8Chy=f2LSATJM91f diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc index d576b578e57d70c272362d542ab9dc2427d124a2..571348ebab912ac970c3fa140002b4bba97e8cf4 100644 GIT binary patch delta 456 zcmew<`B##6IWI340}y=ql8|1vk@qkYYY{JyJNXJzJ(oC;0g^1vn#3w1cAZD%5|7H# z$SbPWJ8CYedSB%6xx(YKxsBP1(OM9wsz?Y(++t45$`BRd2IWI340}$9hj88Av$a|QHTF_%;wFY-8D;c?pB!ED87Ed*3kBn%{OF(>BaXfhXpG!==02r(d0%nT$H6cmcY zf%Gl*^wg4gpt2$vAWwMmUzS)#$<5KMqKu5PlMC6zg}{o~l8aIkOHzwefNG>B&tl7B zlLWGgls9v+%QGq{0NJYK&S%f*`G6pMVX7dV&`u3i1iU6O*&JCNWA*{>xRP z0tz6oKfn$J+ft+l5|alJU?+=Dp35!HXV1vM@PV0;k?{i?1EbpH1Kf`^c^E|(aDHF_ XQX4YC)QNg9g-*y#KF6cY0x}B#-6URl diff --git a/src/equipment/schema.py b/src/equipment/schema.py index 864b35e..1785b03 100644 --- a/src/equipment/schema.py +++ b/src/equipment/schema.py @@ -1,4 +1,3 @@ - from datetime import datetime from typing import List, Optional from uuid import UUID @@ -30,6 +29,8 @@ class EquipmentUpdate(EquipmentBase): class EquipmentRead(EquipmentBase): id: UUID - + equipment_id: str + + class EquipmentPagination(Pagination): items: List[EquipmentRead] = [] diff --git a/src/equipment/service.py b/src/equipment/service.py index 3415a0a..51e7255 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -1,5 +1,3 @@ - - from sqlalchemy import Select, Delete from .model import Equipment from .schema import EquipmentCreate, EquipmentUpdate @@ -11,7 +9,7 @@ from src.auth.service import CurrentUser async def get(*, db_session: DbSession, equipment_id: str) -> Optional[Equipment]: """Returns a document based on the given document id.""" - query = Select(Equipment).filter(Equipment.id == equipment_id) + query = Select(Equipment).filter(Equipment.equipment_id == equipment_id) result = await db_session.execute(query) return result.scalars().one_or_none() @@ -31,7 +29,9 @@ async def create(*, db_session: DbSession, equipment_in: EquipmentCreate): return equipment -async def update(*, db_session: DbSession, equipment: Equipment, equipment_in: EquipmentUpdate): +async def update( + *, db_session: DbSession, equipment: Equipment, equipment_in: EquipmentUpdate +): """Updates a document.""" data = equipment_in.model_dump()