rename functions

Author: Bryan Kendall

lib/models/mongo/instance.js

@@ -49,7 +49,7 @@ InstanceSchema.statics.findByBuild = function (build /*, args*/) {
   Instance.find.apply(Instance, args);
 };
 
-InstanceSchema.methods.getGithubUsername = function (sessionUser, cb) {
+InstanceSchema.methods.populateOwnerAndCreatedBy = function (sessionUser, cb) {
   var instance = this;
   async.parallel({
     owner: sessionUser.findGithubUserByGithubId.bind(sessionUser, this.owner.github),
@@ -64,7 +64,8 @@ InstanceSchema.methods.getGithubUsername = function (sessionUser, cb) {
   });
 };
 
-InstanceSchema.statics.getGithubUsernamesForInstances = function (sessionUser, instances, cb) {
+InstanceSchema.statics.populateOwnerAndCreatedByForInstances =
+function (sessionUser, instances, cb) {
   if (instances.length === 0) {
     done();
   }

lib/routes/actions/github.js

@@ -400,7 +400,7 @@ function followBranch (instancesKey) {
             next();
           },
           timers.model.stopTimer('github_push_event'),
-          instances.getGithubUsernamesForInstances(
+          instances.populateOwnerAndCreatedByForInstances(
             'instanceCreator', 'deployedInstances'),
           heap.create(),
           heap.model.track('githubPushInfo.user.id', 'github_hook_autodeploy', {
@@ -453,4 +453,4 @@ function waitForContextVersionBuildCompleted (contextVersionIdsKey) {
       next();
     }
   );
-}
+}

lib/routes/instances/index.js

@@ -269,9 +269,9 @@ app.get('/instances/',
     ownerIsHelloRunnable('query')
   ),
   instances.find('query'),
-  timers.model.startTimer('getGithubUsername'),
-  instances.getGithubUsernamesForInstances('sessionUser', 'instances'),
-  timers.model.stopTimer('getGithubUsername'),
+  timers.model.startTimer('populateOwnerAndCreatedByForInstances'),
+  instances.populateOwnerAndCreatedByForInstances('sessionUser', 'instances'),
+  timers.model.stopTimer('populateOwnerAndCreatedByForInstances'),
   timers.model.startTimer('instance-route.populateModels'),
   instances.models.populateModels(),
   timers.model.stopTimer('instance-route.populateModels'),
@@ -348,7 +348,7 @@ app.post('/instances/',
       error.logIfErrMw),
     mw.next('err') // next error
   ),
-  instances.model.getGithubUsername('sessionUser'),
+  instances.model.populateOwnerAndCreatedBy('sessionUser'),
   instances.model.populateModels(),
   messenger.emitInstanceUpdate('instance', 'post'),
   mw.res.send(201, 'instance'));
@@ -362,7 +362,7 @@ app.get('/instances/:id',
     me.isOwnerOf('instance'),
     instances.model.isPublic(),
     me.isModerator),
-  instances.model.getGithubUsername('sessionUser'),
+  instances.model.populateOwnerAndCreatedBy('sessionUser'),
   instances.model.populateModels(),
   mw.res.json('instance'));
 
@@ -528,7 +528,7 @@ app.patch('/instances/:id',
       instances.model.update({ $set: 'body' }),
       instances.findById('instanceId')),
   instances.findById('instanceId'),
-  instances.model.getGithubUsername('sessionUser'),
+  instances.model.populateOwnerAndCreatedBy('sessionUser'),
   mw.body({ or: ['name', 'env'] }).require()
     .then(
       // acquire lock
@@ -695,7 +695,7 @@ app.post('/instances/:id/actions/deploy',
     // create container
     createSaveAndNetworkContainer,
     graph.create(),
-    instances.model.getGithubUsername('sessionUser'),
+    instances.model.populateOwnerAndCreatedBy('sessionUser'),
     graph.model.graphInstanceDeps('instance'))
   .catch(
     mw.req().setToErr('err'),
@@ -755,7 +755,7 @@ app.post('/instances/:id/actions/redeploy',
     // create container
     createSaveAndNetworkContainer,
     graph.create(),
-    instances.model.getGithubUsername('sessionUser'),
+    instances.model.populateOwnerAndCreatedBy('sessionUser'),
     graph.model.graphInstanceDeps('instance'))
   .catch(
     mw.req().setToErr('err'),
@@ -937,7 +937,7 @@ app.post('/instances/:id/actions/regraph',
   checkFound('user', 'Owner not found'),
   mw.req().set('ownerUsername', 'user.login'),
   graph.create(),
-  instances.model.getGithubUsername('sessionUser'),
+  instances.model.populateOwnerAndCreatedBy('sessionUser'),
   graph.model.graphInstanceDeps('instance'),
   instances.model.populateModels(),
   mw.req().set('instance.owner.username', 'ownerUsername'),