fix: removed crap, category on service and deal
This commit is contained in:
		@@ -3,12 +3,13 @@ from typing import List, Optional, Union
 | 
			
		||||
 | 
			
		||||
from pydantic import constr, field_validator
 | 
			
		||||
 | 
			
		||||
from models import ServiceCategoryPrice, ServicePriceCategory
 | 
			
		||||
from schemas.base import BaseSchema, OkMessageSchema
 | 
			
		||||
from schemas.billing import DealBillRequestSchema
 | 
			
		||||
from schemas.client import ClientSchema
 | 
			
		||||
from schemas.marketplace import BaseMarketplaceSchema
 | 
			
		||||
from schemas.product import ProductSchema
 | 
			
		||||
from schemas.service import ServiceSchema
 | 
			
		||||
from schemas.service import ServiceSchema, ServicePriceCategorySchema
 | 
			
		||||
from schemas.shipping_warehouse import ShippingWarehouseSchema
 | 
			
		||||
from schemas.user import UserSchema
 | 
			
		||||
 | 
			
		||||
@@ -37,6 +38,7 @@ class DealSummary(BaseSchema):
 | 
			
		||||
    shipment_warehouse_id: Optional[int]
 | 
			
		||||
    shipment_warehouse_name: Optional[str]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DealServiceSchema(BaseSchema):
 | 
			
		||||
    service: ServiceSchema
 | 
			
		||||
    quantity: int
 | 
			
		||||
@@ -81,6 +83,7 @@ class DealSchema(BaseSchema):
 | 
			
		||||
    comment: str
 | 
			
		||||
    shipping_warehouse: Optional[Union[ShippingWarehouseSchema, str]] = None
 | 
			
		||||
    bill_request: Optional[DealBillRequestSchema] = None
 | 
			
		||||
    category: Optional[ServicePriceCategorySchema] = None
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DealGeneralInfoSchema(BaseSchema):
 | 
			
		||||
@@ -110,6 +113,7 @@ class DealQuickCreateRequest(BaseSchema):
 | 
			
		||||
    acceptance_date: datetime.datetime
 | 
			
		||||
    shipping_warehouse: constr(strip_whitespace=True)
 | 
			
		||||
    base_marketplace: BaseMarketplaceSchema
 | 
			
		||||
    category: Optional[ServicePriceCategorySchema] = None
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DealSummaryRequest(BaseSchema):
 | 
			
		||||
@@ -212,9 +216,11 @@ class DealAddKitRequest(BaseSchema):
 | 
			
		||||
class DealCreateGuestUrlRequest(BaseSchema):
 | 
			
		||||
    deal_id: int
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DealCompleteRequest(BaseSchema):
 | 
			
		||||
    deal_id: int
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# endregion Requests
 | 
			
		||||
 | 
			
		||||
# region Responses
 | 
			
		||||
@@ -311,6 +317,7 @@ class DealAddKitResponse(OkMessageSchema):
 | 
			
		||||
class DealCreateGuestUrlResponse(OkMessageSchema):
 | 
			
		||||
    url: str
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DealCompleteResponse(OkMessageSchema):
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user