Resolve #13: Filter pull requests to owned repositories (#16)

my-contributions · Mar 24, 2018 · 3199eb6 · 3199eb6
1 parent 538ee8e
commit 3199eb6
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/src/api/GitHub.js b/src/api/GitHub.js
@@ -231,8 +231,9 @@ export default class GitHub {
     async _fetchPullRequests() {
         const q = encodeURIComponent('type:pr author:' + this._author);
         const pullRequests = await this._fetchPages('https://api.github.com/search/issues?per_page=100&q=' + q);
+        const filtered = pullRequests.items.filter((item) => item.author_association != 'OWNER');
 
-        const promises = pullRequests.items.map(async (item) => {
+        const promises = filtered.map(async (item) => {
             if (item.state == 'closed' && await this._isMerged(item.pull_request.url)) {
                 item.state = 'merged';
             }

diff --git a/src/api/GitHub.test.js b/src/api/GitHub.test.js
@@ -124,6 +124,7 @@ describe('aggregatePullRequests', () => {
                 return mockResponse({items: [
                     {
                         repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/1'},
                         state: 'open',
                     },
@@ -138,6 +139,7 @@ describe('aggregatePullRequests', () => {
                 return mockResponse({items: [
                     {
                         repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/2'},
                         state: 'closed',
                     },
@@ -182,43 +184,98 @@ describe('aggregatePullRequests', () => {
         await expect(github.aggregatePullRequests()).resolves.toEqual(result);
     });
 
+    it('filters owned', async () => {
+        window.fetch.mockImplementation((url) => {
+            switch (url) {
+            case 'https://api.github.com/search/issues?per_page=100&q=type%3Apr%20author%3Atest':
+                return mockResponse({items: [
+                    {
+                        repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
+                        pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/1'},
+                        state: 'open',
+                    },
+                    {
+                        repository_url: 'https://api.github.com/repos/user/repo2',
+                        author_association: 'OWNER',
+                        pull_request: {url: 'https://api.github.com/repos/user/repo2/pulls/1'},
+                        state: 'open',
+                    },
+                ]});
+            case 'https://api.github.com/repos/user/repo1':
+                return mockResponse({
+                    html_url: 'https://github.com/user/repo1',
+                    full_name: 'Repo 1',
+                    stargazers_count: 1,
+                    language: 'JavaScript',
+                });
+            default:
+                return { ok: false };
+            }
+        });
+
+        const result = [
+            {
+                repository: {
+                    html_url: 'https://github.com/user/repo1',
+                    full_name: 'Repo 1',
+                    stargazers_count: 1,
+                    language: 'JavaScript',
+                },
+                open: 1,
+                closed: 0,
+                merged: 0,
+                html_url: 'https://github.com/search?utf8=✓&q=type%3Apr%20author%3Atest%20repo%3ARepo%201',
+            },
+        ];
+
+        await expect(github.aggregatePullRequests()).resolves.toEqual(result);
+    });
+
     it('aggregates', async () => {
         window.fetch.mockImplementation((url) => {
             switch (url) {
             case 'https://api.github.com/search/issues?per_page=100&q=type%3Apr%20author%3Atest':
                 return mockResponse({items: [
                     {
                         repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/1'},
                         state: 'open',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/2'},
                         state: 'closed',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo1',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo1/pulls/3'},
                         state: 'closed',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo2',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo2/pulls/1'},
                         state: 'open',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo2',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo2/pulls/2'},
                         state: 'open',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo3',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo3/pulls/1'},
                         state: 'closed',
                     },
                     {
                         repository_url: 'https://api.github.com/repos/user/repo3',
+                        author_association: 'CONTRIBUTOR',
                         pull_request: {url: 'https://api.github.com/repos/user/repo3/pulls/2'},
                         state: 'closed',
                     },