remove issues from triage queue

Author: chrisdickinson

lib/sync-issues.js

@@ -1,10 +1,20 @@
 module.exports = sync
 
-function sync(db, github, repo, ready) {
+function sync(db, github, repo, syncAll, ready) {
   var next = startIssues
   var updateNeeded = []
   var lastSeen
 
+  db.run('get-most-recent-issue', [repo.id], function(err, result) {
+    if (err) {
+      return ready(err)
+    }
+
+    lastSeen = result.rows.length && !syncAll ? result.rows[0].updatedAt : new Date(0)
+    console.log('\nfetching ' + repo.user + '/' + repo.name + ' issues since ' + lastSeen)
+    next()
+  })
+
   function startIssues() {
     github.issues.repoIssues({
       user: repo.user,
@@ -19,16 +29,6 @@ function sync(db, github, repo, ready) {
     github.getNextPage(issues, onissues)
   }
 
-  db.run('get-most-recent-issue', [repo.id], function(err, result) {
-    if (err) {
-      return ready(err)
-    }
-
-    lastSeen = result.rows.length ? result.rows[0].updatedAt : new Date(0)
-    console.log('\nfetching ' + repo.user + '/' + repo.name + ' issues since ' + lastSeen)
-    next()
-  })
-
   function onissues(err, issues) {
     if (err) {
       return ready(err)
@@ -39,8 +39,12 @@ function sync(db, github, repo, ready) {
     }
 
     next = iterIssues.bind(null, issues)
-
     var shouldContinue = issues.every(function(issue) {
+      var isPullRequest = false
+      if (issue.pull_request && issue.pull_request.url) {
+        isPullRequest = 
+          +issue.pull_request.url.split('/').slice(-1)[0] === issue.number
+      }
       var obj = {
         'number': issue.number,
         'state': issue.state,
@@ -53,6 +57,7 @@ function sync(db, github, repo, ready) {
         'assignee': issue.assignee ? issue.assignee.login : '',
         'locked': issue.locked,
         'labels': issue.labels.map(function(xs) { return xs.name }),
+        'is_pull_request': isPullRequest
       }
 
       updateNeeded.push(obj)
@@ -117,7 +122,8 @@ function sync(db, github, repo, ready) {
         data.user,
         data.assignee,
         data.locked,
-        data.labels
+        data.labels,
+        data.is_pull_request
       ], ready)
     }
 
@@ -134,7 +140,8 @@ function sync(db, github, repo, ready) {
         data.user,
         data.assignee,
         data.locked,
-        data.labels
+        data.labels,
+        data.is_pull_request
       ], ready)
     }
 

migrations/0004-add-is-pull-request.sql

@@ -0,0 +1,3 @@
+BEGIN;
+ALTER TABLE nbm_issue ADD COLUMN is_pull_request BOOLEAN DEFAULT NULL;
+COMMIT;

sql/create-issue.sql

@@ -10,7 +10,8 @@ INSERT INTO "nbm_issue" (
   "user",
   "assignee",
   "locked",
-  "labels"
+  "labels",
+  "is_pull_request"
 ) VALUES (
   $1,
   $2,
@@ -23,5 +24,6 @@ INSERT INTO "nbm_issue" (
   $9,
   $10,
   $11,
-  $12
+  $12,
+  $13
 ) RETURNING "id"

sql/get-random-issue.sql

@@ -24,6 +24,7 @@ FROM "nbm_issue" "t0"
 LEFT JOIN "nbm_repo" "t1" ON ("t0"."repo_id" = "t1"."id")
 WHERE
   "t0"."state" = 'open' AND
+  "t0"."is_pull_request" = FALSE AND
   "t0"."id" NOT IN (
     SELECT "issue_id" FROM "nbm_user_issue" "t2"
     WHERE "t2"."user_id" = $1

sql/update-issue.sql

@@ -8,5 +8,6 @@ UPDATE "nbm_issue" SET
   "user" = $9,
   "assignee" = $10,
   "locked" = $11,
-  "labels" = $12
+  "labels" = $12,
+  "is_pull_request" = $13
 WHERE "number" = $1 AND "repo_id" = $2

sync-gh-issues.js

@@ -1,22 +1,26 @@
+'use strict'
+
 var sync = require('./lib/sync-issues.js')
 var getQuerybox = require('./lib/sql.js')
 var Github = require('github')
+var once = require('once')
 var pg = require('pg.js')
 
 module.exports = syncAll
 
 if (module.id === '.') {
-  syncAll(function() {})
+  syncAll(process.argv[2] === '--all', function() {})
 }
 
-function syncAll(ready_) {
-  var config = require('./config.json')
-  var ready = function(err) {
-    var fn = ready_
-    ready_ = Function()
-    fn(err)
+function syncAll(all, ready) {
+  if (arguments.length === 1) {
+    ready = all
+    all = false
   }
 
+  var config = require('./config.json')
+  ready = once(ready)
+
   var github = new Github({
       version: '3.0.0'
     , protocol: 'https'
@@ -44,7 +48,7 @@ function syncAll(ready_) {
       if (!pending) return end()
 
       results.rows.forEach(function(repo) {
-        sync(qbox, github, repo, function(err) {
+        sync(qbox, github, repo, all, function(err) {
           if (err) console.error(err.stack)
 
           !--pending && end()