._.

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

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

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

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

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

app/infrastructure/database/repository/order_repository.py

@@ -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

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
 

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
 

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

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

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()