@dhyasama/totem-models 12.9.0 → 12.10.0

package/lib/Organization.js

@@ -639,10 +639,11 @@ module.exports = function(mongoose, config) {
   ///////////////////////////////////////////////////////////////////////////////////////
 
   Organization.virtual('address.primary').get(function () {
-    var primary = _.find(this.contact.address, function(address) {
-      return address.primary;
+    var addresses = this && this.contact && this.contact.address ? this.contact.address : [];
+    var primary = _.find(addresses, function(address) {
+      return address && address.primary;
     });
-    return primary ? primary.address : null;
+    return primary || null;
   });
 
   Organization.virtual('board.all').get(function () {

package/package.json

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

package/test/Organization.js

@@ -1127,6 +1127,87 @@ describe('Organization', function() {
       });
     });
 
+    it('finds the primary address for an org', function(done) {
+
+      var o = new Organization();
+      o.name = 'Addressable';
+      o.slug = 'addressable';
+      o.website = 'addressable.org';
+
+      o.contact.address = [];
+      o.contact.address.push({
+        street: '1 Main Street',
+        city: 'Portland',
+        state: 'ME',
+        country: 'USA',
+        postalCode: '04101',
+        primary: false
+      });
+      o.contact.address.push({
+        street: '2 Center Street',
+        city: 'Bangor',
+        state: 'ME',
+        country: 'USA',
+        postalCode: '04412',
+        primary: true
+      });
+
+      Organization.upsert(o, 'test-user', function(err, org) {
+
+        should.not.exist(err);
+        should.exist(org);
+
+        Organization.findById(org._id).lean({ virtuals: true })
+          .then(function(result) {
+            should.exist(result);
+            should.exist(result.address);
+            should.exist(result.address.primary);
+            result.address.primary.postalCode.should.equal('04412');
+            done();
+          })
+          .catch(done);
+
+      });
+
+    });
+
+    it('does not throw when contact is omitted from a lean projection', function(done) {
+
+      var o = new Organization();
+      o.name = 'Projected';
+      o.slug = 'projected';
+      o.website = 'projected.org';
+
+      o.contact.address = [];
+      o.contact.address.push({
+        street: '10 Broad Street',
+        city: 'New York',
+        state: 'NY',
+        country: 'USA',
+        postalCode: '10004',
+        primary: true
+      });
+
+      Organization.upsert(o, 'test-user', function(err, org) {
+
+        should.not.exist(err);
+        should.exist(org);
+
+        Organization.findById(org._id)
+          .select('name')
+          .lean({ virtuals: true })
+          .then(function(result) {
+            should.exist(result);
+            should.exist(result.address);
+            should.equal(result.address.primary, null);
+            done();
+          })
+          .catch(done);
+
+      });
+
+    });
+
     it('cleans people', function (done) {
 
       var littleDirtyOrg = new Organization();