@dhyasama/totem-models 8.47.0 → 8.48.0

package/lib/Round.js

@@ -54,14 +54,9 @@ module.exports = function(mongoose, config) {
       // These references are removed by the Investment post-remove hook calling Round.removeInvestment
       investments: [{ type: Schema.ObjectId, ref: 'Investment', required: false }],
 
-      // computed from investments
-      investment: { type: Number, default: 0 },
-      unrealized: { type: Number, default: 0 },
-      realized: { type: Number, default: 0 },
-
       _id: false
 
-    }]
+    }],
 
   });
 
@@ -202,19 +197,6 @@ module.exports = function(mongoose, config) {
 
   };
 
-  ///////////////////////////////////////////////////////////////////////////////////////
-  // VIRTUALS
-  // Properties that are not persisted to the database
-  ///////////////////////////////////////////////////////////////////////////////////////
-
-  Round.virtual('value').get(function () {
-    // sums the value (realized and unrealized) of all vehicles in the round
-    var self = this;
-    return _.reduce(self.vehicles, function(memo, vehicle) {
-      return memo + vehicle.unrealized + vehicle.realized;
-    }, 0);
-  });
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // METHODS
   //
@@ -227,7 +209,7 @@ module.exports = function(mongoose, config) {
   // will add a bunch of things and then just get saved once.
   ///////////////////////////////////////////////////////////////////////////////////////
 
-  Round.methods.addInvestment = function addInvestment(investment, fund, data) {
+  Round.methods.addInvestment = function addInvestment(investment, fund) {
 
     // Add an investment reference
     // Investment data is private
@@ -252,7 +234,7 @@ module.exports = function(mongoose, config) {
     }
 
     // Create or update
-    var vehicle = self.addVehicle(fund, data);
+    var vehicle = self.addVehicle(fund);
     var fid = mongoose.Types.ObjectId.isValid(vehicle.fund) ? vehicle.fund : vehicle.fund._id;
 
     // The vehicle returned by addVehicle, appears to be a copy not a reference which is odd to me.
@@ -304,7 +286,7 @@ module.exports = function(mongoose, config) {
 
   };
 
-  Round.methods.addVehicle = function addVehicle(fund, data) {
+  Round.methods.addVehicle = function addVehicle(fund) {
 
     // Add a vehicle, which is a fund
     // This data is public
@@ -322,10 +304,6 @@ module.exports = function(mongoose, config) {
       if (!mongoose.Types.ObjectId.isValid(fund)) throw new Error('Need a valid fund objectid!');
     }
 
-    data = data || {};
-    data.unrealized = data.unrealized || 0;
-    data.realized = data.realized || 0;
-
     // Check if vehicle is already added
     let vehicle = _.find(self.vehicles, function(v) {
       let fundid = mongoose.Types.ObjectId.isValid(v.fund) ? v.fund : v.fund._id;
@@ -333,17 +311,10 @@ module.exports = function(mongoose, config) {
     });
 
     // update data on existing vehicle
-    if (vehicle) {
-      vehicle.unrealized = data.unrealized;
-      vehicle.realized = data.realized;
-    }
-    // create vehicle
-    else {
+    if (!vehicle) {
       vehicle = {
         fund: fund,
-        investments: [],
-        unrealized: data.unrealized,
-        realized: data.realized
+        investments: []
       };
       self.vehicles.push(vehicle);
     }
@@ -405,12 +376,13 @@ module.exports = function(mongoose, config) {
       // reverse chronological
       rounds = _.sortBy(rounds, function(r) {
 
-        // use investment date in absence of closing date
-        if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
-          date = r.vehicles[0].investments[0].date;
+        if (r.vehicles.length && r.vehicles[0].investments.length) {
+          return r.vehicles[0].investments[0].date;
         }
 
-        return date;
+        else {
+          return false;
+        }
 
       }).reverse();
 
@@ -465,12 +437,13 @@ module.exports = function(mongoose, config) {
       // reverse chronological
       rounds = _.sortBy(rounds, function(r) {
 
-        // use investment date in absence of closing date
-        if (!date && r.vehicles.length && r.vehicles[0].investments.length) {
-          date = r.vehicles[0].investments[0].date;
+        if (r.vehicles.length && r.vehicles[0].investments.length) {
+          return r.vehicles[0].investments[0].date;
         }
 
-        return date;
+        else {
+          return false;
+        }
 
       }).reverse();
 
@@ -557,7 +530,7 @@ module.exports = function(mongoose, config) {
 
       let totalInvestment = _.reduce(rounds, function(memo, round) {
         let roundInvestment = _.reduce(round.vehicles, function(memo, vehicle) { return memo + vehicle.investment; }, 0);
-        return memo + roundCost;
+        return memo + roundInvestment;
       }, 0);
 
       let totalUnrealized = _.reduce(rounds, function(memo, round) {
@@ -870,15 +843,6 @@ module.exports = function(mongoose, config) {
 
     if (!doc || !doc.vehicles) { return next(); }
 
-    // note participating people are public as there is no investment, i.e., private, data attached to them
-
-    // participating vehicles are public
-    // merge private data that was matched for customer
-
-    doc.vehicles = _.filter(doc.vehicles, function(vehicle) {
-      return vehicle.investments.length > 0;
-    });
-
     next();
 
   });

package/package.json

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