Skip to content

Commit 47e896f

Browse files
committed
Finish setup (Add pizzas, drinks, dessers, drivers when not already in database)
1 parent 3b3b597 commit 47e896f

File tree

2 files changed

+35
-3
lines changed

2 files changed

+35
-3
lines changed

client/setup.py

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
from app import db
22
from models.dessert import Dessert
33
from models.drink import Drink
4-
from models.mysql_model import save_new_pizza, save_new_drink, save_new_dessert
4+
from models.driver import Driver
5+
from models.mysql_model import save_new_pizza, save_new_drink, save_new_dessert, save_new_driver
56
from models.pizza import Pizza
67

78

89
def setup():
910
emmentaler = {"name": "emmentaler", "vegetarian": True, "price": 1}
1011
mozzarella = {"name": "mozzarella", "vegetarian": True, "price": 1}
1112
gorgonzola = {"name": "gorgonzola", "vegetarian": True, "price": 1}
12-
goat_cheese = {"name": "goat_cheese", "vegetarian": True, "price": 1.50}
13+
goat_cheese = {"name": "minced beef", "vegetarian": True, "price": 1.50}
14+
grilled_chicken = {"name": "grilled_chicken", "vegetarian": False, "price": 1}
15+
oregano = {"name": "oregano", "vegetarian": True, "price": 0}
16+
paprika = {"name": "paprika", "vegetarian": True, "price": 1}
17+
tomato = {"name": "tomato", "vegetarian": True, "price": 1}
18+
onion = {"name": "onion", "vegetarian": True, "price": 1}
19+
pepperoni = {"name": "pepperoni", "vegetarian": False, "price": 1}
20+
bacon = {"name": "bacon", "vegetarian": False, "price": 1}
21+
mushrooms = {"name": "mushrooms", "vegetarian": True, "price": 1}
22+
spinach = {"name": "spinach", "vegetarian": True, "price": 1}
23+
jalapenos = {"name": "jalapenos", "vegetarian": True, "price": 1}
24+
ham = {"name": "ham", "vegetarian": False, "price": 1}
25+
minced_beef = {"name": "minced_beef", "vegetarian": False, "price": 1}
1326

1427
if not db.session.query(Pizza).first():
1528
four_cheese = save_new_pizza("Four Cheese", [emmentaler, mozzarella, gorgonzola, goat_cheese])
29+
chicken_supreme = save_new_pizza("Chicken Supreme", [grilled_chicken, mozzarella, oregano, paprika, onion, tomato])
30+
pepperoni_party = save_new_pizza("Pepperoni Party", [pepperoni, mozzarella])
31+
bbq_chicken_bacon = save_new_pizza("BBQ Chicken & Bacon", [bacon, grilled_chicken, mozzarella])
32+
veggi = save_new_pizza("Veggi", [mushrooms, mozzarella, paprika, onion, spinach, tomato])
33+
hot_spicy = save_new_pizza("Hot & Spicy", [jalapenos, mozzarella, paprika, pepperoni, onion])
34+
americana = save_new_pizza("Americana", [ham, mozzarella, pepperoni, minced_beef])
35+
creamy_bacon = save_new_pizza("Creamy Bacon", [bacon, mushrooms, ham, mozzarella, oregano, onion])
36+
margharita = save_new_pizza("Margharita", [mozzarella, oregano])
37+
bacon_onion = save_new_pizza("Bacon & Onion", [mozzarella, bacon, onion])
1638

1739
if not db.session.query(Drink).first():
1840
cola = save_new_drink("Cola", 1.99)
@@ -23,3 +45,12 @@ def setup():
2345
if not db.session.query(Dessert).first():
2446
chocolate_lavacake = save_new_dessert("Chocolate Lavacake", 2.99)
2547
chocolate_chip_cookie = save_new_dessert("Chocolate Chip Cookie", 1.99)
48+
49+
if not db.session.query(Driver).first():
50+
britt_de_jong = save_new_driver("Britt", "De Jong", "City center")
51+
bartholomeus_meyer = save_new_driver("Bartholomeus", "Meyer", "Wyck")
52+
elmo_bakker = save_new_driver("Elmo", "Bakker", "Stokstraat quarter")
53+
dwight_schrute = save_new_driver("Dwight", "Schrute", "Sphinx quarter")
54+
jim_halpert = save_new_driver("Jim", "Halpert", "Céramique")
55+
victor_htema = save_new_driver("Victor", "Htema", "Jeker quarter")
56+
francisca_van_dijk = save_new_driver("Britt", "Van Dijk", "Sint Pieter")

models/mysql_model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ 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
37+
calculated_price = calculated_price + 0.4 * calculated_price # 40% profit
38+
calculated_price = calculated_price + 0.09 * calculated_price # 9% VAT
3839
new_pizza = Pizza(name=name, vegetarian=veg_flag, price=calculated_price, ingredients=ingredients_list)
3940
db.session.add(new_pizza)
4041
db.session.commit()

0 commit comments

Comments
 (0)