fix(accounts): crash if user was deleted with active conversations #109

polonel · Nov 21, 2018 · 6ea0ad4 · 6ea0ad4
1 parent 9a93998
commit 6ea0ad4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/controllers/api/v1/users.js b/src/controllers/api/v1/users.js
@@ -521,9 +521,17 @@ apiUsers.deleteUser = function(req, res) {
             });
         },
         function(hasTickets, user, cb) {
-            if (hasTickets) {
-                //Disable if the user has tickets
+            var conversationSchema = require('../../../models/chat/conversation');
+            conversationSchema.getConversationsWithLimit(user._id, 10, function(err, conversations) {
+                if (err) return cb(err);
 
+                var hasConversations = _.size(conversations) > 0;
+                return cb(null, hasTickets, hasConversations, user);
+            });
+        },
+        function(hasTickets, hasConversations, user, cb) {
+            if (hasTickets || hasConversations) {
+                //Disable if the user has tickets or conversations
                 user.softDelete(function(err) {
                     if (err) return cb(err);