fix async issue

w3c · Jul 9, 2018 · d571154 · d571154
1 parent 9963612
commit d571154
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/lib/transition-checker.js b/lib/transition-checker.js
@@ -33,6 +33,7 @@ TransitionChecker.check = function (profile, latestVersion, previousVersion, isE
         var directorApprovalFound = false;
         var commApprovalFound = false;
         var issueFound = false;
+        var issueNumber;
 
         repo.issues.fetch(
           {
@@ -45,29 +46,36 @@ TransitionChecker.check = function (profile, latestVersion, previousVersion, isE
           for (var issue of content.items) {
             if (issue.title.endsWith(' ' + shortname)) {
               issueFound = true;
+              issueNumber = issue.number;
               repo.issues(issue.number).comments.fetch()
               .then((comments) => {
+                var promises = [];
+
                 for (var comment of comments.items) {
                   if (comment.body.toLowerCase().startsWith(directorApproval)) {
                     // Director's approval
-                    octo.teams(global.GH_DIRECTOR_TEAM_ID).members(comment.user.login).fetch((err) => {
+                    var p1 = octo.teams(global.GH_DIRECTOR_TEAM_ID).members(comment.user.login).fetch((err) => {
                       if (!err) directorApprovalFound = true;
                     });
+                    promises.push(p1);
                   }
                   else if (comment.body.toLowerCase().startsWith(commApproval)) {
                     // Comm's approval
-                    octo.teams(global.GH_COMM_TEAM_ID).members(comment.user.login).fetch((err) => {
+                    var p2 = octo.teams(global.GH_COMM_TEAM_ID).members(comment.user.login).fetch((err) => {
                       if (!err) commApprovalFound = true;
                     });
+                    promises.push(p2);
                   }
                 }
-                if (!directorApprovalFound) errors = errors.push('Director\'s approval not found.');
-                if (!commApprovalFound) errors = errors.push('Communication team\'s approval not found.');
-                if (directorApprovalFound && commApprovalFound) {
-                  // Close issue
-                  repo.issues(issue.number).update({ state: 'closed' });
-                }
-                return resolve({ errors: errors, requiresCfE: true });
+                Promise.all(promises).then(function () {
+                  if (!directorApprovalFound) errors = errors.push('Approval from Director not found.');
+                  if (!commApprovalFound) errors = errors.push('Approval from Communication Team not found.');
+                  if (directorApprovalFound && commApprovalFound) {
+                    // Close issue
+                    repo.issues(issueNumber).update({ state: 'closed' });
+                  }
+                  return resolve({ errors: errors, requiresCfE: true });
+                });
               });
             }
           }