From 68b28d35ed5813f50a836781284ed4f84d946083 Mon Sep 17 00:00:00 2001 From: mnswaleh Date: Thu, 8 Nov 2018 08:46:03 +0300 Subject: [PATCH 1/2] [finishes #161698938] change current location --- app/api/v1/models/orders_model.py | 12 ++++++++++++ app/api/v1/views/orders_view.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/api/v1/models/orders_model.py b/app/api/v1/models/orders_model.py index 37033ef..e20ddd7 100644 --- a/app/api/v1/models/orders_model.py +++ b/app/api/v1/models/orders_model.py @@ -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"} diff --git a/app/api/v1/views/orders_view.py b/app/api/v1/views/orders_view.py index 07d71be..a743779 100644 --- a/app/api/v1/views/orders_view.py +++ b/app/api/v1/views/orders_view.py @@ -35,7 +35,9 @@ 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)) From 095ce196289177c89caaff5a6925e217dfcbedc4 Mon Sep 17 00:00:00 2001 From: mnswaleh Date: Thu, 8 Nov 2018 08:48:10 +0300 Subject: [PATCH 2/2] [finishes #161698947] change status --- app/api/v1/views/orders_view.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/api/v1/views/orders_view.py b/app/api/v1/views/orders_view.py index a743779..4b17d7d 100644 --- a/app/api/v1/views/orders_view.py +++ b/app/api/v1/views/orders_view.py @@ -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']) @@ -35,12 +35,14 @@ def get(self, parcelId): return make_response(jsonify(result)) def put(self, parcelId): - data = request.get_json(force = True) - - result = self.db.update_order(parcelId, data['current location'], data['status']) + 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): @@ -50,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})) - -