From 31ea47bf772c29bf3762dd7f31f0336b2c261d89 Mon Sep 17 00:00:00 2001 From: andrei Date: Fri, 4 Oct 2024 15:11:11 +0500 Subject: [PATCH] ._. --- app/infrastructure/database/models/cities.py | 2 +- .../database/models/delivery_orders.py | 2 +- .../database/repository/city_repository.py | 31 ++++++++++++++++++ .../delivery_accessory_repository.py | 32 +++++++++++++++++++ .../repository/delivery_order_repository.py | 31 ++++++++++++++++++ .../repository/federal_district_repository.py | 0 .../database/repository/order_repository.py | 30 ----------------- .../database/repository/role_repository.py | 5 +-- .../database/repository/status_repository.py | 3 +- .../repository/total_order_repository.py | 31 ++++++++++++++++++ .../database/repository/truck_repository.py | 31 ++++++++++++++++++ .../database/repository/user_repository.py | 5 +-- 12 files changed, 164 insertions(+), 39 deletions(-) create mode 100644 app/infrastructure/database/repository/city_repository.py create mode 100644 app/infrastructure/database/repository/delivery_accessory_repository.py create mode 100644 app/infrastructure/database/repository/delivery_order_repository.py create mode 100644 app/infrastructure/database/repository/federal_district_repository.py delete mode 100644 app/infrastructure/database/repository/order_repository.py create mode 100644 app/infrastructure/database/repository/total_order_repository.py create mode 100644 app/infrastructure/database/repository/truck_repository.py diff --git a/app/infrastructure/database/models/cities.py b/app/infrastructure/database/models/cities.py index 3be527b..1130ba2 100644 --- a/app/infrastructure/database/models/cities.py +++ b/app/infrastructure/database/models/cities.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, Integer, VARCHAR, Float, ForeignKey +from sqlalchemy import Column, Integer, VARCHAR, ForeignKey from sqlalchemy.orm import relationship from app.infrastructure.database.models import Base diff --git a/app/infrastructure/database/models/delivery_orders.py b/app/infrastructure/database/models/delivery_orders.py index d084d8a..cd2b1c1 100644 --- a/app/infrastructure/database/models/delivery_orders.py +++ b/app/infrastructure/database/models/delivery_orders.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, Integer, VARCHAR, Float, DateTime, ForeignKey +from sqlalchemy import Column, Integer, DateTime, ForeignKey from sqlalchemy.orm import relationship from app.infrastructure.database.models import Base diff --git a/app/infrastructure/database/repository/city_repository.py b/app/infrastructure/database/repository/city_repository.py new file mode 100644 index 0000000..8f00773 --- /dev/null +++ b/app/infrastructure/database/repository/city_repository.py @@ -0,0 +1,31 @@ +from sqlalchemy.orm import Session +from app.infrastructure.database.models.cities import City + + +class CitiesRepository: + def __init__(self, db: Session): + self.db = db + + def get_all(self): + return self.db.query(City).all() + + def get_by_id(self, city_id: int): + return self.db.query(City).filter(City.id == city_id).first() + + def create(self, city: City): + self.db.add(city) + self.db.commit() + self.db.refresh(city) + return city + + def update(self, city: City): + self.db.commit() + return city + + def delete(self, city_id: int): + city = self.db.query(City).filter(City.id == city_id).first() + if city: + self.db.delete(city) + self.db.commit() + return city + return None diff --git a/app/infrastructure/database/repository/delivery_accessory_repository.py b/app/infrastructure/database/repository/delivery_accessory_repository.py new file mode 100644 index 0000000..63057cd --- /dev/null +++ b/app/infrastructure/database/repository/delivery_accessory_repository.py @@ -0,0 +1,32 @@ +from sqlalchemy.orm import Session +from app.infrastructure.database.models.dilevery_accessiories import DeliveryAccessory + + +class DeliveryAccessoryRepository: + def __init__(self, db: Session): + self.db = db + + def get_all(self): + return self.db.query(DeliveryAccessory).all() + + def get_by_id(self, delivery_accessory_id: int): + return self.db.query(DeliveryAccessory).filter(DeliveryAccessory.id == delivery_accessory_id).first() + + def create(self, delivery_accessory: DeliveryAccessory): + self.db.add(delivery_accessory) + self.db.commit() + self.db.refresh(delivery_accessory) + return delivery_accessory + + def update(self, delivery_accessory: DeliveryAccessory): + self.db.commit() + return delivery_accessory + + def delete(self, delivery_accessory_id: int): + delivery_accessory = self.db.query(DeliveryAccessory).filter( + DeliveryAccessory.id == delivery_accessory_id).first() + if delivery_accessory: + self.db.delete(delivery_accessory) + self.db.commit() + return delivery_accessory + return None diff --git a/app/infrastructure/database/repository/delivery_order_repository.py b/app/infrastructure/database/repository/delivery_order_repository.py new file mode 100644 index 0000000..dce571a --- /dev/null +++ b/app/infrastructure/database/repository/delivery_order_repository.py @@ -0,0 +1,31 @@ +from sqlalchemy.orm import Session +from app.infrastructure.database.models.delivery_orders import DeliveryOrder + + +class DeliveryOrdersRepository: + def __init__(self, db: Session): + self.db = db + + def get_all(self): + return self.db.query(DeliveryOrder).all() + + def get_by_id(self, delivery_order_id: int): + return self.db.query(DeliveryOrder).filter(DeliveryOrder.id == delivery_order_id).first() + + def create(self, delivery_order: DeliveryOrder): + self.db.add(delivery_order) + self.db.commit() + self.db.refresh(delivery_order) + return delivery_order + + def update(self, delivery_order: DeliveryOrder): + self.db.commit() + return delivery_order + + def delete(self, delivery_order_id: int): + delivery_order = self.db.query(DeliveryOrder).filter(DeliveryOrder.id == delivery_order_id).first() + if delivery_order: + self.db.delete(delivery_order) + self.db.commit() + return delivery_order + return None diff --git a/app/infrastructure/database/repository/federal_district_repository.py b/app/infrastructure/database/repository/federal_district_repository.py new file mode 100644 index 0000000..e69de29 diff --git a/app/infrastructure/database/repository/order_repository.py b/app/infrastructure/database/repository/order_repository.py deleted file mode 100644 index d55bcd5..0000000 --- a/app/infrastructure/database/repository/order_repository.py +++ /dev/null @@ -1,30 +0,0 @@ -from sqlalchemy.orm import Session -from app.infrastructure.database.models.total_orders import TotalOrder - -class OrderRepository: - def __init__(self, db: Session): - self.db = db - - def get_all(self): - return self.db.query(TotalOrder).all() - - def get_by_id(self, order_id: int): - return self.db.query(TotalOrder).filter(TotalOrder.id == order_id).first() - - def create(self, order: TotalOrder): - self.db.add(order) - self.db.commit() - self.db.refresh(order) - return order - - def update(self, order: TotalOrder): - self.db.commit() - return order - - def delete(self, order_id: int): - order = self.db.query(TotalOrder).filter(TotalOrder.id == order_id).first() - if order: - self.db.delete(order) - self.db.commit() - return order - return None diff --git a/app/infrastructure/database/repository/role_repository.py b/app/infrastructure/database/repository/role_repository.py index 4d7bb1d..f0b8ca0 100644 --- a/app/infrastructure/database/repository/role_repository.py +++ b/app/infrastructure/database/repository/role_repository.py @@ -1,7 +1,8 @@ from sqlalchemy.orm import Session -from app.infrastructure.database.models.roles import Role +from app.infrastructure.database.models.role import Role -class RoleRepository: + +class RolesRepository: def __init__(self, db: Session): self.db = db diff --git a/app/infrastructure/database/repository/status_repository.py b/app/infrastructure/database/repository/status_repository.py index b6eaff5..fa9a753 100644 --- a/app/infrastructure/database/repository/status_repository.py +++ b/app/infrastructure/database/repository/status_repository.py @@ -1,7 +1,8 @@ from sqlalchemy.orm import Session from app.infrastructure.database.models.statuses import Status -class StatusRepository: + +class StatusesRepository: def __init__(self, db: Session): self.db = db diff --git a/app/infrastructure/database/repository/total_order_repository.py b/app/infrastructure/database/repository/total_order_repository.py new file mode 100644 index 0000000..87b2791 --- /dev/null +++ b/app/infrastructure/database/repository/total_order_repository.py @@ -0,0 +1,31 @@ +from sqlalchemy.orm import Session +from app.infrastructure.database.models.total_orders import TotalOrder + + +class TotalOrdersRepository: + def __init__(self, db: Session): + self.db = db + + def get_all(self): + return self.db.query(TotalOrder).all() + + def get_by_id(self, total_order_id: int): + return self.db.query(TotalOrder).filter(TotalOrder.id == total_order_id).first() + + def create(self, total_order: TotalOrder): + self.db.add(total_order) + self.db.commit() + self.db.refresh(total_order) + return total_order + + def update(self, total_order: TotalOrder): + self.db.commit() + return total_order + + def delete(self, total_order_id: int): + total_order = self.db.query(TotalOrder).filter(TotalOrder.id == total_order_id).first() + if total_order: + self.db.delete(total_order) + self.db.commit() + return total_order + return None diff --git a/app/infrastructure/database/repository/truck_repository.py b/app/infrastructure/database/repository/truck_repository.py new file mode 100644 index 0000000..39afbde --- /dev/null +++ b/app/infrastructure/database/repository/truck_repository.py @@ -0,0 +1,31 @@ +from sqlalchemy.orm import Session +from app.infrastructure.database.models.trucks import Truck + + +class TrucksRepository: + def __init__(self, db: Session): + self.db = db + + def get_all(self): + return self.db.query(Truck).all() + + def get_by_id(self, truck_id: int): + return self.db.query(Truck).filter(Truck.id == truck_id).first() + + def create(self, truck: Truck): + self.db.add(truck) + self.db.commit() + self.db.refresh(truck) + return truck + + def update(self, truck: Truck): + self.db.commit() + return truck + + def delete(self, truck_id: int): + truck = self.db.query(Truck).filter(Truck.id == truck_id).first() + if truck: + self.db.delete(truck) + self.db.commit() + return truck + return None diff --git a/app/infrastructure/database/repository/user_repository.py b/app/infrastructure/database/repository/user_repository.py index 90641e3..f35c134 100644 --- a/app/infrastructure/database/repository/user_repository.py +++ b/app/infrastructure/database/repository/user_repository.py @@ -2,7 +2,7 @@ from sqlalchemy.orm import Session from app.infrastructure.database.models.users import User -class UserRepository: +class UsersRepository: def __init__(self, db: Session): self.db = db @@ -12,9 +12,6 @@ class UserRepository: def get_by_id(self, user_id: int): return self.db.query(User).filter(User.id == user_id).first() - def get_by_login(self, login: str): - return self.db.query(User).filter(User.login == login).first() - def create(self, user: User): self.db.add(user) self.db.commit()