volunteer-contributions-fetch 2.3.4 → 2.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/github.js +48 -13
- package/lib/github.test.js +76 -8
- package/package.json +1 -1
package/lib/github.js
CHANGED
|
@@ -54,12 +54,12 @@ async function gather({ github }, existingContributions = []) {
|
|
|
54
54
|
const latestCommit = existingContributions.find((contribution) => {
|
|
55
55
|
return contribution.source === GITHUB_COMMIT_CATEGORY;
|
|
56
56
|
}) || { createdAt: github.stopDate };
|
|
57
|
-
const latestIssue = existingContributions.find(
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
)
|
|
62
|
-
|
|
57
|
+
const latestIssue = existingContributions.find(
|
|
58
|
+
(contribution) => contribution.source === GITHUB_ISSUES_CREATED_CATEGORY
|
|
59
|
+
) || { createdAt: github.stopDate };
|
|
60
|
+
const latestPR = existingContributions.find(
|
|
61
|
+
(contribution) => contribution.source === GITHUB_PR_CREATED_CATEGORY
|
|
62
|
+
) || { createdAt: github.stopDate };
|
|
63
63
|
const latestReview = existingContributions.find((contribution) => {
|
|
64
64
|
return contribution.source === GITHUB_REVIEW_CATEGORY;
|
|
65
65
|
}) || { createdAt: github.stopDate };
|
|
@@ -83,9 +83,16 @@ async function gather({ github }, existingContributions = []) {
|
|
|
83
83
|
|
|
84
84
|
const commits = await processCommits(github, latestCommit.createdAt);
|
|
85
85
|
const issues = await processIssues(github, latestIssue.createdAt);
|
|
86
|
+
const prs = await processPRs(github, latestPR.createdAt);
|
|
86
87
|
const reviews = await processReviews(github, latestReview.createdAt);
|
|
87
88
|
const comments = await processComments(github, latestComment.createdAt);
|
|
88
|
-
const contributions = [
|
|
89
|
+
const contributions = [
|
|
90
|
+
...commits,
|
|
91
|
+
...issues,
|
|
92
|
+
...prs,
|
|
93
|
+
...reviews,
|
|
94
|
+
...comments,
|
|
95
|
+
];
|
|
89
96
|
|
|
90
97
|
debug('Finished gathering contributions');
|
|
91
98
|
return contributions;
|
|
@@ -120,6 +127,35 @@ async function processIssues(github, latestCreationDate) {
|
|
|
120
127
|
});
|
|
121
128
|
}
|
|
122
129
|
|
|
130
|
+
async function processPRs(github, latestCreationDate) {
|
|
131
|
+
if (
|
|
132
|
+
typeof github.issuesEnabled !== 'undefined' &&
|
|
133
|
+
github.issuesEnabled === false
|
|
134
|
+
) {
|
|
135
|
+
debug('Fetching PRs is disabled through `issuesEnabled`, skipping!');
|
|
136
|
+
return [];
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
debug('Getting PRs from Github');
|
|
140
|
+
const allPRs = [];
|
|
141
|
+
|
|
142
|
+
const lowerBoundDate = new Date(latestCreationDate);
|
|
143
|
+
const generatedPeriod = periodGenerator(github.stopDate, lowerBoundDate);
|
|
144
|
+
for await (const periodChunk of generatedPeriod) {
|
|
145
|
+
const currentPage = pageGenerator(github, periodChunk, (period, page) =>
|
|
146
|
+
getPRPage(github, 'author', period, page)
|
|
147
|
+
);
|
|
148
|
+
for await (const prs of currentPage) {
|
|
149
|
+
debug(`Got ${prs.length} PRs`);
|
|
150
|
+
allPRs.push(prs);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
return allPRs.flat().filter((issue) => {
|
|
155
|
+
return new Date(issue.createdAt) > new Date(latestCreationDate);
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
|
|
123
159
|
async function processCommits(github, latestCreationDate) {
|
|
124
160
|
if (
|
|
125
161
|
typeof github.commitsEnabled !== 'undefined' &&
|
|
@@ -173,7 +209,7 @@ async function processReviews(github, latestCreationDate) {
|
|
|
173
209
|
const currentPage = pageGenerator(
|
|
174
210
|
github,
|
|
175
211
|
periodChunk,
|
|
176
|
-
(period, page) => getPRPage(github, period, page),
|
|
212
|
+
(period, page) => getPRPage(github, 'reviewed-by', period, page),
|
|
177
213
|
{ skipProcessing: true }
|
|
178
214
|
);
|
|
179
215
|
for await (const prs of currentPage) {
|
|
@@ -365,9 +401,8 @@ async function getIssuePage(github, relationship, issuesPeriod, page) {
|
|
|
365
401
|
debug(`Getting issues page ${page} between ${after} and ${before}`);
|
|
366
402
|
await waitFor(github.delayMsPerRequest ?? DELAY_FETCHING_MS);
|
|
367
403
|
try {
|
|
368
|
-
const additionalFields = relationship === 'commenter' ? '+is:issue' : '';
|
|
369
404
|
const items = await fetcher.searchIssues({
|
|
370
|
-
q: `${relationship}:${github.username}+created:${after}..${before}
|
|
405
|
+
q: `${relationship}:${github.username}+created:${after}..${before}+is:issue`,
|
|
371
406
|
sort: 'created',
|
|
372
407
|
page,
|
|
373
408
|
});
|
|
@@ -383,14 +418,14 @@ async function getIssuePage(github, relationship, issuesPeriod, page) {
|
|
|
383
418
|
}
|
|
384
419
|
}
|
|
385
420
|
|
|
386
|
-
async function getPRPage(github, reviewPeriod, page) {
|
|
421
|
+
async function getPRPage(github, relationship, reviewPeriod, page) {
|
|
387
422
|
const [before, after] = reviewPeriod;
|
|
388
423
|
|
|
389
|
-
debug(`Getting
|
|
424
|
+
debug(`Getting PR page ${page} between ${after} and ${before}`);
|
|
390
425
|
await waitFor(github.delayMsPerRequest ?? DELAY_FETCHING_MS);
|
|
391
426
|
try {
|
|
392
427
|
const items = await fetcher.searchIssues({
|
|
393
|
-
q:
|
|
428
|
+
q: `${relationship}:${github.username}+created:${after}..${before}+is:pull-request`,
|
|
394
429
|
sort: 'created',
|
|
395
430
|
page,
|
|
396
431
|
});
|
package/lib/github.test.js
CHANGED
|
@@ -407,22 +407,22 @@ test.serial('should fetch issues until stop date', async (t) => {
|
|
|
407
407
|
|
|
408
408
|
await github.gather(commitConfig);
|
|
409
409
|
t.deepEqual(fetcher.searchIssues.getCall(0).args[0], {
|
|
410
|
-
q: `author:${config.github.username}+created:2022-03-01..2022-03-31`,
|
|
410
|
+
q: `author:${config.github.username}+created:2022-03-01..2022-03-31+is:issue`,
|
|
411
411
|
sort: 'created',
|
|
412
412
|
page: 1,
|
|
413
413
|
});
|
|
414
414
|
t.deepEqual(fetcher.searchIssues.getCall(1).args[0], {
|
|
415
|
-
q: `author:${config.github.username}+created:2022-03-01..2022-03-31`,
|
|
415
|
+
q: `author:${config.github.username}+created:2022-03-01..2022-03-31+is:issue`,
|
|
416
416
|
sort: 'created',
|
|
417
417
|
page: 2,
|
|
418
418
|
});
|
|
419
419
|
t.deepEqual(fetcher.searchIssues.getCall(2).args[0], {
|
|
420
|
-
q: `author:${config.github.username}+created:2022-02-01..2022-02-28`,
|
|
420
|
+
q: `author:${config.github.username}+created:2022-02-01..2022-02-28+is:issue`,
|
|
421
421
|
sort: 'created',
|
|
422
422
|
page: 1,
|
|
423
423
|
});
|
|
424
424
|
t.deepEqual(fetcher.searchIssues.getCall(3).args[0], {
|
|
425
|
-
q: `author:${config.github.username}+created:2022-01-01..2022-01-31`,
|
|
425
|
+
q: `author:${config.github.username}+created:2022-01-01..2022-01-31+is:issue`,
|
|
426
426
|
sort: 'created',
|
|
427
427
|
page: 1,
|
|
428
428
|
});
|
|
@@ -611,6 +611,74 @@ test.serial('should ignore issues not matching filter', async (t) => {
|
|
|
611
611
|
t.is(result.length, 0);
|
|
612
612
|
});
|
|
613
613
|
|
|
614
|
+
test.serial('should fetch PRs until stop date', async (t) => {
|
|
615
|
+
const commitConfig = {
|
|
616
|
+
github: {
|
|
617
|
+
...config.github,
|
|
618
|
+
commitsEnabled: false,
|
|
619
|
+
reviewsEnabled: false,
|
|
620
|
+
},
|
|
621
|
+
};
|
|
622
|
+
|
|
623
|
+
fetcher.searchIssues.resolves([]);
|
|
624
|
+
// We want to fetch 2 pages for the first period, and one page for the subsequent periods.
|
|
625
|
+
// We expect 3 periods to be queried based on the passed stopDate and the faked clock.
|
|
626
|
+
// Therefore PRs start with 3 as before it searches for issues
|
|
627
|
+
fetcher.searchIssues
|
|
628
|
+
.onCall(3)
|
|
629
|
+
.resolves(
|
|
630
|
+
new Array(100).fill(0).map(() => ({ createdAt: new Date('2022-03-01') }))
|
|
631
|
+
);
|
|
632
|
+
fetcher.searchIssues
|
|
633
|
+
.onCall(4)
|
|
634
|
+
.resolves(
|
|
635
|
+
new Array(5).fill(0).map(() => ({ createdAt: new Date('2022-02-01') }))
|
|
636
|
+
);
|
|
637
|
+
fetcher.searchIssues
|
|
638
|
+
.onCall(5)
|
|
639
|
+
.resolves(
|
|
640
|
+
new Array(5).fill(0).map(() => ({ createdAt: new Date('2022-01-01') }))
|
|
641
|
+
);
|
|
642
|
+
|
|
643
|
+
await github.gather(commitConfig);
|
|
644
|
+
t.deepEqual(fetcher.searchIssues.getCall(3).args[0], {
|
|
645
|
+
q: `author:${config.github.username}+created:2022-03-01..2022-03-31+is:pull-request`,
|
|
646
|
+
sort: 'created',
|
|
647
|
+
page: 1,
|
|
648
|
+
});
|
|
649
|
+
t.deepEqual(fetcher.searchIssues.getCall(4).args[0], {
|
|
650
|
+
q: `author:${config.github.username}+created:2022-03-01..2022-03-31+is:pull-request`,
|
|
651
|
+
sort: 'created',
|
|
652
|
+
page: 2,
|
|
653
|
+
});
|
|
654
|
+
t.deepEqual(fetcher.searchIssues.getCall(5).args[0], {
|
|
655
|
+
q: `author:${config.github.username}+created:2022-02-01..2022-02-28+is:pull-request`,
|
|
656
|
+
sort: 'created',
|
|
657
|
+
page: 1,
|
|
658
|
+
});
|
|
659
|
+
t.deepEqual(fetcher.searchIssues.getCall(6).args[0], {
|
|
660
|
+
q: `author:${config.github.username}+created:2022-01-01..2022-01-31+is:pull-request`,
|
|
661
|
+
sort: 'created',
|
|
662
|
+
page: 1,
|
|
663
|
+
});
|
|
664
|
+
});
|
|
665
|
+
|
|
666
|
+
test.serial('should not fetch PRs if disabled', async (t) => {
|
|
667
|
+
const commitConfig = {
|
|
668
|
+
github: {
|
|
669
|
+
...config.github,
|
|
670
|
+
commitsEnabled: false,
|
|
671
|
+
issuesEnabled: false,
|
|
672
|
+
reviewsEnabled: false,
|
|
673
|
+
filter: 'contribution-test',
|
|
674
|
+
stopDate: new Date('2022-03-01'),
|
|
675
|
+
},
|
|
676
|
+
};
|
|
677
|
+
|
|
678
|
+
await github.gather(commitConfig);
|
|
679
|
+
t.is(fetcher.searchCommits.callCount, 0);
|
|
680
|
+
});
|
|
681
|
+
|
|
614
682
|
test.serial('should fetch reviews until stop date', async (t) => {
|
|
615
683
|
const commitConfig = {
|
|
616
684
|
github: {
|
|
@@ -666,22 +734,22 @@ test.serial('should fetch reviews until stop date', async (t) => {
|
|
|
666
734
|
|
|
667
735
|
await github.gather(commitConfig);
|
|
668
736
|
t.deepEqual(fetcher.searchIssues.getCall(0).args[0], {
|
|
669
|
-
q: `reviewed-by:${config.github.username}+created:2022-03-01..2022-03-31`,
|
|
737
|
+
q: `reviewed-by:${config.github.username}+created:2022-03-01..2022-03-31+is:pull-request`,
|
|
670
738
|
sort: 'created',
|
|
671
739
|
page: 1,
|
|
672
740
|
});
|
|
673
741
|
t.deepEqual(fetcher.searchIssues.getCall(1).args[0], {
|
|
674
|
-
q: `reviewed-by:${config.github.username}+created:2022-03-01..2022-03-31`,
|
|
742
|
+
q: `reviewed-by:${config.github.username}+created:2022-03-01..2022-03-31+is:pull-request`,
|
|
675
743
|
sort: 'created',
|
|
676
744
|
page: 2,
|
|
677
745
|
});
|
|
678
746
|
t.deepEqual(fetcher.searchIssues.getCall(2).args[0], {
|
|
679
|
-
q: `reviewed-by:${config.github.username}+created:2022-02-01..2022-02-28`,
|
|
747
|
+
q: `reviewed-by:${config.github.username}+created:2022-02-01..2022-02-28+is:pull-request`,
|
|
680
748
|
sort: 'created',
|
|
681
749
|
page: 1,
|
|
682
750
|
});
|
|
683
751
|
t.deepEqual(fetcher.searchIssues.getCall(3).args[0], {
|
|
684
|
-
q: `reviewed-by:${config.github.username}+created:2022-01-01..2022-01-31`,
|
|
752
|
+
q: `reviewed-by:${config.github.username}+created:2022-01-01..2022-01-31+is:pull-request`,
|
|
685
753
|
sort: 'created',
|
|
686
754
|
page: 1,
|
|
687
755
|
});
|