Skip to content

Commit ee58a95

Browse files
committed
Small code refactoring
1 parent 05a5348 commit ee58a95

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

models/mysql_model.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ def show_ingredients(name):
9595

9696

9797
def save_new_order(customer, order_items):
98-
order_time = datetime.today()
9998
new_order_items = []
100-
status = "In Process"
10199
driver = get_first_available_driver()
102100
driver_id = driver.id
103101
driver.available = False
@@ -134,13 +132,20 @@ def save_new_order(customer, order_items):
134132
for item in order_items:
135133
new_order_items.append(OrderItem(menu_item=item['menu_item'], quantity=item['quantity']))
136134
new_order = Order(customer_id=customer_id,
137-
order_time=order_time,
138-
status=status,
135+
order_time=datetime.today(),
136+
status="In Process",
139137
driver_id=driver_id,
140138
order_items=new_order_items)
141139
db.session.add(new_order)
142140
db.session.commit()
143141
order_id = new_order.id
142+
add_jobs_scheduler(order_id)
143+
144+
return new_order
145+
146+
147+
def add_jobs_scheduler(order_id):
148+
order_time = find_order(order_id).order_time
144149

145150
def change_status():
146151
change_order = find_order(order_id)
@@ -167,7 +172,6 @@ def driver_back():
167172
trigger=DateTrigger(order_time + timedelta(minutes=0.2)))
168173
scheduler.add_job(id='driver-busy-time-'f'{order_id}', func=driver_back,
169174
trigger=DateTrigger(order_time + timedelta(minutes=0.4)))
170-
return new_order
171175

172176

173177
def save_new_driver(first_name, last_name, working_area):
@@ -223,10 +227,4 @@ def get_first_available_driver():
223227
raise Exception("There are no available drivers.")
224228

225229

226-
# drivers = db.session.query(Driver)
227-
# for driver in drivers:
228-
# driver.available = True
229-
# db.session.commit()
230-
231-
print(are_there_available_drivers())
232230
db.create_all()

0 commit comments

Comments
 (0)