Merge branch 'master' into frontend

Author: damianpostaru

Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.8.1
+
+COPY . /opt/DatabasesProject/
+
+WORKDIR /opt/DatabasesProject/
+
+RUN pip install -r requirements.txt
+
+
+ENTRYPOINT ["python3", "main.py"]

Procfile

@@ -0,0 +1 @@
+web: gunicorn main:app

README.md

@@ -1,12 +1,13 @@
 #How to start server
 ##1. Install docker 
     https://www.docker.com/get-started
-##2. Start database container
+##2. Start database and server container
 ###Run in cmd:  
     docker-compose up
-##3. Start server
-###Run in cmd:
-    python main.py
+
+##3. Connect to server
+###In browser use ip
+    http://127.0.0.1:5000/
 
 #Areas in which the pizzeria delivers
     -City centre

app.py

@@ -3,5 +3,6 @@
 
 app = Flask(__name__)
 
-app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://pizzeria-owner:n&jPrqRZL3r3sV7K@localhost:3307/pizzeria"
+app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://pizzeria-owner:n&jPrqRZL3r3sV7K@pizzeria-db:3306/pizzeria"
+# app.config["SQLALCHEMY_DATABASE_URI"] = "mysql://pizzeria-owner:n&jPrqRZL3r3sV7K@localhost:3307/pizzeria"
 db = SQLAlchemy(app)

client/setup.py

@@ -53,4 +53,4 @@ def setup():
         dwight_schrute = save_new_driver("Dwight", "Schrute", "Sphinx quarter")
         jim_halpert = save_new_driver("Jim", "Halpert", "Céramique")
         victor_htema = save_new_driver("Victor", "Htema", "Jeker quarter")
-        francisca_van_dijk = save_new_driver("Britt", "Van Dijk", "Sint Pieter")
+        francisca_van_dijk = save_new_driver("Francisca", "Van Dijk", "Sint Pieter")

docker-compose.yml

@@ -2,13 +2,31 @@ version: "3.7"
 
 services:
 
+
   pizzeria-db:
     container_name: pizzeria-db
     image: mysql:latest
     restart: always
+    command: [ "--default-authentication-plugin=mysql_native_password" ]
     volumes:
       - ./data/mysql:/var/lib/mysql
     env_file:
       - services/mysql/.env
     ports:
-      - "3307:3306"
+      - "3307:3306"
+
+  pizzeria-server:
+    container_name: pizzeria-server
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always
+    env_file:
+      - services/mysql/.env
+    ports:
+      - "5000:5000"
+    links:
+      - "pizzeria-db"
+    depends_on:
+      - "pizzeria-db"
+

main.py

@@ -211,5 +211,5 @@ def remove_pizza():
 
 
 if __name__ == "__main__":
-    app.run(debug=True)
+    app.run(debug=True, host="0.0.0.0")
     # app.run()

models/mysql_model.py

@@ -36,6 +36,7 @@ def save_new_pizza(name, ingredients):
                 Ingredient(name=ingredient["name"], vegetarian=ingredient["vegetarian"], price=ingredient["price"]))
     calculated_price = calculated_price + 0.4 * calculated_price  # 40% profit
     calculated_price = calculated_price + 0.09 * calculated_price  # 9% VAT
+    calculated_price = str(round(calculated_price, 2))
     new_pizza = Pizza(name=name, vegetarian=veg_flag, price=calculated_price, ingredients=ingredients_list)
     db.session.add(new_pizza)
     db.session.commit()
@@ -108,7 +109,10 @@ def show_ingredients(name):
 
 def save_new_order(customer, order_items):
     new_order_items = []
-    driver = get_first_available_driver()
+    customer_address = customer["address"]
+    customer_area = customer_address["area"]
+    customer_zip_code = customer_address["zip_code"]
+    driver = get_first_available_driver(customer_area, customer_zip_code)
     driver_id = driver.id
     driver.available = False
     address = customer["address"]
@@ -178,6 +182,7 @@ def driver_back():
         print("Driver Back")
         db.session.commit()
 
+    # TODO: Change the times
     scheduler.add_job(id='preparation-time-'f'{order_id}', func=change_status,
                       trigger=DateTrigger(order_time + timedelta(minutes=0.1)))
     scheduler.add_job(id='delivery-time-'f'{order_id}', func=deliver,
@@ -198,11 +203,22 @@ def find_order(order_id):
     return order
 
 
+def find_address(address_id):
+    address = Address.query.filter_by(id=address_id).first_or_404(
+        description='There is no address with id {}'.format(address_id))
+    return address
+
+
 def find_driver(driver_id):
     driver = Driver.query.filter_by(id=driver_id) \
         .first_or_404(description='There is no driver with id {}'.format(driver_id))
     return driver
 
+def find_customer(customer_id):
+    customer = Customer.query.filter_by(id=customer_id) \
+        .first_or_404(description='There is no driver with id {}'.format(customer_id))
+    return customer
+
 
 def cancel_order(order_id):
     order = find_order(order_id)
@@ -235,14 +251,27 @@ def are_there_available_drivers():
     return False
 
 
-def get_first_available_driver():
+def get_first_available_driver(area, zip_code):
     if are_there_available_drivers():
         drivers = db.session.query(Driver)
+        orders = db.session.query(Order)
+        current_time = datetime.now()
         for driver in drivers:
-            if driver.available:
+            if driver.available and driver.working_area == area:
                 return driver
+            else:
+                if driver.working_area == area:
+                    for order in orders:
+                        customer = find_customer(order.customer_id)
+                        address = find_address(customer.address_id)
+                        if address.area == area and ((current_time - order.order_time).seconds / 60) < 1 and address.zip_code == zip_code:
+                            return driver
+
+        raise Exception("There are no available drivers for your area.")
     else:
         raise Exception("There are no available drivers.")
 
 
+
+
 db.create_all()

requirements.txt

@@ -1,3 +1,4 @@
+HOSTNAME=pizzeria-db
 MYSQL_USER=pizzeria-owner
 MYSQL_PASSWORD=n&jPrqRZL3r3sV7K
 MYSQL_DATABASE=pizzeria