github-issue-tower-defence-management 1.73.2 → 1.74.0

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

@@ -663,6 +663,7 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
   };
   fetchProjectItemByUrl = async (
     issueUrl: string,
+    projectId?: string,
   ): Promise<ProjectItem | null> => {
     const { owner, repo, issueNumber } = this.extractIssueFromUrl(issueUrl);
     const graphql = `query GetIssueOrPullRequest($owner: String!, $repo: String!, $number: Int!) {
@@ -693,6 +694,9 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       projectItems(first: 10) {
         nodes {
           id
+          project {
+            id
+          }
           fieldValues(first: 10) {
             nodes {
               ... on ProjectV2ItemFieldTextValue {
@@ -767,6 +771,9 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       projectItems(first: 10) {
         nodes {
           id
+          project {
+            id
+          }
           fieldValues(first: 10) {
             nodes {
               ... on ProjectV2ItemFieldTextValue {
@@ -839,6 +846,7 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       projectItems: {
         nodes: {
           id: string;
+          project: { id: string } | null;
           fieldValues: {
             nodes: {
               text: string;
@@ -883,9 +891,16 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       return null;
     }
     const projectItems = content.projectItems.nodes;
-    const item = projectItems[0];
+    const item = projectId
+      ? projectItems.find((node) => node.project?.id === projectId)
+      : projectItems[0];
     if (!item) {
-      throw new Error(`No project item found for issue ${issueUrl}`);
+      console.warn(
+        projectId
+          ? `No project item found for issue ${issueUrl} on project ${projectId}`
+          : `No project item found for issue ${issueUrl}`,
+      );
+      return null;
     }
     return {
       id: item.id,
@@ -1066,13 +1081,18 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
   addIssueToProject = async (
     projectId: string,
     issueUrl: string,
-  ): Promise<void> => {
+  ): Promise<string> => {
     const { owner, repo, issueNumber } = this.extractIssueFromUrl(issueUrl);
     const nodeIdQuery = {
-      query: `query GetIssueNodeId($owner: String!, $repo: String!, $number: Int!) {
+      query: `query GetContentNodeId($owner: String!, $repo: String!, $number: Int!) {
         repository(owner: $owner, name: $repo) {
-          issue(number: $number) {
-            id
+          issueOrPullRequest(number: $number) {
+            ... on Issue {
+              id
+            }
+            ... on PullRequest {
+              id
+            }
           }
         }
       }`,
@@ -1088,9 +1108,9 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       .json<{
         data: {
           repository: {
-            issue: {
+            issueOrPullRequest: {
               id: string;
-            };
+            } | null;
           };
         };
         errors?: { message: string }[];
@@ -1098,7 +1118,10 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
     if (nodeIdRes.errors) {
       throw new Error(nodeIdRes.errors.map((e) => e.message).join('\n'));
     }
-    const contentId = nodeIdRes.data.repository.issue.id;
+    const contentId = nodeIdRes.data.repository.issueOrPullRequest?.id;
+    if (!contentId) {
+      throw new Error(`Content not found for url ${issueUrl}`);
+    }
 
     const addQuery = {
       query: `mutation AddIssueToProject($projectId: ID!, $contentId: ID!) {
@@ -1126,5 +1149,6 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
     if (addRes.errors) {
       throw new Error(addRes.errors.map((e) => e.message).join('\n'));
     }
+    return addRes.data.addProjectV2ItemById.item.id;
   };
 }

package/src/domain/usecases/HandleScheduledEventUseCase.ts

@@ -81,6 +81,7 @@ export class HandleScheduledEventUseCase {
     startPreparation?: {
       defaultAgentName: string;
       defaultLlmModelName?: string | null;
+      fallbackLlmModelName?: string | null;
       defaultLlmAgentName?: string | null;
       configFilePath: string;
       maximumPreparingIssuesCount: number | null;
@@ -309,6 +310,8 @@ ${JSON.stringify(e)}
         projectUrl: input.projectUrl,
         defaultAgentName: input.startPreparation.defaultAgentName,
         defaultLlmModelName: input.startPreparation.defaultLlmModelName ?? null,
+        fallbackLlmModelName:
+          input.startPreparation.fallbackLlmModelName ?? null,
         defaultLlmAgentName: input.startPreparation.defaultLlmAgentName ?? null,
         configFilePath: input.startPreparation.configFilePath,
         maximumPreparingIssuesCount:

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

@@ -211,4 +211,61 @@ describe('SetDependedIssueUrlForOpenTaskPRsUseCase', () => {
       secondOpenTaskIssue.url,
     );
   });
+
+  it('should isolate a single PR failure, log it, and still process the remaining PRs without aborting the cycle', async () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+    const failingPrUrl = 'https://github.com/owner/repo/pull/100';
+    const succeedingPrUrl = 'https://github.com/owner/repo/pull/200';
+
+    mockIssueRepository.findRelatedOpenPRs.mockResolvedValue([
+      {
+        url: failingPrUrl,
+        branchName: null,
+        createdAt: new Date(0),
+        isDraft: false,
+        isConflicted: false,
+        isPassedAllCiJob: true,
+        isCiStateSuccess: true,
+        isResolvedAllReviewComments: true,
+        isBranchOutOfDate: false,
+        missingRequiredCheckNames: [],
+      },
+      {
+        url: succeedingPrUrl,
+        branchName: null,
+        createdAt: new Date(0),
+        isDraft: false,
+        isConflicted: false,
+        isPassedAllCiJob: true,
+        isCiStateSuccess: true,
+        isResolvedAllReviewComments: true,
+        isBranchOutOfDate: false,
+        missingRequiredCheckNames: [],
+      },
+    ]);
+    mockIssueRepository.setDependedIssueUrl.mockImplementation(
+      async (prUrl) => {
+        if (prUrl === failingPrUrl) {
+          throw new Error('boom');
+        }
+      },
+    );
+
+    await expect(
+      useCase.run({
+        project: projectWithField,
+        issues: [openTaskIssue],
+      }),
+    ).resolves.toBeUndefined();
+
+    expect(mockIssueRepository.setDependedIssueUrl).toHaveBeenCalledTimes(2);
+    expect(mockIssueRepository.setDependedIssueUrl).toHaveBeenCalledWith(
+      succeedingPrUrl,
+      projectWithField,
+      openTaskIssue.url,
+    );
+    expect(warnSpy).toHaveBeenCalled();
+
+    warnSpy.mockRestore();
+  });
 });

package/src/domain/usecases/SetDependedIssueUrlForOpenTaskPRsUseCase.ts

@@ -25,11 +25,17 @@ export class SetDependedIssueUrlForOpenTaskPRsUseCase {
         issue.url,
       );
       for (const pr of relatedOpenPRs) {
-        await this.issueRepository.setDependedIssueUrl(
-          pr.url,
-          input.project,
-          issue.url,
-        );
+        try {
+          await this.issueRepository.setDependedIssueUrl(
+            pr.url,
+            input.project,
+            issue.url,
+          );
+        } catch (error) {
+          console.warn(
+            `Failed to set depended issue URL for PR ${pr.url}, skipping and continuing with remaining PRs: ${error instanceof Error ? error.message : String(error)}`,
+          );
+        }
       }
     }
   };