equirment

API-Fast/src/controllers/borrow_controller.py

@@ -9,7 +9,7 @@ from sqlalchemy import select
 
 from ..models.borrow_transaction import BorrowTransaction
 from ..models.project_equipment import ProjectEquipment
-from ..models.equipment import Equipment
+from ..models.equipments import Equipment
 from ..schemas.borrow_schema import (
     BorrowCreate,
     BorrowUpdate

API-Fast/src/controllers/equipment_controller.py

@@ -22,8 +22,7 @@ async def create_equipment(equipment_data: EquipmentCreate, db: AsyncSession):
     equipment = Equipment(
         equipmentName=equipment_data.equipmentName,
         description=equipment_data.description,
-        quantityTotal=equipment_data.quantityTotal,
-        location=equipment_data.location
+        is_returnable=equipment_data.is_returnable,
     )
     db.add(equipment)
     await db.commit()
@@ -43,10 +42,8 @@ async def update_equipment(equipmentId: UUID, equipment_data: EquipmentUpdate, d
         eq_db.equipmentName = equipment_data.equipmentName
     if equipment_data.description is not None:
         eq_db.description = equipment_data.description
-    if equipment_data.quantityTotal is not None:
-        eq_db.quantityTotal = equipment_data.quantityTotal
-    if equipment_data.location is not None:
-        eq_db.location = equipment_data.location
+    if equipment_data.is_returnable is not None:
+        eq_db.is_returnable = equipment_data.is_returnable
 
     await db.commit()
     await db.refresh(eq_db)

API-Fast/src/models/member.py

@@ -30,7 +30,6 @@ class Member(Base):
     role = Column(Enum(RoleType), nullable=False, default=RoleType.MEMBER)  # Default as Enum instance
     status = Column(Enum(StatusType), nullable=False, default=StatusType.ENABLE)  # Default as Enum instance
     picture = Column(String)
-    faceEmbedding = Column(Text, nullable=True)  # เก็บข้อมูล Face Embedding
     createdAt = Column(DateTime, nullable=False, default=datetime.utcnow)
     updatedAt = Column(DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)
     

API-Fast/src/schemas/equipment_schema.py

 # myproject/schemas/equipment_schema.py
-
 from pydantic import BaseModel
 from typing import Optional
 from uuid import UUID
@@ -7,22 +6,28 @@ from uuid import UUID
 class EquipmentBase(BaseModel):
     equipmentName: str
     description: Optional[str] = None
-    quantityTotal: int = 0
-    location: Optional[str] = None
+    is_returnable: bool = True
 
-# รับค่าตอน Create
 class EquipmentCreate(EquipmentBase):
+    """
+    Schema สำหรับรับข้อมูลเวลาสร้างอุปกรณ์ใหม่
+    """
     pass
 
-# รับค่าตอน Update
 class EquipmentUpdate(BaseModel):
+    """
+    Schema สำหรับรับข้อมูลเวลาต้องอัปเดตบางฟิลด์
+    (แต่ละฟิลด์เป็น Optional เผื่อว่าไม่ต้องส่งทุกฟิลด์)
+    """
     equipmentName: Optional[str] = None
     description: Optional[str] = None
-    quantityTotal: Optional[int] = None
-    location: Optional[str] = None
+    is_returnable: Optional[bool] = None
 
-# ส่งค่ากลับ (Response)
 class EquipmentResponse(EquipmentBase):
+    """
+    Schema สำหรับส่งคืนข้อมูล (Response) ไปยัง Client
+    โดยเพิ่ม equipmentId
+    """
     equipmentId: UUID
 
     class Config: