feat: added reviewers to contribution list

mntnr · Oct 20, 2017 · d847cf2 · d847cf2
1 parent 64bf01f
commit d847cf2
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 23 deletions.
diff --git a/src/graphql.js b/src/graphql.js
@@ -130,6 +130,9 @@ const executequery = (token, query, debugMode) => {
         })
       })
     req.on('error', reject)
+    if (debugMode) {
+      console.log(formatQuery(query))
+    }
     req.write(formatQuery(query))
     req.end()
   })

diff --git a/src/queries.js b/src/queries.js
@@ -20,6 +20,15 @@ const reactorQ = node('reactions', {first: 10})
                           .addChild(node('name'))
                           .addChild(node('url'))))
 
+const reviewAuthoredQ = node('nodes')
+      .addChild(node('id'))
+      .addChild(node('author')
+                .addChild(node('login'))
+                .addChild(node('... on User')
+                          .addChild(node('name'))
+                          .addChild(node('url'))))
+      .addChild(node('createdAt'))
+
 const authoredQ = node('nodes')
       .addChild(reactorQ)
       .addChild(node('id'))
@@ -30,17 +39,24 @@ const authoredQ = node('nodes')
                           .addChild(node('url'))))
       .addChild(node('createdAt'))
 
+const reviewPartQ = reviewAuthoredQ
+      .addChild(node('comments', {first: 20})
+                .addChild(pagination)
+                .addChild(reviewAuthoredQ))
+
+const reviewQ = node('reviews', {first: 20})
+      .addChild(pagination)
+      .addChild(reviewPartQ)
+
 const participantsQ = authoredQ
       .addChild(node('comments', {first: 100})
                 .addChild(pagination)
                 .addChild(authoredQ))
 
 const prsQ = node('pullRequests', {first: 100})
       .addChild(pagination)
-      .addChild(participantsQ)
-      .addChild(node('reviews', {first: 20)
-                .addChild(paginations)
-                .addChild(participantsQ))
+      .addChild(participantsQ
+                .addChild(reviewQ))
 
 const issuesQ = node('issues', {first: 100})
       .addChild(pagination)
@@ -225,15 +241,23 @@ const cleanRepo = async (token, result, before, after) => {
     query: commitCommentQ
   })
 
-  const prCs = await depaginateAll(prs, {
+  const reviews = await depaginateAll(prs, {
+    token,
+    acc: pr => pr.reviews.nodes,
+    type: 'PullRequest',
+    key: 'reviews',
+    query: reviewPartQ
+  })
+
+  const prComments = await depaginateAll(prs, {
     token,
     acc: pr => pr.comments.nodes,
     type: 'PullRequest',
     key: 'comments',
     query: authoredQ
   })
 
-  const issueCs = await depaginateAll(issues, {
+  const issueComments = await depaginateAll(issues, {
     token,
     acc: issue => issue.comments.nodes,
     type: 'Issue',
@@ -247,27 +271,28 @@ const cleanRepo = async (token, result, before, after) => {
     type: 'CommitComment',
     key: 'reactions',
     query: reactorQ
-    })).concat(await depaginateAll(issueCs, {
-      token,
-      acc: ic => ic.reactions.nodes,
-      type: 'IssueComment',
-      key: 'reactions',
-      query: reactorQ
-    })).concat(await depaginateAll(prCs, {
-      token,
-      acc: prc => prc.reactions.nodes,
-      type: 'PullRequestComment',
-      key: 'reactions',
-      query: reactorQ
-    }))
+  })).concat(await depaginateAll(issueComments, {
+    token,
+    acc: ic => ic.reactions.nodes,
+    type: 'IssueComment',
+    key: 'reactions',
+    query: reactorQ
+  })).concat(await depaginateAll(prComments, {
+    token,
+    acc: prc => prc.reactions.nodes,
+    type: 'PullRequestComment',
+    key: 'reactions',
+    query: reactorQ
+  }))
 
   return {
     commitCommentators: process(commitComments),
     prCreators: process(prs),
-    prCommentators: process(prCs),
+    prCommentators: process(prComments),
     issueCreators: process(issues),
-    issueCommentators: process(issueCs),
-    reactors: process(reactions)
+    issueCommentators: process(issueComments),
+    reactors: process(reactions),
+    reviewers: process(reviews)
   }
 }
 

diff --git a/test/integration-test.js b/test/integration-test.js
@@ -38,7 +38,8 @@ const emptyResponse = {
   prCreators: [],
   prCommentators: [],
   issueCreators: [],
-  issueCommentators: []
+  issueCommentators: [],
+  reviewers: []
 }
 
 test('No contributions in a single second', t => {