@dhyasama/totem-models 6.25.1 → 6.26.2

package/lib/Organization.js

@@ -1430,10 +1430,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 }
       })

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.25.1",
+  "version": "6.26.2",
   "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'
@@ -934,6 +934,15 @@ describe('Organization', function() {
       });
     });
 
+    it('will not match partial username', function (done) {
+      Organization.findBySocial('http://twitter.com/abcdef', function (err, result) {
+        should.not.exist(err);
+        should.exist(result);
+        result.length.should.equal(0);
+        return done();
+      });
+    });
+
     it('finds orgs by twitter with https and no www', function (done) {
       Organization.findBySocial('https://twitter.com/abc', function (err, result) {
         should.not.exist(err);

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({
@@ -690,6 +690,15 @@ describe('Person', function() {
     });
   });
 
+  it('will not match on partial username', function (done) {
+    Person.findBySocial('http://facebook.com/slipperypeterpumpkin', function (err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.length.should.equal(0);
+      return done();
+    });
+  });
+
   it('finds person by facebook with https and no www', function (done) {
     Person.findBySocial('https://facebook.com/slipperypete', function (err, result) {
       should.not.exist(err);
@@ -741,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);