@dhyasama/totem-models 6.26.1 → 6.28.0

package/lib/Organization.js

@@ -135,6 +135,13 @@ module.exports = function(mongoose, config) {
         customer: { type: Schema.ObjectId, ref: 'Organization' }
       }],
 
+      valuations: [{
+        amount: { type: Number, default: 0 },
+        description: { type: String, trim: true },
+        date: { type: Date, default: null },
+        customer: { type: Schema.ObjectId, ref: 'Organization' },
+      }],
+
       clearbit: {
         uuid: { type: String, unique: true, partialFilterExpression : { type : "string" }, trim: true },
         lastEnrichmentRequestedOn: { type: Date, default: null }
@@ -1430,10 +1437,10 @@ module.exports = function(mongoose, config) {
     self
       .find({ $or:
           [
-            { 'social.facebook': new RegExp('facebook.com/' + username + '$', 'i') },
-            { 'social.linkedin': new RegExp('linkedin.com/company/' + username + '$', 'i') },
-            { 'social.twitter': new RegExp('twitter.com/' + username + '$', 'i') },
-            { 'crunchbase.url': new RegExp('crunchbase.com/organization/' + username + '$', 'i') }
+            { 'social.facebook': new RegExp('facebook.com/' + username + '\/?$', 'i') },
+            { 'social.linkedin': new RegExp('linkedin.com/company/' + username + '\/?$', 'i') },
+            { 'social.twitter': new RegExp('twitter.com/' + username + '\/?$', 'i') },
+            { 'crunchbase.url': new RegExp('crunchbase.com/organization/' + username + '\/?$', 'i') }
           ],
         'deleted': { $ne: true }
       })
@@ -2121,6 +2128,7 @@ module.exports = function(mongoose, config) {
 
     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.iLevel = _.reject(doc.iLevel, 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; });

package/lib/Person.js

@@ -721,9 +721,9 @@ module.exports = function(mongoose, config) {
     self
       .find({ $or:
           [
-            { 'social.facebook': new RegExp('facebook.com/' + username + '$', 'i') },
-            { 'social.linkedin': new RegExp('linkedin.com/in/' + username + '$', 'i') },
-            { 'social.twitter': new RegExp('twitter.com/' + username + '$', 'i') }
+            { 'social.facebook': new RegExp('facebook.com/' + username + '$/?', 'i') },
+            { 'social.linkedin': new RegExp('linkedin.com/in/' + username + '\/?$', 'i') },
+            { 'social.twitter': new RegExp('twitter.com/' + username + '/?$', 'i') }
           ],
         'deleted': { $ne: true }
       })

package/package.json

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

package/test/Organization.js

@@ -76,8 +76,8 @@ describe('Organization', function() {
     org2.crunchbase.uuid = 'abc';
     org2.crunchbase.url = 'abc';
     org2.social.facebook = 'https://facebook.com/abc';
-    org2.social.linkedin = 'http://www.linkedin.com/in/abc';
-    org2.social.twitter = 'twitter.com/abc';
+    org2.social.linkedin = 'http://www.linkedin.com/in/abc/';
+    org2.social.twitter = 'twitter.com/abc/';
     org2.iLevel.push({
       customer: new mongoose.Types.ObjectId(),
       url: 'https://ilevel.com/test'

package/test/Person.js

@@ -141,7 +141,7 @@ describe('Person', function() {
     person3.aliases.push('Slippery Pete');
     person3.social = {
       facebook: 'facebook.com/slipperypete',
-      linkedin: 'http://www.linkedin.com/in/slipperypete',
+      linkedin: 'http://www.linkedin.com/in/slipperypete/',
       twitter: 'https://twitter.com/slipperypete'
     };
     person3.contact.email.push({
@@ -750,7 +750,7 @@ describe('Person', function() {
   });
 
   it('finds person by linkedin with http and no www', function (done) {
-    Person.findBySocial('http://linkedin.com/in/slipperypete', function (err, result) {
+    Person.findBySocial('http://linkedin.com/in/slipperypete?hello=world', function (err, result) {
       should.not.exist(err);
       should.exist(result);
       result.length.should.equal(1);