@dhyasama/totem-models 4.3.0 → 4.4.1

package/lib/Organization.js

@@ -139,6 +139,10 @@ module.exports = function(mongoose, config) {
         url: { type: String, unique: true, partialFilterExpression : { type :"string" }, trim: true }
       },
 
+      carta: {
+        corporationid: { type: String, unique: true, partialFilterExpression : { type :"string" }, trim: true }
+      },
+
       related: [{ type: Schema.ObjectId, ref: 'Organization' }],
 
       // customer specific (customer id is stored on note)
@@ -174,7 +178,7 @@ module.exports = function(mongoose, config) {
           }
         },
 
-        eshares: {
+        carta: {
           firmid: { type: String, unique: true, partialFilterExpression : { type :"string" }, trim: true }
         },
 
@@ -775,6 +779,24 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.findByPersonRaw = function findByPersonRaw(personId, cb) {
+
+    // Given a person id, get all organizations with that person
+    // directly from mongo driver to avoid mongoose middlewares
+
+    var self = this;
+
+    self.collection.find({ $or:
+      [
+        { 'people.person': personId },
+        { 'chairs.first': personId },
+        { 'chairs.second': personId }
+      ],
+      'deleted': { $ne: true }
+    }).toArray(cb);
+
+  };
+
   Organization.statics.findBySlug = function findBySlug(slug, cb) {
     this.findOne({ slug: slug, 'deleted': {$ne: true} }).exec(cb);
   };
@@ -894,6 +916,35 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.getByIdRaw = function getByIdRaw(id, options, cb) {
+
+    // directly from mongo driver to avoid mongoose middlewares
+
+    var self = this;
+
+    //self.collection.findOne({ "_id": id }, cb);
+
+    self.collection.findOne({ "_id": id }, function(err, result) {
+
+      if (err) return cb(err, null);
+      else if (!result) return cb(null, null);
+      else if (result.people.length == 0) return cb(null, result);
+
+      // hydrate so we can use the populate method to get people
+      // note the hydrated version is not returned
+      var hydrated = self.hydrate(result);
+      hydrated.populate({
+        path: 'people.person',
+        select: 'name avatarUrl title contact doNotDisplay'
+      }, function (err, populated) {
+        result.people = populated.people;
+        return cb(null, result);
+      });
+
+    });
+
+  };
+
   Organization.statics.getChairsOfPerson = function getChairsOfPerson(personId, cb) {
 
     var self = this;
@@ -1311,6 +1362,7 @@ module.exports = function(mongoose, config) {
   // Post-init: fired on every document when it's returned from a query
   ///////////////////////////////////////////////////////////////////////////////////////
 
+
   Organization.pre('save', function(next) {
 
     var self = this;
@@ -1483,7 +1535,6 @@ module.exports = function(mongoose, config) {
   });
 
 
-
   ///////////////////////////////////////////////////////////////////////////////////////
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////

package/lib/Person.js

@@ -719,6 +719,16 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Person.statics.getByIdRaw = function (id, cb) {
+
+    // directly from mongo driver to avoid mongoose middlewares
+
+    var self = this;
+
+    self.collection.findOne({ "_id": id }, cb);
+
+  };
+
   Person.statics.getByIdNoPopulate = function (id, cb) {
 
     this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "4.3.0",
+  "version": "4.4.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -19,7 +19,7 @@
     "async": "^2.6.1",
     "awesome-phonenumber": "^1.0.14",
     "bcrypt": "^0.8.0",
-    "bluebird": "^3.5.0",
+    "bluebird": "^3.5.2",
     "escape-string-regexp": "^1.0.5",
     "moment": "^2.22.2",
     "mongoose-deep-populate": "^3.0.0",

package/test/Organization.js

@@ -486,6 +486,17 @@ describe('Organization', function() {
 
   });
 
+  it('finds an org without mongoose sugar', function(done) {
+
+    Organization.getByIdRaw(org1._id, {}, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      (result instanceof Organization).should.equal(false);
+      done();
+    });
+
+  });
+
   it('gets an org by id', function(done) {
 
      Organization.getById(org1.id, { role: 'lp-full' }, function(err, org) {
@@ -558,6 +569,19 @@ describe('Organization', function() {
 
   });
 
+  it('finds orgs by person without mongoose sugar', function(done) {
+
+    Organization.findByPersonRaw(person._id, function(err, result) {
+      should.not.exist(err);
+      should.exist(result);
+      result.length.should.equal(1);
+      result[0]._id.toString().should.equal(org1.id.toString());
+      (result[0] instanceof Organization).should.equal(false);
+      done();
+    });
+
+  });
+
   it('finds boards of a person', function(done) {
 
     Organization.getBoardsOfPerson(person2.id, function(err, result) {

package/test/Person.js

@@ -666,6 +666,17 @@ describe('Person', function() {
 
   });
 
+  it('finds a person without mongoose sugar', function(done) {
+
+    Person.getByIdRaw(person5._id, function(err, person) {
+      should.not.exist(err);
+      should.exist(person);
+      (person instanceof Person).should.equal(false);
+      done();
+    });
+
+  });
+
   it('finds the primary email for a person', function(done) {
 
     Person.getById(person.id, function(err, person) {