@dhyasama/totem-models 7.5.0 → 7.6.0

package/lib/Financials.js

@@ -90,24 +90,8 @@ module.exports = function(mongoose, config) {
         }]
       },
 
-      metrics: [{
-        key: { type: String, trim: true },
-        value: { type: Number },
-        _id: false
-      }],
-
-      questions: [{
-        key: { type: String, trim: true },
-        value: { type: String, trim: true },
-        _id: false
-      }],
-
-      // Catch-all for customer specific key-value pairs from sheet that aren't supported by our schema
-      details: [{
-        key: { type: String, trim: true },
-        value: { type: String, trim: true },
-        _id: false
-      }],
+      kpis: { type: Schema.Types.Mixed },
+      questions: { type: Schema.Types.Mixed },
 
       comment: { type: String, trim: true },
       documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
@@ -360,6 +344,10 @@ module.exports = function(mongoose, config) {
 
     if (!financials) { return cb(new Error('financials is required'), null); }
 
+    // Required for mixed types
+    financials.markModified('kpis');
+    financials.markModified('questions');
+
     financials.save(cb);
 
   };

package/lib/Organization.js

@@ -215,8 +215,14 @@ module.exports = function(mongoose, config) {
 
           financials : {
             active: { type: Boolean, default: false },
-            questions: [{ type: String, trim: true }],
-            metrics: [{ type: String, trim: true }],
+            kpis: [{
+              name: { type: String, trim: true },
+              description: { type: String, trim: true },
+              format: { type: String, trim: true },
+            }],
+            questions: [{
+              prompt: { type: String, enum: [null, 'number', 'money', 'percentage', 'variance']},
+            }],
           },
 
           irr: {

package/lib/Round.js

@@ -875,6 +875,10 @@ module.exports = function(mongoose, config) {
 
     // participating vehicles are public
     // merge private data that was matched for customer
+    
+    doc.vehicles = _.filter(doc.vehicles, function(vehicle) {
+      return vehicle.investments.length > 0;
+    });
 
     var allInvestments = _.flatten(_.pluck(doc.vehicles, 'investments'));
     var mostRecentInvestment = _.max(allInvestments, function(investment) { return investment.investmentDate; });
@@ -890,8 +894,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////

package/package.json

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