github-issue-tower-defence-management 1.120.0 → 1.122.0

package/src/adapter/repositories/issue/GraphqlProjectItemRepository.ts

@@ -13,6 +13,7 @@ export type ProjectItem = {
   labels: string[];
   assignees: string[];
   createdAt: string;
+  updatedAt: string;
   author: string;
   closingIssueReferenceUrls: string[];
   customFields: {
@@ -196,12 +197,15 @@ export class GraphqlProjectItemRepository extends BaseGitHubRepository {
       return undefined;
     }
   };
-  fetchProjectItems = async (projectId: string): Promise<ProjectItem[]> => {
+  fetchProjectItems = async (
+    projectId: string,
+    query?: string,
+  ): Promise<ProjectItem[]> => {
     const graphqlQueryString = `
-query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
+query GetProjectItems($projectId: ID!, $after: String, $first: Int!, $query: String) {
   node(id: $projectId) {
     ... on ProjectV2 {
-      items(first: $first, after: $after) {
+      items(first: $first, after: $after, query: $query) {
         totalCount
         pageInfo {
           endCursor
@@ -261,6 +265,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
               state
               url
               createdAt
+              updatedAt
               author {
                 login
               }
@@ -284,6 +289,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
               state
               url
               createdAt
+              updatedAt
               author {
                 login
               }
@@ -345,6 +351,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
               state: string;
               url: string;
               createdAt: string;
+              updatedAt: string;
               author: { login: string } | null;
               labels: { nodes: { name: string }[] };
               assignees: { nodes: { login: string }[] };
@@ -360,6 +367,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
           projectId: projectId,
           after: after,
           first: first,
+          query: query ?? null,
         },
       };
       const response = await callWithRateLimitRetry(() =>
@@ -399,6 +407,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
                       state: string;
                       url: string;
                       createdAt: string;
+                      updatedAt: string;
                       author: { login: string } | null;
                       labels: { nodes: { name: string }[] };
                       assignees: { nodes: { login: string }[] };
@@ -456,6 +465,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
               state: string;
               url: string;
               createdAt: string;
+              updatedAt: string;
               author: { login: string } | null;
               labels: { nodes: { name: string }[] };
               assignees: { nodes: { login: string }[] };
@@ -534,6 +544,7 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
           state: string;
           url: string;
           createdAt: string;
+          updatedAt: string;
           author: { login: string } | null;
           labels: { nodes: { name: string }[] };
           assignees: { nodes: { login: string }[] };
@@ -555,6 +566,10 @@ query GetProjectItems($projectId: ID!, $after: String, $first: Int!) {
           labels: item.content.labels?.nodes?.map((l) => l.name) || [],
           assignees: item.content.assignees?.nodes?.map((a) => a.login) || [],
           createdAt: item.content.createdAt || new Date().toISOString(),
+          updatedAt:
+            item.content.updatedAt ||
+            item.content.createdAt ||
+            new Date().toISOString(),
           author: item.content.author?.login || '',
           closingIssueReferenceUrls:
             item.content.closingIssuesReferences?.nodes
@@ -782,6 +797,7 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       url
       body
       createdAt
+      updatedAt
       author {
         login
       }
@@ -859,6 +875,7 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       url
       body
       createdAt
+      updatedAt
       author {
         login
       }
@@ -951,6 +968,7 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       url: string;
       body: string;
       createdAt: string;
+      updatedAt: string;
       author: { login: string } | null;
       labels: { nodes: { name: string }[] };
       assignees: { nodes: { login: string }[] };
@@ -1029,6 +1047,8 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       labels: content.labels?.nodes?.map((l) => l.name) || [],
       assignees: content.assignees?.nodes?.map((a) => a.login) || [],
       createdAt: content.createdAt || new Date().toISOString(),
+      updatedAt:
+        content.updatedAt || content.createdAt || new Date().toISOString(),
       author: content.author?.login || '',
       closingIssueReferenceUrls:
         content.closingIssuesReferences?.nodes

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

@@ -87,14 +87,12 @@ describe('GetStoryObjectMapUseCase', () => {
       await expect(
         useCase.run({
           projectUrl: 'https://github.com/orgs/test/projects/1',
-          allowIssueCacheMinutes: 60,
         }),
       ).rejects.toThrow(ProjectNotFoundError);
 
       await expect(
         useCase.run({
           projectUrl: 'https://github.com/orgs/test/projects/1',
-          allowIssueCacheMinutes: 60,
         }),
       ).rejects.toThrow(
         'Project not found. projectUrl: https://github.com/orgs/test/projects/1',
@@ -108,14 +106,12 @@ describe('GetStoryObjectMapUseCase', () => {
       await expect(
         useCase.run({
           projectUrl: 'https://github.com/orgs/test/projects/1',
-          allowIssueCacheMinutes: 60,
         }),
       ).rejects.toThrow(ProjectNotFoundError);
 
       await expect(
         useCase.run({
           projectUrl: 'https://github.com/orgs/test/projects/1',
-          allowIssueCacheMinutes: 60,
         }),
       ).rejects.toThrow(
         'Project not found. projectId: project-1 projectUrl: https://github.com/orgs/test/projects/1',
@@ -126,13 +122,13 @@ describe('GetStoryObjectMapUseCase', () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(basicProject);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [],
         cacheUsed: false,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 60,
       });
 
       expect(result.project).toBe(basicProject);
@@ -141,22 +137,21 @@ describe('GetStoryObjectMapUseCase', () => {
       expect(result.storyObjectMap).toBeInstanceOf(Map);
     });
 
-    it('should pass allowIssueCacheMinutes to getAllIssues', async () => {
+    it('should call getAllIssues with the resolved project id', async () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(basicProject);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [],
         cacheUsed: true,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 120,
       });
 
       expect(mockIssueRepository.getAllIssues).toHaveBeenCalledWith(
         'project-1',
-        120,
       );
       expect(result.cacheUsed).toBe(true);
     });
@@ -181,13 +176,13 @@ describe('GetStoryObjectMapUseCase', () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(basicProject);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [issue1, issue2, issue3],
         cacheUsed: false,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 60,
       });
 
       const story1Object = result.storyObjectMap.get('Story 1');
@@ -209,13 +204,13 @@ describe('GetStoryObjectMapUseCase', () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(basicProject);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [storyIssue],
         cacheUsed: false,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 60,
       });
 
       const story1Object = result.storyObjectMap.get('Story 1');
@@ -232,13 +227,13 @@ describe('GetStoryObjectMapUseCase', () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(basicProject);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [issue],
         cacheUsed: false,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 60,
       });
 
       const story1Object = result.storyObjectMap.get('Story 1');
@@ -254,13 +249,13 @@ describe('GetStoryObjectMapUseCase', () => {
       mockProjectRepository.findProjectIdByUrl.mockResolvedValue('project-1');
       mockProjectRepository.getProject.mockResolvedValue(projectWithoutStory);
       mockIssueRepository.getAllIssues.mockResolvedValue({
+        project: mock<Project>(),
         issues: [],
         cacheUsed: false,
       });
 
       const result = await useCase.run({
         projectUrl: 'https://github.com/orgs/test/projects/1',
-        allowIssueCacheMinutes: 60,
       });
 
       expect(result.storyObjectMap.size).toBe(0);

package/src/domain/usecases/GetStoryObjectMapUseCase.ts

@@ -22,7 +22,6 @@ export class GetStoryObjectMapUseCase {
 
   run = async (input: {
     projectUrl: string;
-    allowIssueCacheMinutes: number;
   }): Promise<{
     project: Project;
     issues: Issue[];
@@ -44,10 +43,7 @@ export class GetStoryObjectMapUseCase {
       );
     }
     const { issues, cacheUsed }: { issues: Issue[]; cacheUsed: boolean } =
-      await this.issueRepository.getAllIssues(
-        projectId,
-        input.allowIssueCacheMinutes,
-      );
+      await this.issueRepository.getAllIssues(projectId);
     const storyObjectMap: StoryObjectMap = this.createStoryObjectMap({
       project,
       issues,

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

@@ -160,6 +160,7 @@ describe('HandleScheduledEventUseCase', () => {
       );
       mockIssueRepository.getAllIssues.mockResolvedValue({
         issues: [],
+        project: mock<Project>(),
         cacheUsed: false,
       });
       mockSpreadsheetRepository.getSheet.mockResolvedValue([
@@ -184,7 +185,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       const mockProject = mock<Project>();
@@ -206,11 +206,14 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       const mockProject = mock<Project>();
-      mockProjectRepository.getProject.mockResolvedValue(mockProject);
+      mockIssueRepository.getAllIssues.mockResolvedValue({
+        issues: [],
+        project: mockProject,
+        cacheUsed: false,
+      });
       await useCase.run(input);
       expect(mockUpdateIssueStatusByLabelUseCase.run).toHaveBeenCalledWith({
         project: mockProject,
@@ -231,7 +234,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: true,
-        allowIssueCacheMinutes: 60,
       };
 
       const result = await useCase.run(input);
@@ -254,7 +256,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       const mockProject = mock<Project>();
@@ -264,7 +265,7 @@ describe('HandleScheduledEventUseCase', () => {
       expect(mockProjectRepository.findProjectIdByUrl).toHaveBeenCalled();
     });
 
-    it('should pass allowIssueCacheMinutes to getAllIssues', async () => {
+    it('should call getAllIssues with the resolved project id', async () => {
       const input = {
         projectName: 'test-project',
         org: 'test-org',
@@ -277,15 +278,11 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 120,
       };
 
-      const mockProject = mock<Project>();
-      mockProjectRepository.getProject.mockResolvedValue(mockProject);
       await useCase.run(input);
       expect(mockIssueRepository.getAllIssues).toHaveBeenCalledWith(
         'project-1',
-        120,
       );
     });
 
@@ -304,7 +301,6 @@ describe('HandleScheduledEventUseCase', () => {
         disabledStatus: 'disabled',
         defaultStatus: null,
         disabled: false,
-        allowIssueCacheMinutes: 60,
         startPreparation: {
           awaitingWorkspaceStatus: 'Awaiting Workspace',
           preparationStatus: 'Preparation',
@@ -339,7 +335,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       mockProjectRepository.getProject.mockResolvedValue(mock<Project>());
@@ -350,7 +345,6 @@ describe('HandleScheduledEventUseCase', () => {
       ).toHaveBeenCalledWith(
         expect.objectContaining({
           projectUrl: 'https://github.com/test-org/test-project',
-          allowIssueCacheMinutes: 60,
         }),
       );
     });
@@ -368,7 +362,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       mockProjectRepository.getProject.mockResolvedValue(mock<Project>());
@@ -392,7 +385,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
         allowedIssueAuthors: ['top-level-author'],
       };
 
@@ -421,7 +413,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
         allowedIssueAuthors: ['top-level-author'],
         startPreparation: {
           defaultAgentName: 'agent1',
@@ -464,7 +455,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
         startPreparation: {
           defaultAgentName: 'agent1',
           configFilePath: '/path/to/config.yml',
@@ -510,7 +500,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
         startPreparation: {
           defaultAgentName: 'aw',
           configFilePath: '/path/to/config.yml',
@@ -540,7 +529,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       mockProjectRepository.getProject.mockResolvedValue(mock<Project>());
@@ -562,7 +550,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       const storyProject: Project = {
@@ -612,6 +599,7 @@ describe('HandleScheduledEventUseCase', () => {
         mockProjectRepository.getProject.mockResolvedValue(storyProject);
         mockIssueRepository.getAllIssues.mockResolvedValue({
           issues: [],
+          project: storyProject,
           cacheUsed: false,
         });
         mockIssueRepository.createNewIssue.mockResolvedValue(99);
@@ -705,7 +693,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 10,
         startPreparation: {
           defaultAgentName: 'test-agent',
           configFilePath: '/path/to/config.yml',
@@ -865,7 +852,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       beforeEach(() => {
@@ -1033,7 +1019,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       it('should create an error issue and rethrow when spreadsheet read fails in findTargetDateAndUpdateLastExecutionDateTime', async () => {
@@ -1098,7 +1083,6 @@ describe('HandleScheduledEventUseCase', () => {
         },
         urlOfStoryView: 'https://github.com/test-org/test-project/issues',
         disabled: false,
-        allowIssueCacheMinutes: 60,
       };
 
       it('should not crash and should skip the LastExecutionDateTime write when lastExecutionDateTime is within 60 seconds of now', async () => {

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -95,7 +95,6 @@ export class HandleScheduledEventUseCase {
     };
     urlOfStoryView: string;
     disabled: boolean;
-    allowIssueCacheMinutes: number;
     labelsAsLlmAgentName?: string[] | null;
     changeTargetPathAliases?: Record<string, string> | null;
     allowedIssueAuthors?: string[] | null;
@@ -139,20 +138,13 @@ export class HandleScheduledEventUseCase {
         `Project not found. projectUrl: ${input.projectUrl}`,
       );
     }
-    const project = await this.projectRepository.getProject(projectId);
-    if (!project) {
-      throw new ProjectNotFoundError(
-        `Project not found. projectId: ${
-          projectId
-        } projectUrl: ${input.projectUrl}`,
-      );
-    }
     const now: Date = await this.dateRepository.now();
-    const { issues, cacheUsed }: { issues: Issue[]; cacheUsed: boolean } =
-      await this.issueRepository.getAllIssues(
-        projectId,
-        input.allowIssueCacheMinutes,
-      );
+    const {
+      issues,
+      project,
+      cacheUsed,
+    }: { issues: Issue[]; project: Project; cacheUsed: boolean } =
+      await this.issueRepository.getAllIssues(projectId);
     const storyIssues: StoryObjectMap = await this.storyIssues({
       project,
       issues,
@@ -329,7 +321,6 @@ ${JSON.stringify(e)}
     });
     await this.revertNotReadyReviewQueueIssueUseCase.run({
       projectUrl: input.projectUrl,
-      allowIssueCacheMinutes: input.allowIssueCacheMinutes,
       labelsAsLlmAgentName,
       changeTargetPathAliases: input.changeTargetPathAliases,
       allowedIssueAuthors,
@@ -351,7 +342,6 @@ ${JSON.stringify(e)}
       if (input.startPreparation.preparationProcessCheckCommand) {
         await this.revertOrphanedPreparationUseCase.run({
           projectUrl: input.projectUrl,
-          allowIssueCacheMinutes: input.allowIssueCacheMinutes,
           preparationProcessCheckCommand:
             input.startPreparation.preparationProcessCheckCommand,
           thresholdForAutoReject: input.thresholdForAutoReject ?? 3,
@@ -377,7 +367,6 @@ ${JSON.stringify(e)}
           input.startPreparation.utilizationPercentageThreshold ?? 90,
         allowedIssueAuthors,
         codexHomeCandidates: input.startPreparation.codexHomeCandidates ?? null,
-        allowIssueCacheMinutes: input.allowIssueCacheMinutes,
         labelsAsLlmAgentName,
       });
       return { rotationOrder: preparationResult.rotationOrder };

package/src/domain/usecases/NotifyFinishedIssuePreparationUseCase.ts

@@ -124,10 +124,8 @@ export class NotifyFinishedIssuePreparationUseCase {
 
     if (issue.dependedIssueUrls.length === 0) {
       try {
-        const storyObjectMap = await this.issueRepository.getStoryObjectMap(
-          project,
-          0,
-        );
+        const storyObjectMap =
+          await this.issueRepository.getStoryObjectMap(project);
         for (const storyObject of storyObjectMap.values()) {
           const towerDefenceIssue = storyObject.issues.find(
             (i) => i.url === issue.url,
@@ -387,10 +385,8 @@ export class NotifyFinishedIssuePreparationUseCase {
     }
 
     try {
-      const storyObjectMap = await this.issueRepository.getStoryObjectMap(
-        project,
-        0,
-      );
+      const storyObjectMap =
+        await this.issueRepository.getStoryObjectMap(project);
 
       const isWorkflowBlocker = Array.from(storyObjectMap.entries()).some(
         ([storyName, storyObject]) =>