@dhyasama/totem-models 3.9.0 → 3.11.0

package/lib/Organization.js

@@ -650,10 +650,49 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Organization.statics.removeCustomerFilters = function(customerId, cb) {
+
+    var self = this;
+
+    self
+      .update(
+        { 'filters.customer': customerId },
+        { $pull : { 'filters': { 'customer': customerId } } },
+        { multi : true }
+      )
+      .exec(cb);
+      
+  };
+
   Organization.statics.findByDomains = function findByDomains(domains, cb) {
-    domains = domains.map(function(domain){ return domain.toLowerCase() })
+
+    // we haven't been able to avoid some domains having a protocol prefix in the database
+    // until we can, use protocol as part of searching by domain
+
+    domains = domains || [];
+    domains = _.compact(domains);
+
+    // standardize with lowercase and no protocol
+    domains = domains.map(function(d) {
+      d = d.toLowerCase();
+      d = d.replace('http://', '').replace('https://', '');
+      return d.toLowerCase()
+    });
+
+    // add http and https alternatives for each domain
+    var alternativeDomains = [];
+    _.each(domains, function(d) {
+      alternativeDomains.push('http://' + d);
+      alternativeDomains.push('https://' + d);
+    });
+
+    domains = domains.concat(alternativeDomains);
+
+    _.each(domains, function(d) { console.log(d); });
+
     var query = this.find({ $or: [ {'website': { $in : domains }}, {'websiteAliases': { $in : domains }} ], 'deleted': {$ne: true} });
     query.exec(cb);
+
   };
 
   Organization.statics.findByFunds = function findByFunds(fundids, cb) {
@@ -833,7 +872,7 @@ module.exports = function(mongoose, config) {
     if (config.CUSTOMER_ID != 'GLOBAL_PROCESS') lpPopulateOptions.match = { customer: config.CUSTOMER_ID };
 
     var query = self.findById(id);
-    query.populate('people.person', 'name avatarUrl title doNotDisplay');
+    query.populate('people.person', 'name avatarUrl title contact doNotDisplay');
     query.populate('related', 'name logoUrl');
     query.populate('chairs.first', 'name avatarUrl title');
     query.populate('chairs.second', 'name avatarUrl title');

package/package.json

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

package/test/config.js

@@ -13,7 +13,7 @@ module.exports = {
     suppressDebugLog: true,
 
     db: {
-      uri: 'mongodb://ffvc:ytnn5m7A9snIJSOLRqwo7Bpo2QkyYx6q@ds043952.mongolab.com:43952/ff-platform-test'
+      uri: 'mongodb://gZvwpF5aLFvdc7KFa7qLLiZYv6CTLdfs:TKfdi3LD4583f8EL11k5Y0uukZ151d9n@test-shard-00-00-gv0f3.mongodb.net:27017,test-shard-00-01-gv0f3.mongodb.net:27017,test-shard-00-02-gv0f3.mongodb.net:27017/test?ssl=true&replicaSet=Test-shard-0&authSource=admin'
     },
 
     crypto: {