Merge branch 'main' of https://git.gvk.idi.ntnu.no/fsimonsen/idatg2204-group10-project

endpoint/customer.py

@@ -30,33 +30,33 @@ def get_production_plan():
         cur.close()
         return jsonify(production_plan),200
 
-#Delete a given order that matches an order number, HAS TO BE TESTED
-@app.route('/delete_order',methods=['DELETE'])
+#Delete a given order that matches an order number
+@app.route('/delete_order',methods=['POST'])
 def delete_order():
 
-    if request == 'DELETE':
+    if request.method == 'POST':
         data = request.get_json()
-
         order_number = data['order_number']
+
         cur = mysql.connection.cursor()
-        #Check if order is within database:
+        #checks if order exists:
         check = cur.execute("SELECT * FROM `order` WHERE `order_number` = %s",(order_number,))
         if check == 0:
-            return "Order: " + order_number + " doesn't exist",400
-        #Delete order:
+            return "Order #" + order_number + " not found in database",400
+            cur.close() #early exit from request
+        #deletes an existing order:
         delete_order = cur.execute("DELETE FROM `order` WHERE `order_number` = %s",(order_number,))
         mysql.connection.commit()
 
-        #check if order is deleted:
         deleted = cur.execute("SELECT * FROM `order` WHERE `order_number` = %s", (order_number,))
 
         cur.close()
 
-        #output to user:
         if deleted == 0: 
-            return "Order: " + order_number + " has been deleted.",200
+            return "Order #" + (order_number) + " was successfully deleted.",200
         else:
-            return "Unable to delete order: " + order_number,400
+            return "Delete failed",400 #should never happen
+
 
 #place a new order, needs a quantity of skis, amount needs to be calculated from product_no and quantity, and possibly calculate a percentage discount for stores
 @app.route('/new_order',methods=['POST'])