@dhyasama/totem-models 9.105.0 → 9.107.0

package/lib/Organization.js

@@ -567,81 +567,6 @@ module.exports = function(mongoose, config) {
   // Properties that are not persisted to the database
   ///////////////////////////////////////////////////////////////////////////////////////
 
-  Organization.virtual('acquired.amount').get(function () {
-
-    const self = this;
-    const publicData = self.operating.acquired.public || {};
-    const privateData = self.operating.acquired.private || [];
-
-    if (publicData.amount) return publicData.amount;
-    else if (privateData.length >= 1) {
-      if (privateData[0].amount) return privateData[0].amount;
-      else return 0;
-    }
-    else return 0;
-
-  });
-
-  Organization.virtual('acquired.by').get(function () {
-
-    const self = this;
-    const publicData = self.operating.acquired.public || {};
-    const privateData = self.operating.acquired.private || [];
-
-    if (publicData.by) return publicData.by;
-    else if (privateData.length >= 1) {
-      if (privateData[0].by) return privateData[0].by;
-      else return null;
-    }
-    else return null;
-
-  });
-
-  Organization.virtual('acquired.on').get(function () {
-
-    const self = this;
-    const publicData = self.operating.acquired.public || {};
-    const privateData = self.operating.acquired.private || [];
-
-    if (publicData.acquiredOn) return publicData.acquiredOn;
-    else if (privateData.length >= 1) {
-      if (privateData[0].acquiredOn) return privateData[0].acquiredOn;
-      else return null;
-    }
-    else return null;
-
-  });
-
-  Organization.virtual('merged.with').get(function () {
-
-    const self = this;
-    const publicData = self.operating.merged.public || {};
-    const privateData = self.operating.merged.private || [];
-
-    if (publicData.with) return publicData.with;
-    else if (privateData.length >= 1) {
-      if (privateData[0].with) return privateData[0].with;
-      else return null;
-    }
-    else return null;
-
-  });
-
-  Organization.virtual('merged.on').get(function () {
-
-    const self = this;
-    const publicData = self.operating.merged.public || {};
-    const privateData = self.operating.merged.private || [];
-
-    if (publicData.mergedOn) return publicData.mergedOn;
-    else if (privateData.length >= 1) {
-      if (privateData[0].mergedOn) return privateData[0].mergedOn;
-      else return null;
-    }
-    else return null;
-
-  });
-
   Organization.virtual('address.primary').get(function () {
     var primary = _.find(this.contact.address, function(address) {
       return address.primary;
@@ -779,19 +704,6 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Organization.virtual('inactive').get(function () {
-
-    var self = this;
-    var privateData = self.operating.closed.private || [];
-
-    if (privateData.length == 1) {
-      if (privateData[0].hasZeroUnrealizedValue) return true;
-      else return false;
-    }
-    else return false;
-
-  });
-
   Organization.virtual('leaders.all').get(function () {
 
     var self = this;
@@ -846,18 +758,108 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Organization.virtual('shutdown').get(function () {
+  Organization.virtual('operating.closed.on').get(function () {
 
-    var self = this;
-    var publicData = self.operating.closed.public || {};
-    var privateData = self.operating.closed.private || [];
+    const self = this;
+    const publicData = self.operating.closed.public || {};
+    const privateData = self.operating.closed.private || [];
 
-    if (publicData.closedOn) return true;
-    else if (privateData.length == 1) {
-      if (privateData[0].closedOn) return true;
-      else return false;
+    if (publicData.closedOn) return publicData.closedOn;
+    else if (privateData.length >= 1) {
+      if (privateData[0].closedOn) return privateData[0].closedOn;
+      else return null;
     }
-    else return false;
+    else return null;
+
+  });
+
+  Organization.virtual('operating.closed.hasZeroUnrealizedValue').get(function () {
+
+    const self = this;
+    const publicData = self.operating.closed.public || {};
+    const privateData = self.operating.closed.private || [];
+
+    if (publicData.closedOn) return false;
+    else if (privateData.length >= 1) {
+      if (privateData[0].hasZeroUnrealizedValue) return privateData[0].hasZeroUnrealizedValue;
+      else return null;
+    }
+    else return null;
+
+  });
+
+  Organization.virtual('operating.acquired.amount').get(function () {
+
+    const self = this;
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
+
+    if (publicData.amount) return publicData.amount;
+    else if (privateData.length >= 1) {
+      if (privateData[0].amount) return privateData[0].amount;
+      else return 0;
+    }
+    else return 0;
+
+  });
+
+  Organization.virtual('operating.acquired.by').get(function () {
+
+    const self = this;
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
+
+    if (publicData.by) return publicData.by;
+    else if (privateData.length >= 1) {
+      if (privateData[0].by) return privateData[0].by;
+      else return null;
+    }
+    else return null;
+
+  });
+
+  Organization.virtual('operating.acquired.on').get(function () {
+
+    const self = this;
+    const publicData = self.operating.acquired.public || {};
+    const privateData = self.operating.acquired.private || [];
+
+    if (publicData.acquiredOn) return publicData.acquiredOn;
+    else if (privateData.length >= 1) {
+      if (privateData[0].acquiredOn) return privateData[0].acquiredOn;
+      else return null;
+    }
+    else return null;
+
+  });
+
+  Organization.virtual('operating.merged.with').get(function () {
+
+    const self = this;
+    const publicData = self.operating.merged.public || {};
+    const privateData = self.operating.merged.private || [];
+
+    if (publicData.with) return publicData.with;
+    else if (privateData.length >= 1) {
+      if (privateData[0].with) return privateData[0].with;
+      else return null;
+    }
+    else return null;
+
+  });
+
+  Organization.virtual('operating.merged.on').get(function () {
+
+    const self = this;
+    const publicData = self.operating.merged.public || {};
+    const privateData = self.operating.merged.private || [];
+
+    if (publicData.mergedOn) return publicData.mergedOn;
+    else if (privateData.length >= 1) {
+      if (privateData[0].mergedOn) return privateData[0].mergedOn;
+      else return null;
+    }
+    else return null;
 
   });
 
@@ -865,11 +867,13 @@ module.exports = function(mongoose, config) {
 
     const self = this;
 
+    if(self.operating && self.operating.closed && self.operating.closed.on) console.log(self.operating.closed.toString());
+
     if (self.ipo && self.ipo.ticker) return 'IPO';
-    else if (self.acquired && (self.acquired.by || self.acquired.on)) return 'Acquired';
-    else if (self.merged && (self.merged.with || self.merged.on)) return 'Merged';
-    else if (self.shutdown) return 'Shutdown';
-    else if (self.inactive) return 'Inactive';
+    else if (self.operating && self.operating.acquired && (self.operating.acquired.by || self.operating.acquired.on)) return 'Acquired';
+    else if (self.operating && self.operating.merged && (self.operating.merged.with || self.operating.merged.on)) return 'Merged';
+    else if (self.operating && self.operating.closed && (self.operating.closed.on && !self.operating.closed.hasZeroUnrealizedValue)) return 'Shutdown';
+    else if (self.operating && self.operating.closed && (!self.operating.closed.on && self.operating.closed.hasZeroUnrealizedValue)) return 'Inactive';
     else return 'Active';
 
   });
@@ -1357,6 +1361,8 @@ module.exports = function(mongoose, config) {
     query.populate('funds', 'name shortName hexColorCode abbreviation closeDate');
     query.populate('operating.acquired.public.by', 'name logoUrl');
     query.populate('operating.acquired.private.by', 'name logoUrl');
+    query.populate('operating.merged.public.with', 'name logoUrl');
+    query.populate('operating.merged.private.with', 'name logoUrl');
     query.populate(dealPopulateOptions);
 
     if (options.role !== 'none') {
@@ -2002,29 +2008,6 @@ module.exports = function(mongoose, config) {
 
   Organization.post('init', function(doc, next) {
 
-    // Protect private data
-    // Merge public and private data
-
-    // const CUSTOMER_ID = this[CUSTOMER_ID];
-    // let err;
-    //
-    // if (!CUSTOMER_ID) {
-    //   err = new Error('Missing CUSTOMER_ID');
-    //   if (next) { return next(err); }
-    //   else { throw err; }
-    // }
-    //
-    // else if (CUSTOMER_ID === 'GLOBAL_PROCESS' && next) { return next(); }
-    //
-    // else if (!mongoose.Types.ObjectId.isValid(CUSTOMER_ID)) {
-    //   err = new Error('CUSTOMER_ID is not a valid ObjectId');
-    //   if (next) { return next(err); }
-    //   else { throw err; }
-    // }
-
-    // remove customer details if not viewing self
-    //if (doc._id.toString() !== CUSTOMER_ID) { doc.customer = {}; }
-
     // Website is stored in aliases to facilitate enforcing uniqueness
     // Remove it here to make it easier for consumers to provide a good ux
     // It will get added back in during pre save hook
@@ -2032,13 +2015,6 @@ module.exports = function(mongoose, config) {
       doc.websiteAliases = _.reject(doc.websiteAliases, function(alias) { return alias === doc.website; });
     }
 
-    // doc.lps = _.reject(doc.lps, function(item) { return !item.customer || item.customer.toString() !== CUSTOMER_ID; });
-    // doc.filters = _.reject(doc.filters, function(item) { return !item.customer || item.customer.toString() !== CUSTOMER_ID; });
-    // doc.valuations = _.reject(doc.valuations, function(item) { return !item.customer || item.customer.toString() !== CUSTOMER_ID; });
-    // doc.chairs = _.reject(doc.chairs, function(item) { return !item.customer || item.customer.toString() !== CUSTOMER_ID; });
-    // doc.operating.acquired.private = _.find(doc.operating.acquired.private, function(item) { return !item.customer || item.customer.toString() === CUSTOMER_ID; });
-    // doc.operating.closed.private = _.find(doc.operating.closed.private, function(item) { return !item.customer || item.customer.toString() === CUSTOMER_ID; });
-
     // people
     _.each(doc.people, function(person) {
 

package/package.json

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