@dhyasama/totem-models 1.30.0 → 1.30.2

package/lib/Organization.js

@@ -1289,6 +1289,14 @@ module.exports = function(mongoose, config) {
         });
       }
 
+      // Add website to website aliases
+      // There are unique constraints on website and website aliases
+      // This enables us to enforce uniqueness across both and across documents
+      if (self.website && self.websiteAliases) {
+        self.websiteAliases.push(self.website)
+        self.websiteAliases = _.uniq(self.websiteAliases);
+      }
+
     };
 
     cleanContactInfo();
@@ -1311,6 +1319,13 @@ module.exports = function(mongoose, config) {
     // remove customer details if not viewing self
     if (doc._id.toString() != CUSTOMER_ID) doc.customer = {};
 
+    // Website is stored in aliases to facilitate enforcing uniqueness
+    // Remove it here to make it easier for consumers to provide a good ux
+    // It will get added back in during pre save hook
+    if (doc.website && doc.websiteAliases && doc.websiteAliases.length >= 1) {
+      doc.websiteAliases = _.reject(doc.websiteAliases, function(alias) { return alias == doc.website; });
+    }
+
     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.docs = _.reject(doc.docs, function(item) { return !item.customer || item.customer.toString() != CUSTOMER_ID; });

package/package.json

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

package/test/Organization.js

@@ -841,15 +841,28 @@ describe('Organization', function() {
     ];
 
     Organization.upsert(temp, 'test-user', function(err, result) {
+
       should.not.exist(err);
       should.exist(result);
       result.website.should.equal('www.yum.net');
-      result.websiteAliases.length.should.equal(4);
+      result.websiteAliases.length.should.equal(5); // the four aliases plus the primary
       result.websiteAliases.indexOf('yum.co').should.not.equal(-1);
       result.websiteAliases.indexOf('anglophile.co.uk').should.not.equal(-1);
       result.websiteAliases.indexOf('abc.subdomain.com').should.not.equal(-1);
       result.websiteAliases.indexOf('trailingslash.edu').should.not.equal(-1);
-      return done();
+
+      Organization.getById(temp._id, function(err, result) {
+
+        should.not.exist(err);
+        should.exist(result);
+
+        // main website should no longer be here because of post-find hook
+        result.websiteAliases.length.should.equal(4);
+
+        return done();
+
+      });
+
     });
 
   });