Merge pull request #207 from CoderDojo/bugfix/revert

Revert "Merge pull request #206 from Wardormeur/bugfix/1276-export-em…

Author: ArayB

lib/export-guest-list.js

@@ -12,7 +12,7 @@ function exportGuestList (args, callback) {
 
   async.waterfall([
     retrieveUserData,
-    format,
+    convertToCSV
   ], function (err, csv) {
     if (err) return callback(null, {error: err});
     return callback(null, {
@@ -33,51 +33,34 @@ function exportGuestList (args, callback) {
       if (err) return callback(err);
       async.mapSeries(applications, function (application, cb) {
         seneca.act({role: 'cd-profiles', cmd: 'list', query: {userId: application.userId}}, function (err, profiles) {
-          if (err) return callback(err);
+          if (err) return cb(err);
           var userProfile = profiles[0];
-          if (!userProfile.email || userProfile.email.trim().length === 0) {
-            application.userProfile = userProfile;
-            seneca.act({ role: 'cd-profiles', cmd: 'load_parents_for_user', userId: userProfile.userId, user: args.user }, function (err, parentProfile) {
-              if (err) callback(err);
-              if (parentProfile.length > 0) {
-                const firstParent = parentProfile[0];
-                application.userProfile.email = firstParent.email;
-                application.userProfile.phone = application.userProfile.phone || firstParent.phone;
-              }
-              cb(null, application);
-            });
-          } else {
-            cb(null, application);
-          }
+          seneca.act({role: plugin, cmd: 'loadSession', id: application.sessionId}, function (err, session) {
+            if (err) return cb(err);
+            var user = {};
+            user['Session'] = session.name;
+            user['Name'] = userProfile.name;
+            user['Phone'] = userProfile.phone || '';
+            user['Email'] = userProfile.email || '';
+            user['Ticket Name'] = application.ticketName;
+            user['Ticket Type'] = application.ticketType;
+
+            user['Status'] = application.status;
+            if(application.status === 'pending') {
+                user['Status'] = 'waiting';
+            }
+            return cb(null, user);
+          });
         });
-      }, function (err, rows) {
+      }, function (err, csvData) {
         if (err) return callback(null, {error: err});
-        return done(null, rows);
+        return done(null, csvData);
       });
     });
   }
 
-  function format(applications, done) {
-    async.mapSeries(applications, function (application, cb) {
-      seneca.act({role: plugin, cmd: 'loadSession', id: application.sessionId}, function (err, session) {
-        if (err) return callback(err);
-        var user = {};
-        user['Session'] = session.name;
-        user['Name'] = application.userProfile.name;
-        user['Phone'] = application.userProfile.phone || '';
-        user['Email'] = application.userProfile.email || '';
-        user['Ticket Name'] = application.ticketName;
-        user['Ticket Type'] = application.ticketType;
-
-        user['Status'] = application.status;
-        if(application.status === 'pending') {
-            user['Status'] = 'waiting';
-        }
-        cb(null, user);
-     })
-    }, function (err, rows) {
-      json2csv({data: rows, fields: csvFields}, done);
-    });
+  function convertToCSV (csvData, done) {
+    json2csv({data: csvData, fields: csvFields}, done);
   }
 }