Merge pull request #38 from lldh/patch-1

Issue #37 - Remove [bot]s from results this closes #37
paulodiovani · Oct 25, 2019 · 3665842 · 3665842
2 parents 36d6714 + cc7eb94
commit 3665842
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 9 deletions.
diff --git a/backend/api/controllers/PullRequestController.js b/backend/api/controllers/PullRequestController.js
@@ -10,15 +10,19 @@ PullRequestController.get('/:year?', async function (req, res) {
     const users = await redisClient.zrevrange(`users:${year}`, 0, -1)
     const promises = []
     let arrOfObjects = []
+
+    const nonBotUsers = users.filter((user) => {
+      return !user.endsWith("[bot]")
+    })
 
-    for (let i = 0; i < users.length; i++) {
-      promises[i] = redisClient.smembers(`pull-requests:${year}:${users[i]}`)
+    for (let i = 0; i < nonBotUsers.length; i++) {
+      promises[i] = redisClient.smembers(`pull-requests:${year}:${nonBotUsers[i]}`)
     }
 
     const result = await Promise.all(promises)
-    for (let i = 0; i < users.length; i++) {
+    for (let i = 0; i < nonBotUsers.length; i++) {
       arrOfObjects.push({
-        username: users[i],
+        username: nonBotUsers[i],
         pullRequests: result[i]
       })
     }

diff --git a/tests/unit/backend/workers/fetch-pull-requests.spec.js b/tests/unit/backend/workers/fetch-pull-requests.spec.js
@@ -35,16 +35,16 @@ describe('Script fetchPullRequests that deals with redis', () => {
   })
 
   describe('Initially adds ', () => {
-    it('adds 8 users to users:2019', async () => {
+    it('adds 9 users to users:2019', async () => {
       const users = await redisClient.zrevrange(`users:${year}`, 0, -1)
 
-      expect(users.length).toBe(8)
+      expect(users.length).toBe(9)
     })
 
-    it('adds 8 pullrequests:2019:* that correspond to 8 users', async () => {
+    it('adds 9 pullrequests:2019:* that correspond to 8 users', async () => {
       const pullRequests = await redisClient.keys(`pull-requests:${year}:*`)
 
-      expect(pullRequests.length).toBe(8)
+      expect(pullRequests.length).toBe(9)
     })
 
     it('has correct latest timestamp', async () => {

diff --git a/tests/unit/support/response.json b/tests/unit/support/response.json
@@ -1,7 +1,57 @@
 {
     "total_count": 697565,
     "incomplete_results": false,
-    "items": [
+    "items": [{
+        "url": "https://api.github.com/repos/thas[bot]/vscode/issues/1",
+        "repository_url": "https://api.github.com/repos/thas[bot]/vscode",
+        "labels_url": "https://api.github.com/repos/thas[bot]/vscode/issues/1/labels{/name}",
+        "comments_url": "https://api.github.com/repos/thas[bot]/vscode/issues/1/comments",
+        "events_url": "https://api.github.com/repos/thas[bot]/vscode/issues/1/events",
+        "html_url": "https://github.com/thas[bot]/vscode/pull/1",
+        "id": 500585109,
+        "node_id": "MDExOlB1bGxSZXF1ZXN0MzIzMDIzMDA3",
+        "number": 1,
+        "title": "Just Update",
+        "user": {
+          "login": "thas[bot]",
+          "id": 31341536,
+          "node_id": "MDQ6VXNlcjMxMzQxNTM2",
+          "avatar_url": "https://avatars0.githubusercontent.com/u/31341536?v=4",
+          "gravatar_id": "",
+          "url": "https://api.github.com/users/thas[bot]",
+          "html_url": "https://github.com/thas[bot]",
+          "followers_url": "https://api.github.com/users/thas[bot]/followers",
+          "following_url": "https://api.github.com/users/thas[bot]/following{/other_user}",
+          "gists_url": "https://api.github.com/users/thas[bot]/gists{/gist_id}",
+          "starred_url": "https://api.github.com/users/thas[bot]/starred{/owner}{/repo}",
+          "subscriptions_url": "https://api.github.com/users/thas[bot]/subscriptions",
+          "organizations_url": "https://api.github.com/users/thas[bot]/orgs",
+          "repos_url": "https://api.github.com/users/thas[bot]/repos",
+          "events_url": "https://api.github.com/users/thas[bot]/events{/privacy}",
+          "received_events_url": "https://api.github.com/users/thas[bot]/received_events",
+          "type": "User",
+          "site_admin": false
+        },
+        "labels": [],
+        "state": "closed",
+        "locked": false,
+        "assignee": null,
+        "assignees": [],
+        "milestone": null,
+        "comments": 0,
+        "created_at": "2019-10-01T00:00:00Z",
+        "updated_at": "2019-10-01T00:00:19Z",
+        "closed_at": "2019-10-01T00:00:19Z",
+        "author_association": "OWNER",
+        "pull_request": {
+          "url": "https://api.github.com/repos/thas[bot]/vscode/pulls/1",
+          "html_url": "https://github.com/thas[bot]/vscode/pull/1",
+          "diff_url": "https://github.com/thas[bot]/vscode/pull/1.diff",
+          "patch_url": "https://github.com/thas[bot]/vscode/pull/1.patch"
+        },
+        "body": "",
+        "score": 1.0
+      },
       {
         "url": "https://api.github.com/repos/thrwKappu/vscode/issues/1",
         "repository_url": "https://api.github.com/repos/thrwKappu/vscode",