github-issue-tower-defence-management 1.52.0 → 1.53.0

package/src/domain/usecases/HandleScheduledEventUseCase.test.ts

@@ -21,6 +21,7 @@ import { AssignNoAssigneeIssueToManagerUseCase } from './AssignNoAssigneeIssueTo
 import { UpdateIssueStatusByLabelUseCase } from './UpdateIssueStatusByLabelUseCase';
 import { StartPreparationUseCase } from './StartPreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
+import { RevertNotReadyAwaitingQualityCheckUseCase } from './RevertNotReadyAwaitingQualityCheckUseCase';
 import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
 
 describe('HandleScheduledEventUseCase', () => {
@@ -109,6 +110,8 @@ describe('HandleScheduledEventUseCase', () => {
     const mockStartPreparationUseCase = mock<StartPreparationUseCase>();
     const mockRevertOrphanedPreparationUseCase =
       mock<RevertOrphanedPreparationUseCase>();
+    const mockRevertNotReadyAwaitingQualityCheckUseCase =
+      mock<RevertNotReadyAwaitingQualityCheckUseCase>();
     const mockDateRepository = mock<DateRepository>();
     const mockSpreadsheetRepository = mock<SpreadsheetRepository>();
     const mockProjectRepository = mock<ProjectRepository>();
@@ -131,6 +134,7 @@ describe('HandleScheduledEventUseCase', () => {
       mockUpdateIssueStatusByLabelUseCase,
       mockStartPreparationUseCase,
       mockRevertOrphanedPreparationUseCase,
+      mockRevertNotReadyAwaitingQualityCheckUseCase,
       mockDateRepository,
       mockSpreadsheetRepository,
       mockProjectRepository,
@@ -309,6 +313,60 @@ describe('HandleScheduledEventUseCase', () => {
       );
     });
 
+    it('should invoke revertNotReadyAwaitingQualityCheckUseCase when notifyFinishedPreparation is configured', async () => {
+      const input = {
+        projectName: 'test-project',
+        org: 'test-org',
+        projectUrl: 'https://github.com/test-org/test-project',
+        manager: 'test-manager',
+        workingReport: {
+          repo: 'test-repo',
+          members: ['member1'],
+          spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
+        },
+        urlOfStoryView: 'https://github.com/test-org/test-project/issues',
+        disabled: false,
+        allowIssueCacheMinutes: 60,
+        notifyFinishedPreparation: {},
+      };
+
+      mockProjectRepository.getProject.mockResolvedValue(mock<Project>());
+      await useCase.run(input);
+
+      expect(
+        mockRevertNotReadyAwaitingQualityCheckUseCase.run,
+      ).toHaveBeenCalledWith(
+        expect.objectContaining({
+          projectUrl: 'https://github.com/test-org/test-project',
+          allowIssueCacheMinutes: 60,
+        }),
+      );
+    });
+
+    it('should not invoke revertNotReadyAwaitingQualityCheckUseCase when notifyFinishedPreparation is absent', async () => {
+      const input = {
+        projectName: 'test-project',
+        org: 'test-org',
+        projectUrl: 'https://github.com/test-org/test-project',
+        manager: 'test-manager',
+        workingReport: {
+          repo: 'test-repo',
+          members: ['member1'],
+          spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
+        },
+        urlOfStoryView: 'https://github.com/test-org/test-project/issues',
+        disabled: false,
+        allowIssueCacheMinutes: 60,
+      };
+
+      mockProjectRepository.getProject.mockResolvedValue(mock<Project>());
+      await useCase.run(input);
+
+      expect(
+        mockRevertNotReadyAwaitingQualityCheckUseCase.run,
+      ).not.toHaveBeenCalled();
+    });
+
     describe('story issue creation progress logs', () => {
       const storyInput = {
         projectName: 'test-project',

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -21,6 +21,7 @@ import { AssignNoAssigneeIssueToManagerUseCase } from './AssignNoAssigneeIssueTo
 import { UpdateIssueStatusByLabelUseCase } from './UpdateIssueStatusByLabelUseCase';
 import { StartPreparationUseCase } from './StartPreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
+import { RevertNotReadyAwaitingQualityCheckUseCase } from './RevertNotReadyAwaitingQualityCheckUseCase';
 import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
 
 export class ProjectNotFoundError extends Error {
@@ -50,6 +51,7 @@ export class HandleScheduledEventUseCase {
     readonly updateIssueStatusByLabelUseCase: UpdateIssueStatusByLabelUseCase,
     readonly startPreparationUseCase: StartPreparationUseCase,
     readonly revertOrphanedPreparationUseCase: RevertOrphanedPreparationUseCase,
+    readonly revertNotReadyAwaitingQualityCheckUseCase: RevertNotReadyAwaitingQualityCheckUseCase,
     readonly dateRepository: DateRepository,
     readonly spreadsheetRepository: SpreadsheetRepository,
     readonly projectRepository: ProjectRepository,
@@ -83,6 +85,9 @@ export class HandleScheduledEventUseCase {
       awLogStaleThresholdMinutes?: number;
       awaitingQualityCheckStatus?: string | null;
     } | null;
+    notifyFinishedPreparation?: {
+      awaitingQualityCheckStatusName?: string | null;
+    } | null;
   }): Promise<{
     project: Project;
     issues: Issue[];
@@ -252,6 +257,12 @@ ${JSON.stringify(e)}
         storyObjectMap,
       );
     }
+    if (input.notifyFinishedPreparation) {
+      await this.revertNotReadyAwaitingQualityCheckUseCase.run({
+        projectUrl: input.projectUrl,
+        allowIssueCacheMinutes: input.allowIssueCacheMinutes,
+      });
+    }
     if (input.startPreparation) {
       if (input.startPreparation.preparationProcessCheckCommand) {
         await this.revertOrphanedPreparationUseCase.run({

package/src/domain/usecases/IssueRejectionEvaluator.ts

@@ -0,0 +1,114 @@
+import {
+  IssueRepository,
+  RelatedPullRequest,
+} from './adapter-interfaces/IssueRepository';
+
+export type PrRejectedReasonType =
+  | 'PULL_REQUEST_NOT_FOUND'
+  | 'MULTIPLE_PULL_REQUESTS_FOUND'
+  | 'PULL_REQUEST_CONFLICTED'
+  | 'ANY_CI_JOB_FAILED_OR_IN_PROGRESS'
+  | 'REQUIRED_CI_JOB_NEVER_STARTED'
+  | 'ANY_REVIEW_COMMENT_NOT_RESOLVED';
+
+export type PrRejectionResult = {
+  rejections: { type: PrRejectedReasonType; detail: string }[];
+  approvedPrUrl: string | null;
+};
+
+export class IssueRejectionEvaluator {
+  constructor(
+    private readonly issueRepository: Pick<
+      IssueRepository,
+      'findRelatedOpenPRs' | 'getOpenPullRequest'
+    >,
+  ) {}
+
+  evaluate = async (issue: {
+    url: string;
+    labels: string[];
+    isPr: boolean;
+  }): Promise<PrRejectionResult> => {
+    const rejections: { type: PrRejectedReasonType; detail: string }[] = [];
+    let approvedPrUrl: string | null = null;
+
+    const categoryLabels = issue.labels.filter((label) =>
+      label.startsWith('category:'),
+    );
+    const hasLlmAgentLabel = issue.labels.some(
+      (l) => l === 'llm-agent' || l.startsWith('llm-agent:'),
+    );
+
+    if (
+      !hasLlmAgentLabel &&
+      (categoryLabels.length <= 0 || categoryLabels.includes('category:e2e'))
+    ) {
+      const prsToCheck = issue.isPr
+        ? await this.resolveOpenPrsForPrItem(issue.url)
+        : await this.issueRepository.findRelatedOpenPRs(issue.url);
+
+      if (prsToCheck.length <= 0) {
+        rejections.push({
+          type: 'PULL_REQUEST_NOT_FOUND',
+          detail: 'PULL_REQUEST_NOT_FOUND',
+        });
+      } else if (prsToCheck.length > 1) {
+        rejections.push({
+          type: 'MULTIPLE_PULL_REQUESTS_FOUND',
+          detail: `MULTIPLE_PULL_REQUESTS_FOUND: ${prsToCheck.map((pr) => pr.url).join(', ')}`,
+        });
+      } else {
+        const pr = prsToCheck[0];
+        if (pr.isConflicted) {
+          rejections.push({
+            type: 'PULL_REQUEST_CONFLICTED',
+            detail: `PULL_REQUEST_CONFLICTED: ${pr.url}`,
+          });
+        }
+        if (!pr.isPassedAllCiJob) {
+          const missingChecks = pr.missingRequiredCheckNames;
+          const missingSuffix =
+            missingChecks.length > 0
+              ? ` (missing: ${missingChecks.join(', ')})`
+              : '';
+          if (pr.isCiStateSuccess && missingChecks.length > 0) {
+            rejections.push({
+              type: 'REQUIRED_CI_JOB_NEVER_STARTED',
+              detail: `REQUIRED_CI_JOB_NEVER_STARTED: ${pr.url}${missingSuffix}`,
+            });
+          } else {
+            rejections.push({
+              type: 'ANY_CI_JOB_FAILED_OR_IN_PROGRESS',
+              detail: `ANY_CI_JOB_FAILED_OR_IN_PROGRESS: ${pr.url}${missingSuffix}`,
+            });
+          }
+        }
+        if (!pr.isResolvedAllReviewComments) {
+          rejections.push({
+            type: 'ANY_REVIEW_COMMENT_NOT_RESOLVED',
+            detail: `ANY_REVIEW_COMMENT_NOT_RESOLVED: ${pr.url}`,
+          });
+        }
+        if (
+          !pr.isConflicted &&
+          pr.isPassedAllCiJob &&
+          pr.isResolvedAllReviewComments
+        ) {
+          approvedPrUrl = pr.url;
+        }
+      }
+    }
+
+    return { rejections, approvedPrUrl };
+  };
+
+  private resolveOpenPrsForPrItem = async (
+    prUrl: string,
+  ): Promise<RelatedPullRequest[]> => {
+    const pr = await this.issueRepository.getOpenPullRequest(prUrl);
+    if (pr === null) {
+      return [];
+    }
+    return [pr];
+  };
+}

package/src/domain/usecases/NotifyFinishedIssuePreparationUseCase.ts

@@ -1,7 +1,4 @@
-import {
-  IssueRepository,
-  RelatedPullRequest,
-} from './adapter-interfaces/IssueRepository';
+import { IssueRepository } from './adapter-interfaces/IssueRepository';
 import { ProjectRepository } from './adapter-interfaces/ProjectRepository';
 import { IssueCommentRepository } from './adapter-interfaces/IssueCommentRepository';
 import { WebhookRepository } from './adapter-interfaces/WebhookRepository';
@@ -11,6 +8,10 @@ import {
   FAILED_PREPARATION_STATUS_NAME,
   PREPARATION_STATUS_NAME,
 } from '../entities/WorkflowStatus';
+import {
+  IssueRejectionEvaluator,
+  PrRejectedReasonType,
+} from './IssueRejectionEvaluator';
 
 export class IssueNotFoundError extends Error {
   constructor(issueUrl: string) {
@@ -33,14 +34,11 @@ export class IllegalIssueStatusError extends Error {
 type RejectedReasonType =
   | 'NO_REPORT_FROM_AGENT_BOT'
   | 'REPORT_HAS_NEXT_STEP'
-  | 'PULL_REQUEST_NOT_FOUND'
-  | 'MULTIPLE_PULL_REQUESTS_FOUND'
-  | 'PULL_REQUEST_CONFLICTED'
-  | 'ANY_CI_JOB_FAILED_OR_IN_PROGRESS'
-  | 'REQUIRED_CI_JOB_NEVER_STARTED'
-  | 'ANY_REVIEW_COMMENT_NOT_RESOLVED';
+  | PrRejectedReasonType;
 
 export class NotifyFinishedIssuePreparationUseCase {
+  private readonly issueRejectionEvaluator: IssueRejectionEvaluator;
+
   constructor(
     private readonly projectRepository: Pick<ProjectRepository, 'getByUrl'>,
     private readonly issueRepository: Pick<
@@ -61,7 +59,9 @@ export class NotifyFinishedIssuePreparationUseCase {
       WebhookRepository,
       'sendGetRequest'
     >,
-  ) {}
+  ) {
+    this.issueRejectionEvaluator = new IssueRejectionEvaluator(issueRepository);
+  }
 
   run = async (params: {
     projectUrl: string;
@@ -257,7 +257,7 @@ export class NotifyFinishedIssuePreparationUseCase {
     approvedPrUrl: string | null;
   }> => {
     const rejections: { type: RejectedReasonType; detail: string }[] = [];
-    let approvedPrUrl: string | null = null;
+
     const lastComment = comments[comments.length - 1];
     if (!lastComment || !lastComment.content.startsWith('From:')) {
       rejections.push({
@@ -271,83 +271,9 @@ export class NotifyFinishedIssuePreparationUseCase {
       });
     }
 
-    const categoryLabels = issue.labels.filter((label) =>
-      label.startsWith('category:'),
-    );
-    const hasLlmAgentLabel = issue.labels.some(
-      (l) => l === 'llm-agent' || l.startsWith('llm-agent:'),
-    );
-    if (
-      !hasLlmAgentLabel &&
-      (categoryLabels.length <= 0 || categoryLabels.includes('category:e2e'))
-    ) {
-      const prsToCheck = issue.isPr
-        ? await this.resolveOpenPrsForPrItem(issue.url)
-        : await this.issueRepository.findRelatedOpenPRs(issue.url);
-
-      if (prsToCheck.length <= 0) {
-        rejections.push({
-          type: 'PULL_REQUEST_NOT_FOUND',
-          detail: 'PULL_REQUEST_NOT_FOUND',
-        });
-      } else if (prsToCheck.length > 1) {
-        rejections.push({
-          type: 'MULTIPLE_PULL_REQUESTS_FOUND',
-          detail: `MULTIPLE_PULL_REQUESTS_FOUND: ${prsToCheck.map((pr) => pr.url).join(', ')}`,
-        });
-      } else {
-        const pr = prsToCheck[0];
-        if (pr.isConflicted) {
-          rejections.push({
-            type: 'PULL_REQUEST_CONFLICTED',
-            detail: `PULL_REQUEST_CONFLICTED: ${pr.url}`,
-          });
-        }
-        if (!pr.isPassedAllCiJob) {
-          const missingChecks = pr.missingRequiredCheckNames;
-          const missingSuffix =
-            missingChecks.length > 0
-              ? ` (missing: ${missingChecks.join(', ')})`
-              : '';
-          if (pr.isCiStateSuccess && missingChecks.length > 0) {
-            rejections.push({
-              type: 'REQUIRED_CI_JOB_NEVER_STARTED',
-              detail: `REQUIRED_CI_JOB_NEVER_STARTED: ${pr.url}${missingSuffix}`,
-            });
-          } else {
-            rejections.push({
-              type: 'ANY_CI_JOB_FAILED_OR_IN_PROGRESS',
-              detail: `ANY_CI_JOB_FAILED_OR_IN_PROGRESS: ${pr.url}${missingSuffix}`,
-            });
-          }
-        }
-        if (!pr.isResolvedAllReviewComments) {
-          rejections.push({
-            type: 'ANY_REVIEW_COMMENT_NOT_RESOLVED',
-            detail: `ANY_REVIEW_COMMENT_NOT_RESOLVED: ${pr.url}`,
-          });
-        }
-        if (
-          !pr.isConflicted &&
-          pr.isPassedAllCiJob &&
-          pr.isResolvedAllReviewComments
-        ) {
-          approvedPrUrl = pr.url;
-        }
-      }
-    }
-
-    return { rejections, approvedPrUrl };
-  };
-
-  private resolveOpenPrsForPrItem = async (
-    prUrl: string,
-  ): Promise<RelatedPullRequest[]> => {
-    const pr = await this.issueRepository.getOpenPullRequest(prUrl);
-    if (pr === null) {
-      return [];
-    }
-    return [pr];
+    const { rejections: prRejections, approvedPrUrl } =
+      await this.issueRejectionEvaluator.evaluate(issue);
+    return { rejections: [...rejections, ...prRejections], approvedPrUrl };
   };
 
   private reportBodyHasNextStep = (body: string): boolean => {