picker-db 4.0.0 → 4.0.2

package/modules/picker/index.js

@@ -35,12 +35,13 @@ class PickerMongoDBService {
   async createData (modelName, objToSave) {
     return new Promise((resolve, reject) => {
       const data = new this.models[modelName](objToSave);
-      data.save(objToSave, (err, res) => {
-        if (err) {
+      data.save(objToSave)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -55,12 +56,13 @@ class PickerMongoDBService {
    */
   async getDataAsync (modelName, criteria = {}, projection = {}, options = {}) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].find(criteria, projection, options, (err, res) => {
-        if (err) {
+      this.models[modelName].find(criteria, projection, options)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -76,12 +78,13 @@ class PickerMongoDBService {
    */
   async getDataPopulateAsync (modelName, criteria, projection, options, populateModel) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].find(criteria, projection, options).populate(populateModel).exec((err, res) => {
-        if (err) {
+      this.models[modelName].find(criteria, projection, options).populate(populateModel)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -96,12 +99,13 @@ class PickerMongoDBService {
    */
   async getFirstMatch (modelName, criteria, projection, options) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].findOne(criteria, projection, options, (err, res) => {
-        if (err) {
+      this.models[modelName].findOne(criteria, projection, options)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -117,12 +121,13 @@ class PickerMongoDBService {
    */
   async getFirstMatchPopulate (modelName, criteria, projection, options, populateModel) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].findOne(criteria, projection, options).populate(populateModel).exec((err, res) => {
-        if (err) {
+      this.models[modelName].findOne(criteria, projection, options).populate(populateModel)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -137,12 +142,13 @@ class PickerMongoDBService {
    */
   async updateData (modelName, criteria, dataToSet, options) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].findOneAndUpdate(criteria, dataToSet, options, (err, res) => {
-        if (err) {
+      this.models[modelName].findOneAndUpdate(criteria, dataToSet, options)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -158,12 +164,14 @@ class PickerMongoDBService {
   async updateMultiple (modelName, criteria, dataToSet, options = {}) {
     options.multi = true;
     return new Promise((resolve, reject) => {
-      this.models[modelName].update(criteria, dataToSet, options, (err, res) => {
-        if (err) {
+      // https://mongoosejs.com/docs/7.x/docs/migrating_to_7.html#removed-update
+      this.models[modelName].updateMany(criteria, dataToSet, options)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -177,12 +185,13 @@ class PickerMongoDBService {
   async deleteData (modelName, criteria) {
     return new Promise((resolve, reject) => {
       // https://mongoosejs.com/docs/migrating_to_8.html#removed-findoneandremove
-      this.models[modelName].findOneAndDelete(criteria, (err, res) => {
-        if (err) {
+      this.models[modelName].findOneAndDelete(criteria)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -195,12 +204,13 @@ class PickerMongoDBService {
    */
   async deleteMany (modelName, criteria) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].deleteMany(criteria, (err, res) => {
-        if (err) {
+      this.models[modelName].deleteMany(criteria)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -213,12 +223,14 @@ class PickerMongoDBService {
    */
   async countData (modelName, criteria) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].count(criteria, (err, res) => {
-        if (err) {
+      // https://mongoosejs.com/docs/migrating_to_8.html#removed-count
+      this.models[modelName].countDocuments(criteria)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -230,12 +242,13 @@ class PickerMongoDBService {
    */
   async aggregateData (modelName, pipeline) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].aggregate(pipeline).exec((err, res) => {
-        if (err) {
+      this.models[modelName].aggregate(pipeline)
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 
@@ -247,12 +260,13 @@ class PickerMongoDBService {
    */
   async aggregateDataCursor (modelName, pipeline) {
     return new Promise((resolve, reject) => {
-      this.models[modelName].aggregate(pipeline).allowDiskUse(true).cursor({ batchSize: 2000 }).exec((err, res) => {
-        if (err) {
+      this.models[modelName].aggregate(pipeline).allowDiskUse(true).cursor({ batchSize: 2000 })
+        .then((res) => {
+          return resolve(res);
+        })
+        .catch((err) => {
           return reject(err);
-        }
-        return resolve(res);
-      });
+        });
     });
   }
 }

package/modules/picker/schemas/bookings.js

@@ -559,6 +559,7 @@ module.exports = (connection) => {
       },
       providerFeeNoMarkup: { type: Number, min: 0 },
       restartPenaltyFee: { type: Number, default: 0 },
+      productValue: { type: Number, default: 0 },
     },
     pendingAmount: {
       type: Number,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picker-db",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Picker DB services",
   "main": "index.js",
   "scripts": {