@dhyasama/totem-models 6.21.5 → 6.21.6

package/lib/Organization.js

@@ -1303,8 +1303,16 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    if (!value) { return cb(new Error('value must be provided'), null); }
+
     var getUsername = function getUsername(val) {
 
+      if (!val) { return ''; }
+      if (val.indexOf('@') === 0) { val = val.replace('@', ''); }
+
+      var username = '';
+      var usernameRegExp = new RegExp("^[A-Za-z0-9_.@]{3,}$");
+      var usernameMatch = [];
       var URL = require('url');
       var parsedUrl = URL.parse(val);
       var protocol = parsedUrl.protocol;
@@ -1318,9 +1326,14 @@ module.exports = function(mongoose, config) {
       if (pathname.indexOf('organization/') === 0) { pathname = pathname.replace('organization/', ''); }
       if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
 
-      console.log('Username:', val, '-->', pathname);
+      if (pathname) { usernameMatch = usernameRegExp.exec(pathname); }
+      else { usernameMatch = usernameRegExp.exec(val); }
+
+      if (usernameMatch.length) { username = usernameMatch[0]; }
+
+      console.log('Username:', val, '-->', username);
 
-      return pathname;
+      return username;
 
     };
 

package/lib/Person.js

@@ -712,8 +712,16 @@ module.exports = function(mongoose, config) {
 
     var self = this;
 
+    if (!value) { return cb(new Error('value must be provided'), null); }
+
     var getUsername = function getUsername(val) {
 
+      if (!val) { return ''; }
+      if (val.indexOf('@') === 0) { val = val.replace('@', ''); }
+
+      var username = '';
+      var usernameRegExp = new RegExp("^[A-Za-z0-9_.@]{3,}$");
+      var usernameMatch = [];
       var URL = require('url');
       var parsedUrl = URL.parse(val);
       var protocol = parsedUrl.protocol;
@@ -726,9 +734,14 @@ module.exports = function(mongoose, config) {
       if (pathname.indexOf('in/') === 0) { pathname = pathname.replace('in/', ''); }
       if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
 
-      console.log('Username:', val, '-->', pathname);
+      if (pathname) { usernameMatch = usernameRegExp.exec(pathname); }
+      else { usernameMatch = usernameRegExp.exec(val); }
+
+      if (usernameMatch.length) { username = usernameMatch[0]; }
+
+      console.log('Username:', val, '-->', username);
 
-      return pathname;
+      return username;
 
     };
 

package/package.json

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

package/test/Organization.js

@@ -955,6 +955,24 @@ describe('Organization', function() {
       });
     });
 
+    it('finds orgs by social when just a username', function (done) {
+      Organization.findBySocial('abc', function (err, result) {
+        should.not.exist(err);
+        should.exist(result);
+        result.length.should.equal(1);
+        return done();
+      });
+    });
+
+    it('finds orgs by social when just a username with an at', function (done) {
+      Organization.findBySocial('@abc', function (err, result) {
+        should.not.exist(err);
+        should.exist(result);
+        result.length.should.equal(1);
+        return done();
+      });
+    });
+
     it('finds orgs by ids', function (done) {
       Organization.findByIds([org4._id, org5._id], function (err, result) {
         should.not.exist(err);

package/test/Person.js

@@ -735,7 +735,25 @@ describe('Person', function() {
     });
   });
 
+  it('finds person by linkedin with just a handle', function (done) {
+    Person.findBySocial('slipperypete', function (err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.length.should.equal(1);
+      result[0].slug.should.equal('person3-slug');
+      return done();
+    });
+  });
 
+  it('finds person by linkedin with just an at handle', function (done) {
+    Person.findBySocial('@slipperypete', function (err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.length.should.equal(1);
+      result[0].slug.should.equal('person3-slug');
+      return done();
+    });
+  });