refactor to keep it cleaner

Author: Bryan Kendall

lib/models/mongo/instance.js

@@ -74,52 +74,32 @@ InstanceSchema.statics.getGithubUsernamesForInstances = function (sessionUser, i
     var instancesByCreatedByGithubId = groupBy(instances, 'createdBy.github');
     var createdByGithubIds = Object.keys(instancesByCreatedByGithubId);
     async.parallel([
-      function fetchGithubOwners (cb) {
-        var count = createCount(ownerGithubIds.length, cb);
-        ownerGithubIds.map(toInt).forEach(function (githubId) {
-          sessionUser.findGithubUserByGithubId(githubId, function (err, user) {
-            var username = null;
-            var gravatar = null;
-            if (err) {
-              // log error, and continue
-              error.logIfErr(err);
-            }
-            else {
-              username = user.login;
-              gravatar = user.avatar_url;
-            }
-            instancesByOwnerGithubId[githubId].forEach(function (instance) {
-              instance.owner.username = username;
-              instance.owner.gravatar = gravatar;
-            });
-            count.next(); // don't pass error
-          });
-        });
-      },
-      function fetchGithubCreatedBy (cb) {
-        var count = createCount(createdByGithubIds.length, cb);
-        createdByGithubIds.map(toInt).forEach(function (githubId) {
-          sessionUser.findGithubUserByGithubId(githubId, function (err, user) {
-            var username = null;
-            var gravatar = null;
-            if (err) {
-              // log error, and continue
-              error.logIfErr(err);
-            }
-            else {
-              username = user.login;
-              gravatar = user.avatar_url;
-            }
-            instancesByCreatedByGithubId[githubId].forEach(function (instance) {
-              instance.createdBy.username = username;
-              instance.createdBy.gravatar = gravatar;
-            });
-            count.next(); // don't pass error
-          });
-        });
-      }
+      populateField.bind(null, ownerGithubIds, instancesByOwnerGithubId, 'owner'),
+      populateField.bind(null, createdByGithubIds, instancesByCreatedByGithubId, 'createdBy')
     ], done);
   }
+
+  function populateField (keyIds, mapToUpdateList, fieldPath, cb) {
+    async.each(keyIds.map(toInt), function (githubId, asyncCb) {
+      sessionUser.findGithubUserByGithubId(githubId, function (err, user) {
+        var username = null;
+        var gravatar = null;
+        if (err) {
+          // log error, and continue
+          error.logIfErr(err);
+        }
+        else {
+          username = user.login;
+          gravatar = user.avatar_url;
+        }
+        mapToUpdateList[githubId].forEach(function (instance) {
+          keypather.set(instance, fieldPath + '.username', username);
+          keypather.set(instance, fieldPath + '.gravatar', gravatar);
+        });
+        asyncCb(); // don't pass error
+      });
+    }, cb);
+  }
   function done (err) {
     cb(err, instances);
   }