Numerum/API_logistics
Numerum/API_logistics
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

._.

Browse Source
This commit is contained in:
Андрей Дувакин 2024-10-04 18:05:56 +05:00
parent 733bd59e0f
commit 48ddeb84c2
6 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/entities/delivery_order.py
View File

@ -8,6 +8,7 @@ class DeliveryOrderEntity(BaseModel):
order_datetime: datetime
count_robots: int
deadline: datetime
price: float
truck_id: Optional[int] = None
total_order_id: Optional[int] = None

1
app/core/entities/total_order.py
View File

@ -8,6 +8,7 @@ class TotalOrderEntity(BaseModel):
order_datetime: datetime
count_robots: int
deadline: Optional[datetime] = None
price: float
user_id: int
status_id: int
delivery_orders: Optional[List[int]] = None #

6
app/core/usecases/delivery_order_service.py
View File

@ -19,6 +19,7 @@ class DeliveryOrdersService:
order_datetime=o.order_datetime,
count_robots=o.count_robots,
deadline=o.deadline,
price=o.price,
truck_id=o.truck_id,
total_order_id=o.total_order_id
)
@ -33,6 +34,7 @@ class DeliveryOrdersService:
order_datetime=delivery_order.order_datetime,
count_robots=delivery_order.count_robots,
deadline=delivery_order.deadline,
price=delivery_order.price,
truck_id=delivery_order.truck_id,
total_order_id=delivery_order.total_order_id
)
@ -43,6 +45,7 @@ class DeliveryOrdersService:
order_datetime=entity.order_datetime,
count_robots=entity.count_robots,
deadline=entity.deadline,
price=entity.price,
truck_id=entity.truck_id,
total_order_id=entity.total_order_id
)
@ -52,6 +55,7 @@ class DeliveryOrdersService:
order_datetime=created_delivery_order.order_datetime,
count_robots=created_delivery_order.count_robots,
deadline=created_delivery_order.deadline,
price=created_delivery_order.price,
truck_id=created_delivery_order.truck_id,
total_order_id=created_delivery_order.total_order_id
)
@ -63,6 +67,7 @@ class DeliveryOrdersService:
delivery_order_model.order_datetime = entity.order_datetime
delivery_order_model.count_robots = entity.count_robots
delivery_order_model.deadline = entity.deadline
delivery_order_model.price = entity.price
delivery_order_model.truck_id = entity.truck_id
delivery_order_model.total_order_id = entity.total_order_id
self.repository.update(delivery_order_model)
@ -71,6 +76,7 @@ class DeliveryOrdersService:
order_datetime=delivery_order_model.order_datetime,
count_robots=delivery_order_model.count_robots,
deadline=delivery_order_model.deadline,
price=delivery_order_model.price,
truck_id=delivery_order_model.truck_id,
total_order_id=delivery_order_model.total_order_id
)

6
app/core/usecases/total_order_service.py
View File

@ -19,6 +19,7 @@ class TotalOrdersService:
order_datetime=order.order_datetime,
count_robots=order.count_robots,
deadline=order.deadline,
price=order.price,
user_id=order.user_id,
status_id=order.status_id,
delivery_orders=[do.id for do in order.delivery_orders] if order.delivery_orders else []
@ -34,6 +35,7 @@ class TotalOrdersService:
order_datetime=total_order.order_datetime,
count_robots=total_order.count_robots,
deadline=total_order.deadline,
price=total_order.price,
user_id=total_order.user_id,
status_id=total_order.status_id,
delivery_orders=[do.id for do in total_order.delivery_orders] if total_order.delivery_orders else []
@ -45,6 +47,7 @@ class TotalOrdersService:
order_datetime=entity.order_datetime,
count_robots=entity.count_robots,
deadline=entity.deadline,
price=entity.price,
user_id=entity.user_id,
status_id=entity.status_id
)
@ -54,6 +57,7 @@ class TotalOrdersService:
order_datetime=created_total_order.order_datetime,
count_robots=created_total_order.count_robots,
deadline=created_total_order.deadline,
price=created_total_order.price,
user_id=created_total_order.user_id,
status_id=created_total_order.status_id,
delivery_orders=[]
@ -65,6 +69,7 @@ class TotalOrdersService:
total_order_model.order_datetime = entity.order_datetime
total_order_model.count_robots = entity.count_robots
total_order_model.deadline = entity.deadline
total_order_model.price = entity.price
total_order_model.user_id = entity.user_id
total_order_model.status_id = entity.status_id
self.repository.update(total_order_model)
@ -73,6 +78,7 @@ class TotalOrdersService:
order_datetime=total_order_model.order_datetime,
count_robots=total_order_model.count_robots,
deadline=total_order_model.deadline,
price=total_order_model.price,
user_id=total_order_model.user_id,
status_id=total_order_model.status_id,
delivery_orders=[do.id for do in total_order_model.delivery_orders] if total_order_model.delivery_orders else []

3
app/infrastructure/database/models/delivery_orders.py
View File

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, DateTime, ForeignKey
from sqlalchemy import Column, Integer, DateTime, ForeignKey, Float
from sqlalchemy.orm import relationship
from app.infrastructure.database.models import Base
@ -11,6 +11,7 @@ class DeliveryOrder(Base):
order_datetime = Column(DateTime, nullable=False)
count_robots = Column(Integer, nullable=False)
deadline = Column(DateTime, nullable=False)
price = Column(Float, nullable=False)
truck_id = Column(Integer, ForeignKey('trucks.id'))
total_order_id = Column(Integer, ForeignKey('total_orders.id'))

3
app/infrastructure/database/models/total_orders.py
View File

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, DateTime, ForeignKey
from sqlalchemy import Column, Integer, DateTime, ForeignKey, Float
from sqlalchemy.orm import relationship
from app.infrastructure.database.models import Base
@ -11,6 +11,7 @@ class TotalOrder(Base):
order_datetime = Column(DateTime, nullable=False)
count_robots = Column(Integer, nullable=False)
deadline = Column(DateTime)
price = Column(Float, nullable=False)
user_id = Column(Integer, ForeignKey('users.id'))
status_id = Column(Integer, ForeignKey('statuses.id'))