diff --git a/app/core/entities/accessory.py b/app/core/entities/accessory.py index a5b9c8d..3a39bab 100644 --- a/app/core/entities/accessory.py +++ b/app/core/entities/accessory.py @@ -3,7 +3,7 @@ from typing import Optional class AccessoryEntity(BaseModel): - id: int + id: Optional[int] name: str volume: Optional[float] = None weight: Optional[float] = None diff --git a/app/core/entities/city.py b/app/core/entities/city.py index 98b8943..914dc40 100644 --- a/app/core/entities/city.py +++ b/app/core/entities/city.py @@ -3,7 +3,7 @@ from typing import Optional class CityEntity(BaseModel): - id: int + id: Optional[int] name: str federal_district_id: Optional[int] = None diff --git a/app/core/entities/delivery_accessory.py b/app/core/entities/delivery_accessory.py index b98e5e6..e1e2e0f 100644 --- a/app/core/entities/delivery_accessory.py +++ b/app/core/entities/delivery_accessory.py @@ -3,7 +3,7 @@ from typing import Optional class DeliveryAccessoryEntity(BaseModel): - id: int + id: Optional[int] queue: int count: int accessory_id: Optional[int] = None diff --git a/app/core/entities/delivery_order.py b/app/core/entities/delivery_order.py index 0fca2d8..708402d 100644 --- a/app/core/entities/delivery_order.py +++ b/app/core/entities/delivery_order.py @@ -4,7 +4,7 @@ from datetime import datetime class DeliveryOrderEntity(BaseModel): - id: int + id: Optional[int] order_datetime: datetime count_robots: int deadline: datetime diff --git a/app/core/entities/federal_district.py b/app/core/entities/federal_district.py index 59111d3..38c2d79 100644 --- a/app/core/entities/federal_district.py +++ b/app/core/entities/federal_district.py @@ -3,7 +3,7 @@ from typing import List, Optional class FederalDistrictEntity(BaseModel): - id: int + id: Optional[int] name: str cities: Optional[List[int]] = None diff --git a/app/core/entities/role.py b/app/core/entities/role.py index 7602283..7c94ed9 100644 --- a/app/core/entities/role.py +++ b/app/core/entities/role.py @@ -3,7 +3,7 @@ from typing import List, Optional class RoleEntity(BaseModel): - id: int + id: Optional[int] name: str users: Optional[List[int]] = None diff --git a/app/core/entities/status.py b/app/core/entities/status.py index c250c0d..2b7ef07 100644 --- a/app/core/entities/status.py +++ b/app/core/entities/status.py @@ -3,7 +3,7 @@ from typing import List, Optional class StatusEntity(BaseModel): - id: int + id: Optional[int] name: str orders: Optional[List[int]] = None steps: Optional[List[int]] = None diff --git a/app/core/entities/total_order.py b/app/core/entities/total_order.py index 4725453..832044b 100644 --- a/app/core/entities/total_order.py +++ b/app/core/entities/total_order.py @@ -4,7 +4,7 @@ from typing import List, Optional class TotalOrderEntity(BaseModel): - id: int + id: Optional[int] order_datetime: datetime count_robots: int deadline: Optional[datetime] = None diff --git a/app/core/entities/truck.py b/app/core/entities/truck.py index acc8db1..bbf4f98 100644 --- a/app/core/entities/truck.py +++ b/app/core/entities/truck.py @@ -1,9 +1,9 @@ from pydantic import BaseModel -from typing import List +from typing import List, Optional class TruckEntity(BaseModel): - id: int + id: Optional[int] name: str capacity: float volume: float diff --git a/app/core/entities/user.py b/app/core/entities/user.py index 4cd3822..7fce576 100644 --- a/app/core/entities/user.py +++ b/app/core/entities/user.py @@ -3,7 +3,7 @@ from typing import List, Optional class UserEntity(BaseModel): - id: int + id: Optional[int] first_name: str last_name: str login: str diff --git a/app/main.py b/app/main.py index d2fdd45..c4f7409 100644 --- a/app/main.py +++ b/app/main.py @@ -21,13 +21,13 @@ logger = logging.getLogger(__name__) app = FastAPI() -# app.add_middleware( -# CORSMiddleware, -# allow_origins=['*'], -# allow_credentials=True, -# allow_methods=['GET', 'POST', 'PUT', 'DELETE'], -# allow_headers=['*'], -# ) +app.add_middleware( + CORSMiddleware, + allow_origins=['*'], + allow_credentials=True, + allow_methods=['GET', 'POST', 'PUT', 'DELETE'], + allow_headers=['*'], +) init_db()