accept the request; unfriend with a user

globalchat-online · Jul 5, 2018 · 47c29b3 · 47c29b3
1 parent 8ded99a
commit 47c29b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/routes/friends.js b/routes/friends.js
@@ -9,15 +9,15 @@ var handleError = require('../utils/res-utils.js').handleError;
 // List all friends
 router.get('/', auth.validateToken, auth.loginRequired, function (req, res, next) {
   User.findOne({ email: req.user.email }, 'friends', (err, friends) => {
-    if (err) return handleError(res, err);
+    if (err) return handleError(err, res);
     res.json({ data: friends });
   });
 });
 
 // List all friend requests
 router.get('/requests', auth.validateToken, auth.loginRequired, function (req, res, next) {
   Request.find({ to: req.user.email }, (err, requests) => {
-    if (err) return handleError(res, err);
+    if (err) return handleError(err, res);
     res.json({ data: requests });
   });
 });
@@ -29,7 +29,7 @@ router.post('/requests', function (req, res, next) {
     to: req.body.user
   });
   request.save((err, request) => {
-    if (err) return handleError(res, err);
+    if (err) return handleError(err, res);
     res.json({ data: null });
   });
 });
@@ -52,15 +52,15 @@ router.put('/:id/requests', function (req, res, next) {
       if (err) return res.status(520).json({ error: { message: err } });
 
       // add friend to friend list for each other
-      User.findOneAndUpdate({email: request.to.user.email }, 
-        { $push: { friends: request.from.user }}, (err, doc) => {
-          if (err) return handleError(res, err);
-          User.findOneAndUpdate({ email: request.from.user.email }, 
-            { $push: { friends: request.to.user }}, (err, doc) => {
-              if (err) return handleError(res, err);
+      User.findOneAndUpdate({ email: request.to.user.email },
+        { $push: { friends: request.from.user } }, (err, doc) => {
+          if (err) return handleError(err, res);
+          User.findOneAndUpdate({ email: request.from.user.email },
+            { $push: { friends: request.to.user } }, (err, doc) => {
+              if (err) return handleError(err, res);
               res.json({ data: null });
-          }); // end User.findOneAndUpdate
-      }); // end User.findOneAndUpdate
+            }); // end User.findOneAndUpdate
+        }); // end User.findOneAndUpdate
     }); // end request.save
   }); // end Request.findById
 });
@@ -73,7 +73,15 @@ router.delete('/:id/requests', function (req, res, next) {
 
 // Unfriend with a particular user
 router.delete('/:id', function (req, res, next) {
-
+  User.findOneAndUpdate({ email: req.user.email },
+    { $pull: { friends: { _id: req.params._id } } }, (err, user) => {
+      if (err) return handleError(err, res);
+      User.findByIdAndUpdate(req.params._id,
+        { $pull: { friends: { email: req.user.email } } }, (err, user) => {
+          if (err) return handleError(err, res);
+          res.json({ data: null });
+        }); // end User.findByIdAndUpdate
+    }); // end User.findOneAndUpdate
 });
 
 module.exports = router;
diff --git a/utils/res-utils.js b/utils/res-utils.js
@@ -1,4 +1,4 @@
-function handleError(res, err) {
+function handleError(err, res) {
   return res.status(520).json({ error: { message: err } });
 }