Skip to content

Commit 3b3b597

Browse files
committed
Start work on setup
1 parent 36aaa35 commit 3b3b597

File tree

3 files changed

+35
-7
lines changed

3 files changed

+35
-7
lines changed

client/setup.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from app import db
2+
from models.dessert import Dessert
3+
from models.drink import Drink
4+
from models.mysql_model import save_new_pizza, save_new_drink, save_new_dessert
5+
from models.pizza import Pizza
6+
7+
8+
def setup():
9+
emmentaler = {"name": "emmentaler", "vegetarian": True, "price": 1}
10+
mozzarella = {"name": "mozzarella", "vegetarian": True, "price": 1}
11+
gorgonzola = {"name": "gorgonzola", "vegetarian": True, "price": 1}
12+
goat_cheese = {"name": "goat_cheese", "vegetarian": True, "price": 1.50}
13+
14+
if not db.session.query(Pizza).first():
15+
four_cheese = save_new_pizza("Four Cheese", [emmentaler, mozzarella, gorgonzola, goat_cheese])
16+
17+
if not db.session.query(Drink).first():
18+
cola = save_new_drink("Cola", 1.99)
19+
sprite = save_new_drink("Sprite", 1.99)
20+
fanta = save_new_drink("Fanta", 1.99)
21+
beer = save_new_drink("Beer", 3.99)
22+
23+
if not db.session.query(Dessert).first():
24+
chocolate_lavacake = save_new_dessert("Chocolate Lavacake", 2.99)
25+
chocolate_chip_cookie = save_new_dessert("Chocolate Chip Cookie", 1.99)

main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
from flask import make_response, render_template
33
from flask import request
44

5+
from client.setup import setup
56
from models.mysql_model import *
67

8+
setup()
79

810
@app.route("/test")
911
def get_test():

models/mysql_model.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
from datetime import datetime, timedelta
22

3-
from flask_apscheduler import APScheduler
43
from apscheduler.triggers.date import DateTrigger
4+
from flask_apscheduler import APScheduler
55

66
from app import db, app
7-
from models.ingredient import Ingredient
8-
from models.pizza import Pizza
7+
from models.address import Address
8+
from models.customer import Customer
99
from models.dessert import Dessert
1010
from models.drink import Drink
11-
from models.menu_item import MenuItem
1211
from models.driver import Driver
13-
from models.address import Address
14-
from models.customer import Customer
12+
from models.ingredient import Ingredient
13+
from models.menu_item import MenuItem
1514
from models.order import Order
1615
from models.order_item import OrderItem
16+
from models.pizza import Pizza
1717

1818
scheduler = APScheduler()
1919
scheduler.init_app(app)
@@ -22,7 +22,7 @@
2222

2323
def save_new_pizza(name, ingredients):
2424
ingredients_list = []
25-
calculated_price = 1.0
25+
calculated_price = 0
2626
veg_flag = True
2727
for ingredient in ingredients:
2828
calculated_price = calculated_price + ingredient["price"]
@@ -34,6 +34,7 @@ def save_new_pizza(name, ingredients):
3434
else:
3535
ingredients_list.append(
3636
Ingredient(name=ingredient["name"], vegetarian=ingredient["vegetarian"], price=ingredient["price"]))
37+
calculated_price = calculated_price + 0.4 * calculated_price
3738
new_pizza = Pizza(name=name, vegetarian=veg_flag, price=calculated_price, ingredients=ingredients_list)
3839
db.session.add(new_pizza)
3940
db.session.commit()

0 commit comments

Comments
 (0)