github-issue-tower-defence-management 1.47.0 → 1.49.0

package/src/domain/usecases/ChangeStatusByStoryColorUseCase.ts

@@ -2,6 +2,7 @@ import { IssueRepository } from './adapter-interfaces/IssueRepository';
 import { Project } from '../entities/Project';
 import { DateRepository } from './adapter-interfaces/DateRepository';
 import { StoryObjectMap } from '../entities/StoryObjectMap';
+import { ICEBOX_STATUS_NAME } from '../entities/WorkflowStatus';
 
 export class ChangeStatusByStoryColorUseCase {
   constructor(
@@ -17,7 +18,6 @@ export class ChangeStatusByStoryColorUseCase {
     cacheUsed: boolean;
     org: string;
     repo: string;
-    disabledStatus: string;
     storyObjectMap: StoryObjectMap;
   }): Promise<void> => {
     const firstStatus = input.project.status.statuses[0];
@@ -27,16 +27,16 @@ export class ChangeStatusByStoryColorUseCase {
       return;
     }
     const disabledStatusObject = input.project.status.statuses.find(
-      (status) => status.name === input.disabledStatus,
+      (status) => status.name === ICEBOX_STATUS_NAME,
     );
     if (!disabledStatusObject) {
-      throw new Error('Disabled status is not found');
+      throw new Error('Icebox status is not found');
     }
     for (const storyObject of Array.from(input.storyObjectMap.values())) {
       const isStoryDisabled = storyObject.story.color === 'GRAY';
       for (const issue of storyObject.issues) {
         if (isStoryDisabled) {
-          if (issue.status && issue.status === input.disabledStatus) {
+          if (issue.status && issue.status === ICEBOX_STATUS_NAME) {
             continue;
           }
           await this.issueRepository.updateStatus(
@@ -49,7 +49,7 @@ export class ChangeStatusByStoryColorUseCase {
             `This issue status is changed because the story is disabled.`,
           );
         } else if (!isStoryDisabled) {
-          if (issue.status && issue.status !== input.disabledStatus) {
+          if (issue.status && issue.status !== ICEBOX_STATUS_NAME) {
             continue;
           }
           await this.issueRepository.updateStatus(

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

@@ -99,7 +99,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
         issues: Issue[];
         cacheUsed: boolean;
         urlOfStoryView: string;
-        disabledStatus: string;
         storyObjectMap: StoryObjectMap;
       };
       expectedThrowError?: Error;
@@ -122,7 +121,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           issues: [basicStoryIssue1],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [],
@@ -137,7 +135,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           issues: [basicStoryIssue1],
           cacheUsed: true,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [],
@@ -152,7 +149,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           issues: [basicStoryIssue1],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: regularStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [],
@@ -167,7 +163,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           issues: [],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedThrowError: new Error('Story issue not found: Story 1'),
@@ -178,7 +173,7 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
       },
 
       {
-        name: 'should skip closed story issues or disabled status',
+        name: 'should skip closed story issues or icebox status',
         input: {
           project: basicProject,
           issues: [
@@ -189,12 +184,11 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
             },
             {
               ...basicStoryIssue2,
-              status: 'Disabled',
+              status: 'Icebox',
             },
           ],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Disabled',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [],
@@ -209,7 +203,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           issues: [basicStoryIssue1, basicStoryIssue2],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [
@@ -365,7 +358,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           ],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: new Map([['Story 1', basicStoryObject1]]),
         },
         expectedCreateNewIssueCalls: [
@@ -428,7 +420,6 @@ describe('ConvertCheckboxToIssueInStoryIssueUseCase', () => {
           ],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: new Map([
             [
               'Story 1',
@@ -470,7 +461,6 @@ Some description without checkboxes`,
           ],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: basicStoryObjectMap,
         },
         expectedCreateNewIssueCalls: [
@@ -624,7 +614,6 @@ Some description without checkboxes`,
           ],
           cacheUsed: false,
           urlOfStoryView: 'https://example.com',
-          disabledStatus: 'Closed',
           storyObjectMap: new Map([
             [
               'Story 1',

package/src/domain/usecases/ConvertCheckboxToIssueInStoryIssueUseCase.ts

@@ -3,6 +3,7 @@ import { IssueRepository } from './adapter-interfaces/IssueRepository';
 import { Project } from '../entities/Project';
 import { StoryObjectMap } from '../entities/StoryObjectMap';
 import { encodeForURI } from './utils';
+import { ICEBOX_STATUS_NAME } from '../entities/WorkflowStatus';
 
 export class ConvertCheckboxToIssueInStoryIssueUseCase {
   constructor(
@@ -17,7 +18,6 @@ export class ConvertCheckboxToIssueInStoryIssueUseCase {
     issues: Issue[];
     cacheUsed: boolean;
     urlOfStoryView: string;
-    disabledStatus: string;
     storyObjectMap: StoryObjectMap;
   }): Promise<void> => {
     const story = input.project.story;
@@ -36,7 +36,7 @@ export class ConvertCheckboxToIssueInStoryIssueUseCase {
         throw new Error(`Story issue not found: ${storyOption.name}`);
       } else if (
         storyIssue.isClosed ||
-        storyIssue.status === input.disabledStatus
+        storyIssue.status === ICEBOX_STATUS_NAME
       ) {
         continue;
       }

package/src/domain/usecases/CreateEstimationIssueUseCase.ts

@@ -5,6 +5,7 @@ import { Member } from '../entities/Member';
 import { DateRepository } from './adapter-interfaces/DateRepository';
 import { StoryObjectMap } from '../entities/StoryObjectMap';
 import { encodeForURI } from './utils';
+import { ICEBOX_STATUS_NAME } from '../entities/WorkflowStatus';
 
 export class CreateEstimationIssueUseCase {
   constructor(
@@ -24,7 +25,6 @@ export class CreateEstimationIssueUseCase {
     org: string;
     repo: string;
     urlOfStoryView: string;
-    disabledStatus: string;
     storyObjectMap: StoryObjectMap;
   }): Promise<void> => {
     const story = input.project.story;
@@ -66,7 +66,7 @@ export class CreateEstimationIssueUseCase {
           issueInStory.isClosed ||
           issueInStory.isPr ||
           issueInStory.labels.includes('story') ||
-          issueInStory.status === input.disabledStatus
+          issueInStory.status === ICEBOX_STATUS_NAME
         ) {
           continue;
         }

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

@@ -84,7 +84,6 @@ describe('CreateNewStoryByLabelUseCase', () => {
         cacheUsed: false,
         org: 'testOrg',
         repo: 'testRepo',
-        disabledStatus: 'Icebox',
         storyObjectMap: new Map([['Story 1', storyObjectWithNewStoryIssues]]),
       });
 
@@ -105,7 +104,6 @@ describe('CreateNewStoryByLabelUseCase', () => {
         cacheUsed: false,
         org: 'testOrg',
         repo: 'testRepo',
-        disabledStatus: 'Icebox',
         storyObjectMap: new Map([
           ['Story 1', storyObjectWithoutNewStoryIssues],
         ]),
@@ -142,7 +140,6 @@ describe('CreateNewStoryByLabelUseCase', () => {
         cacheUsed: false,
         org: 'testOrg',
         repo: 'testRepo',
-        disabledStatus: 'Icebox',
         storyObjectMap: new Map([['Story 1', storyObjectWithNewStoryIssues]]),
       });
 
@@ -239,7 +236,6 @@ describe('CreateNewStoryByLabelUseCase', () => {
         cacheUsed: false,
         org: 'testOrg',
         repo: 'testRepo',
-        disabledStatus: 'Icebox',
         storyObjectMap: new Map([['Story 1', storyObject]]),
       });
 

package/src/domain/usecases/CreateNewStoryByLabelUseCase.ts

@@ -18,7 +18,6 @@ export class CreateNewStoryByLabelUseCase {
     cacheUsed: boolean;
     org: string;
     repo: string;
-    disabledStatus: string;
     storyObjectMap: StoryObjectMap;
   }): Promise<void> => {
     const projectStory = input.project.story;

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

@@ -22,6 +22,7 @@ import { UpdateIssueStatusByLabelUseCase } from './UpdateIssueStatusByLabelUseCa
 import { StartPreparationUseCase } from './StartPreparationUseCase';
 import { NotifyFinishedIssuePreparationUseCase } from './NotifyFinishedIssuePreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
+import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
 
 describe('HandleScheduledEventUseCase', () => {
   describe('createTargetDateTimes', () => {
@@ -80,6 +81,8 @@ describe('HandleScheduledEventUseCase', () => {
   });
 
   describe('run', () => {
+    const mockSetupTowerDefenceProjectUseCase =
+      mock<SetupTowerDefenceProjectUseCase>();
     const mockActionAnnouncementUseCase = mock<ActionAnnouncementUseCase>();
     const mockSetWorkflowManagementIssueToStoryUseCase =
       mock<SetWorkflowManagementIssueToStoryUseCase>();
@@ -115,6 +118,7 @@ describe('HandleScheduledEventUseCase', () => {
     const mockIssueRepository = mock<IssueRepository>();
 
     const useCase = new HandleScheduledEventUseCase(
+      mockSetupTowerDefenceProjectUseCase,
       mockActionAnnouncementUseCase,
       mockSetWorkflowManagementIssueToStoryUseCase,
       mockClearPastNextActionDateHourUseCase,
@@ -166,8 +170,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
         disabled: false,
         allowIssueCacheMinutes: 60,
       };
@@ -190,8 +192,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: 'ToDo',
         disabled: false,
         allowIssueCacheMinutes: 60,
       };
@@ -202,35 +202,6 @@ describe('HandleScheduledEventUseCase', () => {
       expect(mockUpdateIssueStatusByLabelUseCase.run).toHaveBeenCalledWith({
         project: mockProject,
         issues: [],
-        defaultStatus: 'ToDo',
-      });
-    });
-
-    it('should accept null for defaultStatus parameter', 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',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
-        disabled: false,
-        allowIssueCacheMinutes: 60,
-      };
-
-      const mockProject = mock<Project>();
-      mockProjectRepository.getProject.mockResolvedValue(mockProject);
-      await useCase.run(input);
-      expect(mockUpdateIssueStatusByLabelUseCase.run).toHaveBeenCalledWith({
-        project: mockProject,
-        issues: [],
-        defaultStatus: null,
       });
     });
 
@@ -246,8 +217,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
         disabled: true,
         allowIssueCacheMinutes: 60,
       };
@@ -271,8 +240,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
         disabled: false,
         allowIssueCacheMinutes: 60,
       };
@@ -296,8 +263,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
         disabled: false,
         allowIssueCacheMinutes: 120,
       };
@@ -323,8 +288,6 @@ describe('HandleScheduledEventUseCase', () => {
           spreadsheetUrl: 'https://docs.google.com/spreadsheets/test',
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
-        disabledStatus: 'disabled',
-        defaultStatus: null,
         disabled: false,
         allowIssueCacheMinutes: 60,
       };

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -22,6 +22,8 @@ import { UpdateIssueStatusByLabelUseCase } from './UpdateIssueStatusByLabelUseCa
 import { StartPreparationUseCase } from './StartPreparationUseCase';
 import { NotifyFinishedIssuePreparationUseCase } from './NotifyFinishedIssuePreparationUseCase';
 import { RevertOrphanedPreparationUseCase } from './RevertOrphanedPreparationUseCase';
+import { SetupTowerDefenceProjectUseCase } from './SetupTowerDefenceProjectUseCase';
+import { PREPARATION_STATUS_NAME } from '../entities/WorkflowStatus';
 
 export class ProjectNotFoundError extends Error {
   constructor(message: string) {
@@ -32,6 +34,7 @@ export class ProjectNotFoundError extends Error {
 
 export class HandleScheduledEventUseCase {
   constructor(
+    readonly setupTowerDefenceProjectUseCase: SetupTowerDefenceProjectUseCase,
     readonly actionAnnouncementUseCase: ActionAnnouncementUseCase,
     readonly setWorkflowManagementIssueToStoryUseCase: SetWorkflowManagementIssueToStoryUseCase,
     readonly clearPastNextActionUseCase: ClearPastNextActionDateHourUseCase,
@@ -65,13 +68,9 @@ export class HandleScheduledEventUseCase {
       spreadsheetUrl: string;
     };
     urlOfStoryView: string;
-    disabledStatus: string;
-    defaultStatus: string | null;
     disabled: boolean;
     allowIssueCacheMinutes: number;
     startPreparation?: {
-      awaitingWorkspaceStatus: string;
-      preparationStatus: string;
       defaultAgentName: string;
       defaultLlmModelName?: string | null;
       defaultLlmAgentName?: string | null;
@@ -85,9 +84,6 @@ export class HandleScheduledEventUseCase {
       awLogStaleThresholdMinutes?: number;
     } | null;
     notifyFinishedPreparation?: {
-      preparationStatus: string;
-      awaitingWorkspaceStatus: string;
-      awaitingQualityCheckStatus: string;
       thresholdForAutoReject: number;
       workflowBlockerResolvedWebhookUrl: string | null;
     } | null;
@@ -101,6 +97,9 @@ export class HandleScheduledEventUseCase {
     if (input.disabled) {
       return null;
     }
+    await this.setupTowerDefenceProjectUseCase.run({
+      projectUrl: input.projectUrl,
+    });
     const projectId = await this.projectRepository.findProjectIdByUrl(
       input.projectUrl,
     );
@@ -297,7 +296,6 @@ ${JSON.stringify(e)}
       org: input.org,
       repo: input.workingReport.repo,
       urlOfStoryView: input.urlOfStoryView,
-      disabledStatus: input.disabledStatus,
       storyObjectMap: storyObjectMap,
     });
     await this.convertCheckboxToIssueInStoryIssueUseCase.run({
@@ -305,7 +303,6 @@ ${JSON.stringify(e)}
       issues,
       cacheUsed,
       urlOfStoryView: input.urlOfStoryView,
-      disabledStatus: input.disabledStatus,
       storyObjectMap: storyObjectMap,
     });
     await this.changeStatusByStoryColorUseCase.run({
@@ -313,7 +310,6 @@ ${JSON.stringify(e)}
       cacheUsed,
       org: input.org,
       repo: input.workingReport.repo,
-      disabledStatus: input.disabledStatus,
       storyObjectMap: storyObjectMap,
     });
     await this.createNewStoryByLabelUseCase.run({
@@ -321,7 +317,6 @@ ${JSON.stringify(e)}
       cacheUsed,
       org: input.org,
       repo: input.workingReport.repo,
-      disabledStatus: input.disabledStatus,
       storyObjectMap: storyObjectMap,
     });
     await this.assignNoAssigneeIssueToManagerUseCase.run({
@@ -332,17 +327,11 @@ ${JSON.stringify(e)}
     await this.updateIssueStatusByLabelUseCase.run({
       project,
       issues,
-      defaultStatus: input.defaultStatus,
     });
     if (input.startPreparation) {
       if (input.startPreparation.preparationProcessCheckCommand) {
         await this.revertOrphanedPreparationUseCase.run({
           projectUrl: input.projectUrl,
-          preparationStatus: input.startPreparation.preparationStatus,
-          awaitingWorkspaceStatus:
-            input.startPreparation.awaitingWorkspaceStatus,
-          awaitingQualityCheckStatus:
-            input.notifyFinishedPreparation?.awaitingQualityCheckStatus,
           allowIssueCacheMinutes: input.allowIssueCacheMinutes,
           preparationProcessCheckCommand:
             input.startPreparation.preparationProcessCheckCommand,
@@ -353,8 +342,6 @@ ${JSON.stringify(e)}
       }
       await this.startPreparationUseCase.run({
         projectUrl: input.projectUrl,
-        awaitingWorkspaceStatus: input.startPreparation.awaitingWorkspaceStatus,
-        preparationStatus: input.startPreparation.preparationStatus,
         defaultAgentName: input.startPreparation.defaultAgentName,
         defaultLlmModelName: input.startPreparation.defaultLlmModelName ?? null,
         defaultLlmAgentName: input.startPreparation.defaultLlmAgentName ?? null,
@@ -371,21 +358,16 @@ ${JSON.stringify(e)}
     if (input.notifyFinishedPreparation) {
       const notifyFinishedPreparation = input.notifyFinishedPreparation;
       const preparationIssues = issues.filter(
-        (issue) => issue.status === notifyFinishedPreparation.preparationStatus,
+        (issue) => issue.status === PREPARATION_STATUS_NAME,
       );
       for (const issue of preparationIssues) {
         await this.notifyFinishedIssuePreparationUseCase.run({
           projectUrl: input.projectUrl,
           issueUrl: issue.url,
-          preparationStatus: input.notifyFinishedPreparation.preparationStatus,
-          awaitingWorkspaceStatus:
-            input.notifyFinishedPreparation.awaitingWorkspaceStatus,
-          awaitingQualityCheckStatus:
-            input.notifyFinishedPreparation.awaitingQualityCheckStatus,
           thresholdForAutoReject:
-            input.notifyFinishedPreparation.thresholdForAutoReject,
+            notifyFinishedPreparation.thresholdForAutoReject,
           workflowBlockerResolvedWebhookUrl:
-            input.notifyFinishedPreparation.workflowBlockerResolvedWebhookUrl,
+            notifyFinishedPreparation.workflowBlockerResolvedWebhookUrl,
         });
       }
     }