Merge pull request #184 from Wardormeur/bugfix/timeouts

Moved salesforce related functionnalities into remote queue in cp-sal…

Author: Wardormeur

profiles.js

@@ -173,7 +173,7 @@ module.exports = function (options) {
         if (err) return done(err);
 
         if (process.env.SALESFORCE_ENABLED === 'true') {
-          process.nextTick(function () { updateSalesForce(profile); });
+          seneca.act({role: 'cd-salesforce', cmd: 'queud_update_profiles', param: profile, fatal$: false});
         }
 
         syncUserObj(profile, function (err, res) {
@@ -189,50 +189,6 @@ module.exports = function (options) {
     }
   }
 
-  function salesForceLogger (level, message) {
-    if (level === 'error') {
-      seneca.log.error(message);
-    } else if (level === 'success') {
-      seneca.log.info(message);
-    } else if (level === 'info') {
-      seneca.log.info(message);
-    }
-  }
-
-  function updateSalesForce (profile) {
-    seneca.make$(ENTITY_NS).load$(profile.id, function (err, res) {
-      if (err) return salesForceLogger('error', '[error][salesforce] profile id: ' + profile.id + ' not present');
-
-      if (res.userType.toLowerCase() === 'champion') {
-        var dobOffset = moment(profile.dob).utcOffset();
-        var account = {
-          PlatformId__c: profile.userId
-        };
-        _.extend(account, {
-          Name: profile.name,
-          Email__c: profile.email,
-          DateofBirth__c: moment.utc(profile.dob).add(dobOffset, 'minutes'),
-          BillingCountry: profile.country.countryName || null,
-          BillingCity: profile.place.nameWithHierarchy || null,
-          BillingState: profile.place.admin2Name || null,
-          BillingStreet: profile.address || null,
-          Phone: profile.phone || null,
-          Linkedin__c: profile.linkedin || null,
-          Twitter__c: (profile.twitter) ? 'https://twitter.com/' + profile.twitter : null,
-          Notes__c: profile.notes || null,
-          Projects__c: profile.projects || null,
-          ProgrammingLanguages__c: (profile.programmingLanguages) ? profile.programmingLanguages.join(';') : null,
-          LanguagesSpoken__c: (profile.languagesSpoken) ? profile.languagesSpoken.join(';') : null
-        });
-
-        seneca.act('role:cd-salesforce,cmd:save_account', {userId: profile.userId, account: account}, function (err, res) {
-          if (err) return salesForceLogger('error', '[error][salesforce] error saving champion account id: ' + profile.userId);
-          return salesForceLogger('success', '[salesforce] updated champion account id: ' + profile.userId);
-        });
-      }
-    });
-  }
-
   function syncUserObj (profile, done) {
     var updatedFields = {};
     updatedFields.id = profile.userId;

service.js

@@ -26,14 +26,18 @@ require('./migrate-psql-db.js')(function (err) {
 
   seneca.use(require('./email-notifications.js'));
   seneca.use(require('./agreements.js'));
-  seneca.use(require('./profiles.js'), {postgresql: config['postgresql-store']});
+  seneca.use(require('./profiles.js'), { postgresql: config['postgresql-store'] });
   seneca.use(require('./oauth2.js'), config.oauth2);
   seneca.use('user');
   seneca.use('auth');
-  seneca.use(require('./users.js'), {'email-notifications': config['email-notifications'], 'postgresql': config['postgresql-store'], 'users': config['users']});
+  seneca.use(require('./users.js'),
+            { 'email-notifications': config['email-notifications'],
+              'postgresql': config['postgresql-store'],
+              'users': config['users']
+            });
   seneca.use(require('./nodebb-api.js'), config.nodebb);
 
   seneca.listen()
-  .client({type: 'web', port: 10304, pin: 'role:cd-salesforce,cmd:*'})
-  .client({type: 'web', port: 10301, pin: 'role:cd-dojos,cmd:*'});
+  .client({ type: 'web', port: 10304, pin: { role: 'cd-salesforce', cmd: '*' } })
+  .client({ type: 'web', port: 10301, pin: 'role:cd-dojos,cmd:*' });
 });

users.js

@@ -37,7 +37,6 @@ module.exports = function (options) {
     var seneca = this;
     seneca.act({role: plugin, cmd: 'load', id: args.id}, function (err, user) {
       if (err) return done(err);
-
       return done(null, _.pick(user, ['id', 'email', 'name']));
     });
   }
@@ -59,29 +58,6 @@ module.exports = function (options) {
     seneca.make(ENTITY_NS).list$(query, done);
   }
 
-  // We create an Account in Salesforce with the champion information and we also create a Lead.
-  // The user.id is used for both Account and Leads.
-  function updateSalesForce (user) {
-    // ideally would be done in a workqueue
-    process.nextTick(function () {
-      if (process.env.SALESFORCE_ENABLED !== 'true') return;
-
-      var account = {
-        PlatformId__c: user.id,
-        PlatformUrl__c: 'https://zen.coderdojo.com/dashboard/profile/' + user.id,
-        Email__c: user.email,
-        Name: user.name,
-        UserType__c: 'Champion',
-        RecordTypeId: process.env.SALESFORCE_ACC_RECORDTYPEID
-      };
-
-      seneca.act('role:cd-salesforce,cmd:save_account', {userId: user.id, account: account}, function (err, res) {
-        if (err) return seneca.log.error('Error creating Account in SalesForce!', err);
-        seneca.log.info('Created Account in SalesForce', account, res);
-      });
-    });
-  }
-
   function cmd_register (args, done) {
     var isChampion = args.isChampion === true;
     var locality = args.locality || 'en_US';
@@ -163,7 +139,9 @@ module.exports = function (options) {
         };
         seneca.act({role: 'cd-profiles', cmd: 'save', profile: profileData}, function (err, profile) {
           if (err) return done(err);
-          if (registerResponse.ok === true && isChampion === true) updateSalesForce(registerResponse.user);
+          if (registerResponse.ok === true && isChampion === true) {
+            seneca.act({role: 'cd-salesforce', cmd: 'queud_update_users', param: {user: registerResponse.user}, fatal$: false});
+          }
           done(null, registerResponse);
         });
       });