@ngageoint/mage.service 6.6.3 → 6.6.4

package/lib/models/observation.js

@@ -249,21 +249,23 @@ exports.getObservations = function (event, o, callback) {
         return query.cursor();
     }
     else {
-        query.exec().then(r => callback(null, r), e => callback(e));
+        query.exec(callback);
     }
 };
 exports.createObservationId = function (callback) {
-    ObservationId.create({}).then(doc => callback(null, doc), err => callback(err));
+    ObservationId.create({}, callback);
 };
 exports.getObservationId = function (id, callback) {
-    ObservationId.findById(id).then(doc => callback(null, doc ? doc._id : null), err => callback(err));
+    ObservationId.findById(id, function (err, doc) {
+        callback(err, doc ? doc._id : null);
+    });
 };
 exports.getLatestObservation = function (event, callback) {
-    observationModel(event).findOne({}, { lastModified: true }, { sort: { "lastModified": -1 }, limit: 1 }).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findOne({}, { lastModified: true }, { sort: { "lastModified": -1 }, limit: 1 }, callback);
 };
 exports.getObservationById = function (event, observationId, options, callback) {
     const fields = parseFields(options.fields);
-    observationModel(event).findById(observationId, fields).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findById(observationId, fields, callback);
 };
 exports.updateObservation = function (event, observationId, update, callback) {
     let addAttachments = [];
@@ -328,7 +330,7 @@ exports.updateObservation = function (event, observationId, update, callback) {
         .catch(err => callback(err));
 };
 exports.removeObservation = function (event, observationId, callback) {
-    observationModel(event).findByIdAndDelete(observationId).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findByIdAndRemove(observationId, callback);
 };
 exports.removeUser = function (user, callback) {
     const condition = { userId: user._id };
@@ -336,10 +338,10 @@ exports.removeUser = function (user, callback) {
     const options = { multi: true };
     Event.getEvents({}, function (err, events) {
         async.each(events, function (event, done) {
-            observationModel(event).updateMany(condition, update).then(result => {
-                log.info('Remove deleted user from ' + result.modifiedCount + ' documents for event ' + event.name);
+            observationModel(event).update(condition, update, options, function (err, numberAffected) {
+                log.info('Remove deleted user from ' + numberAffected + ' documents for event ' + event.name);
                 done();
-            }, err => done(err));
+            });
         }, function (err) {
             callback(err);
         });
@@ -351,10 +353,10 @@ exports.removeDevice = function (device, callback) {
     const options = { multi: true };
     Event.getEvents(function (err, events) {
         async.each(events, function (event, done) {
-            observationModel(event).updateMany(condition, update).then(result => {
-                log.info('Remove deleted device from ' + result.modifiedCount + ' documents for event ' + event.name);
+            observationModel(event).update(condition, update, options, function (err, numberAffected) {
+                log.info('Remove deleted device from ' + numberAffected + ' documents for event ' + event.name);
                 done();
-            }, err => done(err));
+            });
         }, function (err) {
             callback(err);
         });
@@ -371,7 +373,9 @@ exports.addState = function (event, id, state, callback) {
             }
         }
     };
-    observationModel(event).updateOne(condition, update, { upsert: false }).then(() => callback(null, state), err => callback(err, state));
+    observationModel(event).update(condition, update, { upsert: false }, function (err) {
+        callback(err, state);
+    });
 };
 exports.addFavorite = function (event, observationId, user, callback) {
     const update = {
@@ -379,7 +383,7 @@ exports.addFavorite = function (event, observationId, user, callback) {
             favoriteUserIds: user._id
         }
     };
-    observationModel(event).findByIdAndUpdate(observationId, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findByIdAndUpdate(observationId, update, { new: true }, callback);
 };
 exports.removeFavorite = function (event, observationId, user, callback) {
     const update = {
@@ -387,7 +391,7 @@ exports.removeFavorite = function (event, observationId, user, callback) {
             favoriteUserIds: user._id
         }
     };
-    observationModel(event).findByIdAndUpdate(observationId, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findByIdAndUpdate(observationId, update, { new: true }, callback);
 };
 exports.addImportant = function (event, observationId, important, callback) {
     const update = { important };
@@ -395,7 +399,7 @@ exports.addImportant = function (event, observationId, important, callback) {
         .findByIdAndUpdate(observationId, update, { new: true })
         .populate({ path: 'userId', select: 'displayName' })
         .populate({ path: 'important.userId', select: 'displayName' })
-        .exec().then(r => callback(null, r), e => callback(e));
+        .exec(callback);
 };
 exports.removeImportant = function (event, id, callback) {
     const update = {
@@ -403,17 +407,17 @@ exports.removeImportant = function (event, id, callback) {
             important: 1
         }
     };
-    observationModel(event).findByIdAndUpdate(id, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findByIdAndUpdate(id, update, { new: true }, callback);
 };
 exports.getAttachment = function (event, observationId, attachmentId, callback) {
     const condition = {
         _id: observationId,
         'attachments._id': attachmentId,
     };
-    observationModel(event).findOne(condition).then(observation => {
+    observationModel(event).findOne(condition, function (err, observation) {
         const attachment = observation.attachments.find(attachment => attachment._id.toString() === attachmentId);
-        callback(null, attachment);
-    }, err => callback(err));
+        callback(err, attachment);
+    });
 };
 /**
  * TODO: [OBS-NEXT] this can potentially be deleted if removing the api/attachment module,
@@ -434,20 +438,20 @@ exports.addAttachment = function (event, observationId, attachmentId, file, call
         'attachments.$.size': file.size,
         'attachments.$.relativePath': file.relativePath
     };
-    observationModel(event).findOneAndUpdate(condition, update, { new: true }).then(observation => {
-        if (!observation)
-            return callback(null);
+    observationModel(event).findOneAndUpdate(condition, update, { new: true }, function (err, observation) {
+        if (err || !observation)
+            return callback(err);
         const attachment = observation.attachments.find(attachment => attachment._id.toString() === attachmentId);
-        callback(null, attachment);
-    }, err => callback(err));
+        callback(err, attachment);
+    });
 };
 exports.removeAttachment = function (event, observationId, attachmentId, callback) {
     const update = { $pull: { attachments: { _id: attachmentId } } };
-    observationModel(event).findByIdAndUpdate(observationId, update).then(r => callback(null, r), e => callback(e));
+    observationModel(event).findByIdAndUpdate(observationId, update, callback);
 };
 exports.addAttachmentThumbnail = function (event, observationId, attachmentId, thumbnail, callback) {
     const condition = { _id: observationId, 'attachments._id': attachmentId };
     const update = { '$push': { 'attachments.$.thumbnails': thumbnail } };
-    observationModel(event).updateOne(condition, update).then(r => callback(null, r), e => callback(e));
+    observationModel(event).update(condition, update, callback);
 };
 //# sourceMappingURL=observation.js.map

package/lib/models/observation.js.map

@@ -1 +1 @@
-{"version":3,"file":"observation.js","sourceRoot":"","sources":["../../src/models/observation.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"observation.js","sourceRoot":"","sources":["../../src/models/observation.js"],"names":[],"mappings":"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"}

package/lib/models/role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../src/models/role.js"],"names":[],"mappings":"AAsDsB,0DAKrB;AAEiB,wDAKjB;AAEkB,8CAMlB;AAEoB,2DAWpB;AAEoB,sEAKpB;AAEoB,2DAKpB"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../src/models/role.js"],"names":[],"mappings":"AAsDsB,0DAIrB;AAEiB,wDAIjB;AAEkB,8CAKlB;AAEoB,2DAUpB;AAEoB,sEAIpB;AAEoB,2DAIpB"}

package/lib/models/role.js

@@ -12,7 +12,7 @@ const RoleSchema = new Schema({
     toJSON: { transform },
     toObject: { transform }
 });
-RoleSchema.pre('deleteOne', { document: true, query: false }, function (next) {
+RoleSchema.pre('remove', function (next) {
     const role = this;
     User.removeRoleFromUsers(role, function (err) {
         next(err);
@@ -29,6 +29,7 @@ RoleSchema.pre('save', function (next) {
             return next(new Error("Permission '" + permission + "' is not a valid permission"));
         }
     }
+    ;
     next();
 });
 function transform(role, ret) {
@@ -38,14 +39,20 @@ function transform(role, ret) {
 // Creates the Model for the Role Schema
 const Role = mongoose.model('Role', RoleSchema);
 exports.getRoleById = function (id, callback) {
-    Role.findById(id).then(role => callback(null, role), err => callback(err));
+    Role.findById(id, function (err, role) {
+        callback(err, role);
+    });
 };
 exports.getRole = function (name, callback) {
-    Role.findOne({ name: name }).then(role => callback(null, role), err => callback(err));
+    Role.findOne({ name: name }, function (err, role) {
+        callback(err, role);
+    });
 };
 exports.getRoles = function (callback) {
     const query = {};
-    Role.find(query).then(roles => callback(null, roles), err => callback(err));
+    Role.find(query, function (err, roles) {
+        callback(err, roles);
+    });
 };
 exports.createRole = function (role, callback) {
     const create = {
@@ -53,12 +60,18 @@ exports.createRole = function (role, callback) {
         description: role.description,
         permissions: role.permissions
     };
-    Role.create(create).then(role => callback(null, role), err => callback(err));
+    Role.create(create, function (err, role) {
+        callback(err, role);
+    });
 };
 exports.updateRole = function (id, update, callback) {
-    Role.findByIdAndUpdate(id, update, { new: true }).then(role => callback(null, role), err => callback(err));
+    Role.findByIdAndUpdate(id, update, { new: true }, function (err, role) {
+        callback(err, role);
+    });
 };
 exports.deleteRole = function (role, callback) {
-    role.deleteOne().then(() => callback(null, role), err => callback(err));
+    role.remove(function (err) {
+        callback(err, role);
+    });
 };
 //# sourceMappingURL=role.js.map

package/lib/models/role.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/models/role.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/models/role.js"],"names":[],"mappings":"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"}

package/lib/models/setting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setting.d.ts","sourceRoot":"","sources":["../../src/models/setting.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AA2BsB;;;;;;;;;;MAErB;AAEoB;;;;;;;;;;WAEpB;AAE6B;;;;;;;;;;GAE7B;AAbD;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAyD"}
+{"version":3,"file":"setting.d.ts","sourceRoot":"","sources":["../../src/models/setting.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA2BsB;;;;;;;;cAErB;AAEoB;;;;;;;;mBAEpB;AAE6B;;;;;;;;WAE7B;AAbD;;;;;;;;IAAyD"}

package/lib/models/team.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"team.d.ts","sourceRoot":"","sources":["../../src/models/team.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAgI+B,mFAI9B;AAEqB,wEAgCrB;AAEoB;;;;;;;;UAuDpB;AAEuB;;;;;;;;UAuDvB;AAE6B,gFAS7B;AAEe,yDA0Bf;AAEkB,oEA2FlB;AAkBoB,sEAiBpB;AAE4B,+EA8B5B;AAEyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAEzB;AAGoB,sEAWpB;AAEoB,2DAEpB;AAEiB,mEAWjB;AAEoB,sEAWpB;AAEyB,yFAoBzB;AAEqC,uGAKrC;AAE2B,iFAO3B;AAEuC,8FAOvC;AAE+B,sEAO/B;AA1cD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA8C"}
+{"version":3,"file":"team.d.ts","sourceRoot":"","sources":["../../src/models/team.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAkI+B,mFAI9B;AAEqB,wEAgCrB;AAEoB;;;;;;UAuDpB;AAEuB;;;;;;UAuDvB;AAE6B,gFAQ7B;AAEe,yDAyBf;AAEkB,oEA0FlB;AAkBoB,sEAkBpB;AAE4B,+EAwB5B;AAEyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEzB;AAGoB,sEAWpB;AAEoB,2DAIpB;AAEiB,mEAUjB;AAEoB,sEAUpB;AAEyB,yFAoBzB;AAEqC,uGAKrC;AAE2B,iFAO3B;AAEuC,8FAOvC;AAE+B,sEAO/B;AAlcD;;;;;;;;;;;;;;IAA8C"}

package/lib/models/team.js

@@ -44,7 +44,7 @@ function rolesWithPermission(permission) {
     }
     return roles;
 }
-TeamSchema.pre('deleteOne', { document: true, query: false }, function (next) {
+TeamSchema.pre('remove', function (next) {
     var team = this;
     if (!team.teamEventId)
         return next();
@@ -59,20 +59,23 @@ TeamSchema.pre('deleteOne', { document: true, query: false }, function (next) {
         return next();
     });
 });
-TeamSchema.pre('deleteOne', { document: true, query: false }, function (next) {
+TeamSchema.pre('remove', function (next) {
     var team = this;
     Event.removeTeamFromEvents(team, next);
 });
 TeamSchema.pre('save', function (next) {
     var team = this;
-    Team.findOne({ name: new RegExp('^' + team.name + '$', 'i') }).then(possibleDuplicate => {
+    Team.findOne({ name: new RegExp('^' + team.name + '$', 'i') }, function (err, possibleDuplicate) {
+        if (err) {
+            return next(err);
+        }
         if (possibleDuplicate && !possibleDuplicate._id.equals(team._id)) {
             const error = new Error('Team already exists');
             error.status = 409;
             return next(error);
         }
         next();
-    }, err => next(err));
+    });
 });
 function transform(team, ret, options) {
     ret.id = ret._id;
@@ -144,7 +147,7 @@ exports.getTeamById = function (id, options, callback) {
     if (options.populate == null || options.populate == 'true') {
         query = query.populate('userIds');
     }
-    query.exec().then(r => callback(null, r), e => callback(e));
+    query.exec(callback);
 };
 exports.getMembers = function (teamId, options) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -188,7 +191,7 @@ exports.getMembers = function (teamId, options) {
             };
             const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0;
             if (includeTotalCount) {
-                page.totalCount = yield User.Model.countDocuments(params);
+                page.totalCount = yield User.Model.count(params);
             }
             return page;
         }
@@ -239,7 +242,7 @@ exports.getNonMembers = function (teamId, options) {
             };
             const includeTotalCount = typeof options.includeTotalCount === 'boolean' ? options.includeTotalCount : options.pageIndex === 0;
             if (includeTotalCount) {
-                page.totalCount = yield User.Model.countDocuments(params);
+                page.totalCount = yield User.Model.count(params);
             }
             return page;
         }
@@ -253,7 +256,9 @@ exports.teamsForUserInEvent = function (user, event, callback) {
         _id: { $in: event.teamIds },
         userIds: user._id
     };
-    Team.find(conditions).then(teams => callback(null, teams), err => callback(err));
+    Team.find(conditions, function (err, teams) {
+        callback(err, teams);
+    });
 };
 exports.count = function (options, callback) {
     if (typeof options === 'function') {
@@ -274,7 +279,9 @@ exports.count = function (options, callback) {
         });
         conditions['$or'] = accesses;
     }
-    Team.countDocuments(conditions).then(count => callback(null, count), err => callback(err));
+    Team.count(conditions, function (err, count) {
+        callback(err, count);
+    });
 };
 exports.getTeams = function (options, callback) {
     var _a, e_1, _b, _c;
@@ -381,7 +388,9 @@ exports.getTeams = function (options, callback) {
             }
         }
         else {
-            baseQuery.exec().then(teams => callback(null, teams), err => callback(err));
+            baseQuery.exec(function (err, teams) {
+                callback(err, teams);
+            });
         }
     });
 };
@@ -405,10 +414,11 @@ exports.createTeam = function (team, user, callback) {
     }
     create.acl = {};
     create.acl[user._id.toString()] = 'OWNER';
-    Team.create(create).then((team) => __awaiter(this, void 0, void 0, function* () {
-        yield Team.populate(team, { path: 'userIds' });
-        callback(null, team);
-    })).catch(err => callback(err));
+    Team.create(create, function (err, team) {
+        if (err)
+            return callback(err);
+        Team.populate(team, { path: 'userIds' }, callback);
+    });
 };
 exports.createTeamForEvent = function (event, user, callback) {
     async.waterfall([
@@ -420,7 +430,7 @@ exports.createTeamForEvent = function (event, user, callback) {
                 acl: {}
             };
             team.acl[user._id.toString()] = 'OWNER';
-            Team.create(team).then(team => done(null, team), err => done(err));
+            Team.create(team, done);
         },
         function (team, done) {
             Event.addTeam(event, { id: team._id }, function (err) {
@@ -430,7 +440,7 @@ exports.createTeamForEvent = function (event, user, callback) {
     ], function (err, team) {
         if (err)
             return callback(err);
-        Team.populate(team, { path: 'userIds' }).then(team => callback(null, team), err => callback(err));
+        Team.populate(team, { path: 'userIds' }, callback);
     });
 };
 exports.getTeamForEvent = function (event) {
@@ -440,19 +450,21 @@ exports.getTeamForEvent = function (event) {
 exports.updateTeam = function (id, update, callback) {
     if (update.users) {
         update.userIds = update.users.map(function (user) { return new mongoose.Types.ObjectId(user.id); });
-        Team.findByIdAndUpdate(id, update, { new: true, populate: 'userIds' }).then(r => callback(null, r), e => callback(e));
+        Team.findByIdAndUpdate(id, update, { new: true, populate: 'userIds' }, callback);
     }
     else if (update.userIds) {
         let objectIds = update.userIds.map(function (id) { return new mongoose.Types.ObjectId(id); });
         update.userIds = objectIds;
-        Team.findByIdAndUpdate(id, update, { new: true }).then(r => callback(null, r), e => callback(e));
+        Team.findByIdAndUpdate(id, update, { new: true }, callback);
     }
     else {
-        Team.findByIdAndUpdate(id, update, { new: true, populate: 'userIds' }).then(r => callback(null, r), e => callback(e));
+        Team.findByIdAndUpdate(id, update, { new: true, populate: 'userIds' }, callback);
     }
 };
 exports.deleteTeam = function (team, callback) {
-    team.deleteOne().then(() => callback(null, team), err => callback(err));
+    team.remove(function (err) {
+        callback(err, team);
+    });
 };
 exports.addUser = function (team, user, callback) {
     var update = {
@@ -460,7 +472,9 @@ exports.addUser = function (team, user, callback) {
             userIds: new mongoose.Types.ObjectId(user.id)
         }
     };
-    Team.findByIdAndUpdate(team._id, update).then(team => callback(null, team), err => callback(err));
+    Team.findByIdAndUpdate(team._id, update, function (err, team) {
+        callback(err, team);
+    });
 };
 exports.removeUser = function (team, user, callback) {
     var update = {
@@ -468,7 +482,9 @@ exports.removeUser = function (team, user, callback) {
             userIds: { $in: [new mongoose.Types.ObjectId(user.id)] }
         }
     };
-    Team.findByIdAndUpdate(team._id, update).then(team => callback(null, team), err => callback(err));
+    Team.findByIdAndUpdate(team._id, update, function (err, team) {
+        callback(err, team);
+    });
 };
 exports.updateUserInAcl = function (teamId, userId, role, callback) {
     // validate userId
@@ -486,32 +502,32 @@ exports.updateUserInAcl = function (teamId, userId, role, callback) {
     }
     var update = {};
     update['acl.' + userId.toString()] = role;
-    Team.findOneAndUpdate({ _id: teamId }, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    Team.findOneAndUpdate({ _id: teamId }, update, { new: true }, callback);
 };
 exports.updateUserInAclForEventTeam = function (eventId, userId, role, callback) {
     var update = {};
     update['acl.' + userId.toString()] = role;
-    Team.findOneAndUpdate({ teamEventId: eventId }, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    Team.findOneAndUpdate({ teamEventId: eventId }, update, { new: true }, callback);
 };
 exports.removeUserFromAcl = function (teamId, userId, callback) {
     var update = {
         $unset: {}
     };
     update.$unset['acl.' + userId.toString()] = true;
-    Team.findByIdAndUpdate(teamId, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    Team.findByIdAndUpdate(teamId, update, { new: true }, callback);
 };
 exports.removeUserFromAclForEventTeam = function (eventId, userId, callback) {
     var update = {
         $unset: {}
     };
     update.$unset['acl.' + userId.toString()] = true;
-    Team.findOneAndUpdate({ teamEventId: eventId }, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    Team.findOneAndUpdate({ teamEventId: eventId }, update, { new: true }, callback);
 };
 exports.removeUserFromAllAcls = function (user, callback) {
     var update = {
         $unset: {}
     };
     update.$unset['acl.' + user._id.toString()] = true;
-    Team.updateMany({}, update, { new: true }).then(r => callback(null, r), e => callback(e));
+    Team.updateMany({}, update, { new: true }, callback);
 };
 //# sourceMappingURL=team.js.map