From 7a7efcae1f55c298ef504dcb1c6317ae0c4d4b28 Mon Sep 17 00:00:00 2001 From: "m.bell" Date: Fri, 4 Feb 2022 09:54:35 -0500 Subject: [PATCH] Fix per issue operation count (#662) * Fix per issue operation count * Run pack --- __tests__/classes/issues-processor-mock.ts | 2 +- dist/index.js | 10 +++++----- src/classes/issues-processor.ts | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/__tests__/classes/issues-processor-mock.ts b/__tests__/classes/issues-processor-mock.ts index 1d1a4b9f6..0ef05ed2a 100644 --- a/__tests__/classes/issues-processor-mock.ts +++ b/__tests__/classes/issues-processor-mock.ts @@ -9,7 +9,7 @@ export class IssuesProcessorMock extends IssuesProcessor { options: IIssuesProcessorOptions, getIssues?: (page: number) => Promise, listIssueComments?: ( - issueNumber: number, + issue: Issue, sinceDate: string ) => Promise, getLabelCreationDate?: ( diff --git a/dist/index.js b/dist/index.js index 15c68c6e6..7aa02803c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -613,17 +613,17 @@ class IssuesProcessor { }); } // Grab comments for an issue since a given date - listIssueComments(issueNumber, sinceDate) { + listIssueComments(issue, sinceDate) { var _a; return __awaiter(this, void 0, void 0, function* () { // Find any comments since date on the given issue try { - this.operations.consumeOperation(); + this._consumeIssueOperation(issue); (_a = this.statistics) === null || _a === void 0 ? void 0 : _a.incrementFetchedItemsCommentsCount(); const comments = yield this.client.issues.listComments({ owner: github_1.context.repo.owner, repo: github_1.context.repo.repo, - issue_number: issueNumber, + issue_number: issue.number, since: sinceDate }); return comments.data; @@ -763,7 +763,7 @@ class IssuesProcessor { return true; } // find any comments since the date - const comments = yield this.listIssueComments(issue.number, sinceDate); + const comments = yield this.listIssueComments(issue, sinceDate); const filteredComments = comments.filter(comment => comment.user.type === 'User' && comment.body.toLowerCase() !== staleMessage.toLowerCase()); issueLogger.info(`Comments that are not the stale comment or another bot: ${logger_service_1.LoggerService.cyan(filteredComments.length)}`); @@ -1014,7 +1014,7 @@ class IssuesProcessor { issueLogger.info(`Adding all the labels specified via the ${this._logger.createOptionLink(option_1.Option.LabelsToAddWhenUnstale)} option.`); this.addedLabelIssues.push(issue); try { - this.operations.consumeOperation(); + this._consumeIssueOperation(issue); (_a = this.statistics) === null || _a === void 0 ? void 0 : _a.incrementAddedItemsLabel(issue); if (!this.options.debugOnly) { yield this.client.issues.addLabels({ diff --git a/src/classes/issues-processor.ts b/src/classes/issues-processor.ts index 708bafa4a..ee4bfadd8 100644 --- a/src/classes/issues-processor.ts +++ b/src/classes/issues-processor.ts @@ -510,17 +510,17 @@ export class IssuesProcessor { // Grab comments for an issue since a given date async listIssueComments( - issueNumber: Readonly, + issue: Readonly, sinceDate: Readonly ): Promise { // Find any comments since date on the given issue try { - this.operations.consumeOperation(); + this._consumeIssueOperation(issue); this.statistics?.incrementFetchedItemsCommentsCount(); const comments = await this.client.issues.listComments({ owner: context.repo.owner, repo: context.repo.repo, - issue_number: issueNumber, + issue_number: issue.number, since: sinceDate }); return comments.data; @@ -734,7 +734,7 @@ export class IssuesProcessor { } // find any comments since the date - const comments = await this.listIssueComments(issue.number, sinceDate); + const comments = await this.listIssueComments(issue, sinceDate); const filteredComments = comments.filter( comment => @@ -1065,7 +1065,7 @@ export class IssuesProcessor { this.addedLabelIssues.push(issue); try { - this.operations.consumeOperation(); + this._consumeIssueOperation(issue); this.statistics?.incrementAddedItemsLabel(issue); if (!this.options.debugOnly) { await this.client.issues.addLabels({