feat: shipping warehouse and cost

schemas/base.py

@@ -13,6 +13,7 @@ class CustomModelCamel(BaseModel):
         alias_generator = to_camel
         populate_by_name = True
 
+
     @classmethod
     def from_sql_model(cls, model, fields: dict):
         model_dict = {c.name: getattr(model, c.name) for c in model.__table__.columns}

schemas/deal.py

@@ -1,10 +1,13 @@
 import datetime
-from typing import List
+from typing import List, Optional
+
+from pydantic import constr
 
 from schemas.base import CustomModelCamel, OkMessageSchema
 from schemas.client import ClientSchema
 from schemas.product import ProductSchema
 from schemas.service import ServiceSchema
+from schemas.shipping_warehouse import ShippingWarehouseSchema
 from schemas.user import UserSchema
 
 
@@ -66,6 +69,7 @@ class DealSchema(CustomModelCamel):
     is_completed: bool
     client: ClientSchema
     comment: str
+    shipping_warehouse: Optional[ShippingWarehouseSchema] = None
 
 
 class DealGeneralInfoSchema(CustomModelCamel):
@@ -88,10 +92,11 @@ class DealCreateRequest(CustomModelCamel):
 
 
 class DealQuickCreateRequest(CustomModelCamel):
-    name: str
-    client_name: str
+    name: constr(strip_whitespace=True)
+    client_name: constr(strip_whitespace=True)
     comment: str
     acceptance_date: datetime.datetime
+    shipping_warehouse: constr(strip_whitespace=True)
 
 
 class DealSummaryRequest(CustomModelCamel):

schemas/service.py

@@ -23,6 +23,7 @@ class ServiceSchema(CustomModelCamel):
     price: float
     service_type: int
     price_ranges: List[ServicePriceRangeSchema]
+    cost: Optional[int]
 
 
 # endregion

schemas/shipping_warehouse.py

@@ -0,0 +1,12 @@
+from typing import List
+
+from schemas.base import CustomModelCamel
+
+
+class ShippingWarehouseSchema(CustomModelCamel):
+    id: int
+    name: str
+
+
+class GetAllShippingWarehousesResponse(CustomModelCamel):
+    shipping_warehouses: List[ShippingWarehouseSchema]