From 467bfa285963646827b0d6e9befd7a864f9edc1c Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 4 Apr 2018 20:08:52 -0700 Subject: [PATCH] remove mailboxdb from groups code --- src/groups.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/groups.js b/src/groups.js index 989cceae5..c4d512448 100644 --- a/src/groups.js +++ b/src/groups.js @@ -24,7 +24,6 @@ var assert = require('assert'), constants = require('./constants.js'), DatabaseError = require('./databaseerror.js'), groupdb = require('./groupdb.js'), - mailboxdb = require('./mailboxdb.js'), util = require('util'), uuid = require('uuid'); @@ -100,15 +99,11 @@ function remove(id, callback) { // never allow admin group to be deleted if (id === constants.ADMIN_GROUP_ID) return callback(new GroupError(GroupError.NOT_ALLOWED)); - mailboxdb.delByOwnerId(id, function (error) { + groupdb.del(id, function (error) { + if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND)); if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error)); - groupdb.del(id, function (error) { - if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupError(GroupError.NOT_FOUND)); - if (error) return callback(new GroupError(GroupError.INTERNAL_ERROR, error)); - - callback(null); - }); + callback(null); }); }