Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/api/v1/models/orders_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ def get_order(self, order_id):

return result

def update_order(self, order_id, location, status):
result = {"message": "order unknown"}

for order in orders:
if order['order no'] == order_id:
order['current location'] = location
order['status'] = status
result = order
break

return result

def cancel_order(self, order_id):
result = {"message": "order unknown"}

Expand Down
12 changes: 7 additions & 5 deletions app/api/v1/views/orders_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def get(self):
return make_response(jsonify({"Title": "Delivery orders", "Delivery orders list": result}))

def post(self):
data = request.get_json(force = True)

data = request.get_json(force=True)

result = self.db.create_order(data['order no'], data['pick up location'],
data['delivery location'], data['weight'], data['price'], data['sender'])
Expand All @@ -35,10 +35,14 @@ def get(self, parcelId):
return make_response(jsonify(result))

def put(self, parcelId):
result = self.db.cancel_order(parcelId)
data = request.get_json(force=True)

result = self.db.update_order(
parcelId, data['current location'], data['status'])

return make_response(jsonify(result))


class DeliveryOrderUpdate(Resource, OrdersModel):

def __init__(self):
Expand All @@ -48,5 +52,3 @@ def put(self, parcelId):
result = self.db.cancel_order(parcelId)

return make_response(jsonify({"message": "order " + parcelId + " is canceled!", "Order " + parcelId: result}))