@dhyasama/totem-models 10.26.0 → 10.27.1

package/lib/Deal.js

@@ -340,44 +340,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Deal.statics.modifyCustomField = function modifyCustomField(id, key, value, customerId, options, cb) {
-
-    const self = this;
-
-    if (!cb) { throw new Error('cb is required'); }
-    if (!id) { return cb(new Error('id is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), null); }
-    if (!key) { return cb(new Error('key is required'), null); }
-    if (!customerId) { return cb(new Error('customerId is required'), null); }
-    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
-
-    // Dynamic custom field name requires building object this way, rather than { 'customField.' + key: value }
-    let keyValue = {};
-    keyValue['customFields.' + key] = value;
-
-    const historyItem = {
-      timestamp: new Date(),
-      account: options.account,
-      stage: null,
-      description: 'The deal details were updated'
-    };
-
-    const update = {
-      $set: keyValue,
-      $push: { history: historyItem }
-    };
-
-    const match = {
-      _id: id,
-      customer: customerId
-    };
-
-    const query = self.updateOne(match, update, { upsert: false, new: true });
-
-    query.exec(cb);
-
-  };
-
   Deal.statics.modifyPoll = function modifyPoll(id, key, voterid, vote, customerId, options, cb) {
 
     // Poll is the custom field type, but the actual field name/key can be anything
@@ -419,6 +381,17 @@ module.exports = function(mongoose, config) {
         votedOn: new Date()
       };
 
+      let addFields = {};
+      addFields[path] = {
+        "$cond": {
+          "if": {
+            "$ne": [ { "$type": "$" + path }, "array" ]
+          },
+          "then": [],
+          "else": "$" + path
+        }
+      };
+
       // Dynamic custom field name requires building object this way, rather than { 'customField.' + key: value }
       let set = {};
       set[path] = {
@@ -457,7 +430,10 @@ module.exports = function(mongoose, config) {
           '_id': id,
           customer: customerId
         },
-        [{ $set: set }], // must be part of aggregation pipeline for set conditions to work
+        [
+          { $addFields: addFields },
+          { $set: set }
+        ], // must be part of aggregation pipeline for conditions to work
         { upsert: false, new: true }
       );
 
@@ -518,6 +494,43 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Deal.statics.modifyProperty = function modifyProperty(id, key, value, customerId, options, cb) {
+
+    const self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!id) { return cb(new Error('id is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), null); }
+    if (!key) { return cb(new Error('key is required'), null); }
+    if (!customerId) { return cb(new Error('customerId is required'), null); }
+    if (!mongoose.Types.ObjectId.isValid(customerId)) { return cb(new Error('customerId is not a valid ObjectId'), null); }
+
+    let keyValue = {};
+    keyValue[key] = value;
+
+    const historyItem = {
+      timestamp: new Date(),
+      account: options.account,
+      stage: null,
+      description: 'The deal details were updated'
+    };
+
+    const update = {
+      $set: keyValue,
+      $push: { history: historyItem }
+    };
+
+    const match = {
+      _id: id,
+      customer: customerId
+    };
+
+    const query = self.updateOne(match, update, { upsert: false, new: true });
+
+    query.exec(cb);
+
+  };
+
   Deal.statics.upsert = function upsert(deal, options, cb) {
 
     // Deal is dumb and doesn't validate customer stages or duplicate deals. That responsibility is with the org.

package/lib/Organization.js

@@ -241,7 +241,7 @@ module.exports = function(mongoose, config) {
             type: { type: String, enum: ['Text', 'Number', 'Checkbox', 'Single Select', 'Multiple Select', 'Timestamp', 'Tags', 'Person', 'Org', 'Poll'] },
 
             // These are the number formats
-            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy'] },
+            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy', 'long'] },
 
             // These will be the choices in polls, single-selects and multi-selects
             options: [{
@@ -411,7 +411,7 @@ module.exports = function(mongoose, config) {
             type: { type: String, enum: ['Text', 'Number', 'Checkbox', 'Single Select', 'Multiple Select', 'Timestamp', 'Tags', 'Person', 'Org', 'Poll'] },
 
             // These are the number formats
-            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy'] },
+            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy', 'long'] },
 
             // These will be the choices in polls, single-selects and multi-selects
             options: [{
@@ -474,7 +474,7 @@ module.exports = function(mongoose, config) {
             type: { type: String, enum: ['Text', 'Number', 'Checkbox', 'Single Select', 'Multiple Select', 'Timestamp', 'Tags', 'Person', 'Org', 'Poll'] },
 
             // These are the number formats
-            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy'] },
+            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy', 'long'] },
 
             // These will be the choices in polls, single-selects and multi-selects
             options: [{
@@ -539,7 +539,7 @@ module.exports = function(mongoose, config) {
             type: { type: String, enum: ['Text', 'Number', 'Checkbox', 'Single Select', 'Multiple Select', 'Timestamp', 'Tags', 'Person', 'Org', 'Poll'] },
 
             // These are the number formats
-            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy'] },
+            format: { type: String, enum: [null, 'number', 'abbreviated', 'decimal', 'financials', 'currency', 'ownership', 'multiple', 'variance', 'M/d/yy', 'long'] },
 
             // These will be the choices in polls, single-selects and multi-selects
             options: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "10.26.0",
+  "version": "10.27.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",