From 26e6126a25842b5fe342e2ed8bc3953c9aa80d84 Mon Sep 17 00:00:00 2001
From: TheHollidayInn <krh121791@gmail.com>
Date: Fri, 11 Sep 2015 12:14:01 -0500
Subject: [PATCH] Removed redundant code when removing group invitations

---
 website/src/models/group.js | 58 ++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 37 deletions(-)

diff --git a/website/src/models/group.js b/website/src/models/group.js
index e6da96c7bc..ef2aba8752 100644
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -87,46 +87,30 @@ GroupSchema.pre('save', function(next){
 
 GroupSchema.pre('remove', function(next) {
   var group = this;
-  if ( group.type == "guild" ) {
-    async.waterfall([
-      function(cb) {
-        User.find({
-          'invitations.guilds.id': group._id
-        }, cb);
-      },
-      function(users, cb) {
-        if (users) {
-          users.forEach(function (user, index, array) {
+  async.waterfall([
+    function(cb) {
+      var invitationQuery = {};
+      var groupType = group.type;
+      //Add an 's' to group type guild because the model has the plural version
+      if (group.type == "guild") groupType += "s";
+      invitationQuery['invitations.' + groupType + '.id'] = group._id;
+      User.find(invitationQuery, cb);
+    },
+    function(users, cb) {
+      if (users) {
+        users.forEach(function (user, index, array) {
+          if ( group.type == "party" ) {
+            user.invitations.party = {};
+          } else {
             var i = _.findIndex(user.invitations.guilds, {id: group._id});
             user.invitations.guilds.splice(i, 1);
-            user.save();
-          });
-        }
-        cb();
+          }
+          user.save();
+        });
       }
-    ], next);
-  } else if ( group.type == "party" ) {
-    async.waterfall([
-      function(cb) {
-        User.find({
-          'invitations.party.id': group._id
-        }, cb);
-      },
-      function(users, cb) {
-        if (users) {
-          users.forEach(function (user, index, array) {
-            if (user.invitations.party.id === group._id) {
-              user.invitations.party = {};
-            }
-            user.save();
-          });
-        }
-        cb();
-      }
-    ], next);
-  }
-
-
+      cb();
+    }
+  ], next);
 });
 
 GroupSchema.post('remove', function(group) {