Add customer and address table, changed order to work with new tables

Author: damianpostaru

main.py

@@ -85,13 +85,11 @@ def create_dessert():
 @app.route("/order", methods=["POST"])
 def order():
     data = request.json
-    address = data["address"]
-    customer_name = data["customer_name"]
-    customer_number = data["customer_number"]
+    customer = data["customer"]
     order_items = data["order_items"]
 
     try:
-        save_new_order(address, customer_name, customer_number, order_items)
+        save_new_order(customer, order_items)
     except Exception as e:
         return make_response({"error": f"could not order: {str(e)}"}, 400)
     return make_response({"result": "success"}, 200)

models/address.py

@@ -0,0 +1,9 @@
+from app import db
+
+
+class Address(db.Model):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    street = db.Column(db.String(80), nullable=False)
+    house_number = db.Column(db.Integer, nullable=False)
+    zip_code = db.Column(db.String(80), nullable=False)
+    area = db.Column(db.String(80), nullable=False)

models/customer.py

@@ -0,0 +1,10 @@
+from app import db
+
+
+class Customer(db.Model):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    first_name = db.Column(db.String(80), nullable=False)
+    last_name = db.Column(db.String(80), nullable=False)
+    phone_number = db.Column(db.String(80), nullable=False)
+    address_id = db.Column(db.Integer, db.ForeignKey('address.id'))
+    orders = db.relationship("Order", backref='customer')

models/mysql_model.py

@@ -10,6 +10,8 @@
 from models.drink import Drink
 from models.menu_item import MenuItem
 from models.driver import Driver
+from models.address import Address
+from models.customer import Customer
 from models.order import Order
 from models.order_item import OrderItem
 
@@ -92,18 +94,46 @@ def show_ingredients(name):
         print(ingredient)
 
 
-def save_new_order(address, customer_name, customer_number, order_items):
+def save_new_order(customer, order_items):
     order_time = datetime.today()
     new_order_items = []
     status = "In Process"
     driver = get_first_available_driver()
     driver_id = driver.id
     driver.available = False
+    address = customer["address"]
+    address_found = Address.query.filter_by(street=address["street"],
+                                            house_number=address["house_number"],
+                                            zip_code=address["zip_code"],
+                                            area=address["area"]).first()
+    if address_found:
+        new_address = address_found
+    else:
+        new_address = Address(street=address["street"],
+                              house_number=address["house_number"],
+                              zip_code=address["zip_code"],
+                              area=address["area"])
+    db.session.add(new_address)
+    db.session.commit()
+
+    address_id = new_address.id
+    customer_found = Customer.query.filter_by(first_name=customer["first_name"],
+                                              last_name=customer["last_name"],
+                                              phone_number=customer["phone_number"],
+                                              address_id=address_id).first()
+    if customer_found:
+        new_customer = customer_found
+    else:
+        new_customer = Customer(first_name=customer["first_name"],
+                                last_name=customer["last_name"],
+                                phone_number=customer["phone_number"],
+                                address_id=address_id)
+    db.session.add(new_customer)
+    db.session.commit()
+    customer_id = new_customer.id
     for item in order_items:
         new_order_items.append(OrderItem(menu_item=item['menu_item'], quantity=item['quantity']))
-    new_order = Order(address=address,
-                      customer_name=customer_name,
-                      customer_number=customer_number,
+    new_order = Order(customer_id=customer_id,
                       order_time=order_time,
                       status=status,
                       driver_id=driver_id,

models/order.py

@@ -3,9 +3,7 @@
 
 class Order(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    address = db.Column(db.String(80), nullable=False)
-    customer_name = db.Column(db.String(120), nullable=False)
-    customer_number = db.Column(db.String(80), nullable=False)
+    customer_id = db.Column(db.Integer, db.ForeignKey('customer.id'))
     status = db.Column(db.String(80), nullable=False)
     order_time = db.Column(db.DateTime, nullable=False)
     driver_id = db.Column(db.Integer, db.ForeignKey("driver.id"), nullable=False)