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-05 11:49:32 +05:00
parent 01df26b502
commit ce4b56ca32
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ class AccessoryEntity(BaseModel):
weight: Optional[float] = None weight: Optional[float] = None
period: Optional[int] = None period: Optional[int] = None
city_id: Optional[int] = None city_id: Optional[int] = None
city_name: Optional[str] = None
class Config: class Config:
from_attributes = True from_attributes = True

5
app/core/usecases/accessory_service.py
View File

@ -12,7 +12,7 @@ class AccessoriesService:
self.repository = AccessoriesRepository(db) self.repository = AccessoriesRepository(db)
def get_all_accessories(self) -> List[AccessoryEntity]: def get_all_accessories(self) -> List[AccessoryEntity]:
accessories = self.repository.get_all() accessories = self.repository.get_with_cities_all()
return [ return [
AccessoryEntity( AccessoryEntity(
id=a.id, id=a.id,
@ -20,7 +20,8 @@ class AccessoriesService:
volume=a.volume, volume=a.volume,
weight=a.weight, weight=a.weight,
period=a.period, period=a.period,
city_id=a.city_id city_id=a.city_id,
city_name=a.city.name
) )
for a in accessories for a in accessories
] ]

8
app/infrastructure/database/repository/accessory_repository.py
View File

@ -1,6 +1,7 @@
from sqlalchemy.orm import Session from sqlalchemy.orm import Session, joinedload
from app.infrastructure.database.models.accessory import Accessory from app.infrastructure.database.models.accessory import Accessory
class AccessoriesRepository: class AccessoriesRepository:
def __init__(self, db: Session): def __init__(self, db: Session):
self.db = db self.db = db
@ -8,6 +9,11 @@ class AccessoriesRepository:
def get_all(self): def get_all(self):
return self.db.query(Accessory).all() return self.db.query(Accessory).all()
def get_with_cities_all(self):
return self.db.query(Accessory) \
.options(joinedload(Accessory.city)) \
.all()
def get_by_id(self, accessory_id: int): def get_by_id(self, accessory_id: int):
return self.db.query(Accessory).filter(Accessory.id == accessory_id).first() return self.db.query(Accessory).filter(Accessory.id == accessory_id).first()