Merge branch 'main' of https://github.com/swapnil-ahlawat/UberTreatsApp…

… into main
swapnil-ahlawat · Mar 28, 2021 · 2dc275a · 2dc275a
2 parents 986333d + 22b0141
commit 2dc275a
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/Backend/controllers/user-controllers.js b/Backend/controllers/user-controllers.js
@@ -62,16 +62,16 @@ const getOrders= async(req, res, next) =>{
 const removeOrder= async(req, res, next) =>{
     const{orderID, phoneNo}= req.body;
 
-    let identifiedUser= await User.updateOne({phoneNo}, {$pull: {orders: {orderID}}});
-    // let orderArray=[]
-    // for (index = 0; index < identifiedUser.orders.length; index++) {
-    //     if(indentifiedUser.orders[index].orderID!==orderID){
-    //         orderArray.push(identifiedUser.orders[index]);
-    //     }
-    // }   
-    // console.log(orderArray);
-    // identifiedUser.orders= orderArray;
-    // identifiedUser.save();
+    const identifiedUser = await User.findOne({phoneNo});
+    if(!identifiedUser)
+    {
+        return res.sendCode(404);
+    }
+    identifiedUser.orders = identifiedUser.orders.filter(p => {
+        return p.orderID !== orderID;
+    });
+    await identifiedUser.save();
+
     res.json({
         message: 'Order removed Successfully!',
         user: identifiedUser