github-issue-tower-defence-management 1.35.1 → 1.36.0

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

@@ -1,24 +1,32 @@
-import axios, { AxiosHeaders, AxiosResponse } from 'axios';
+const mockPost = jest.fn();
+
+jest.mock('ky', () => ({
+  default: {
+    post: mockPost,
+    get: jest.fn(),
+    put: jest.fn(),
+    patch: jest.fn(),
+    delete: jest.fn(),
+    extend: jest.fn(),
+    create: jest.fn(),
+    stop: jest.fn(),
+  },
+  __esModule: true,
+}));
+
 import {
   GraphqlProjectItemRepository,
   PAGINATION_DELAY_MS,
 } from './GraphqlProjectItemRepository';
 import { LocalStorageRepository } from '../LocalStorageRepository';
 
-jest.mock('axios');
-const mockAxios = jest.mocked(axios);
-
-const toAxiosResponse = <T>(data: T): AxiosResponse<T> => ({
-  data,
-  status: 200,
-  statusText: 'OK',
-  headers: {},
-  config: { headers: new AxiosHeaders() },
+const mockJsonResponse = <T>(data: T) => ({
+  json: jest.fn().mockResolvedValue(data),
 });
 
 describe('GraphqlProjectItemRepository', () => {
   const makePageResponse = (hasNextPage: boolean, endCursor: string) =>
-    toAxiosResponse({
+    mockJsonResponse({
       data: {
         node: {
           items: {
@@ -64,7 +72,7 @@ describe('GraphqlProjectItemRepository', () => {
 
     afterEach(() => {
       jest.useRealTimers();
-      mockAxios.mockClear();
+      mockPost.mockClear();
     });
 
     it('should sleep between paginated requests to avoid 403', async () => {
@@ -76,15 +84,15 @@ describe('GraphqlProjectItemRepository', () => {
       );
 
       const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
-      mockAxios
-        .mockResolvedValueOnce(makePageResponse(true, 'cursor-1'))
-        .mockResolvedValueOnce(makePageResponse(false, 'cursor-2'));
+      mockPost
+        .mockReturnValueOnce(makePageResponse(true, 'cursor-1'))
+        .mockReturnValueOnce(makePageResponse(false, 'cursor-2'));
 
       const resultPromise = repository.fetchProjectItems('test-project-id');
       await jest.advanceTimersByTimeAsync(PAGINATION_DELAY_MS);
       const result = await resultPromise;
 
-      expect(mockAxios).toHaveBeenCalledTimes(2);
+      expect(mockPost).toHaveBeenCalledTimes(2);
       expect(result).toHaveLength(2);
       expect(setTimeoutSpy).toHaveBeenCalledWith(
         expect.any(Function),
@@ -102,11 +110,11 @@ describe('GraphqlProjectItemRepository', () => {
       );
 
       const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
-      mockAxios.mockResolvedValueOnce(makePageResponse(false, 'cursor-1'));
+      mockPost.mockReturnValueOnce(makePageResponse(false, 'cursor-1'));
 
       const result = await repository.fetchProjectItems('test-project-id');
 
-      expect(mockAxios).toHaveBeenCalledTimes(1);
+      expect(mockPost).toHaveBeenCalledTimes(1);
       expect(result).toHaveLength(1);
       expect(setTimeoutSpy).not.toHaveBeenCalledWith(
         expect.any(Function),
@@ -118,7 +126,7 @@ describe('GraphqlProjectItemRepository', () => {
 
   describe('getProjectItemFields', () => {
     afterEach(() => {
-      mockAxios.mockClear();
+      mockPost.mockClear();
     });
 
     it('should return project item fields', async () => {
@@ -129,8 +137,8 @@ describe('GraphqlProjectItemRepository', () => {
         'dummy-token',
       );
 
-      mockAxios.mockResolvedValueOnce(
-        toAxiosResponse({
+      mockPost.mockReturnValueOnce(
+        mockJsonResponse({
           data: {
             repository: {
               issue: {
@@ -163,7 +171,7 @@ describe('GraphqlProjectItemRepository', () => {
 
       const result = await repository.getProjectItemFields('owner', 'repo', 1);
 
-      expect(mockAxios).toHaveBeenCalledTimes(1);
+      expect(mockPost).toHaveBeenCalledTimes(1);
       expect(result).toEqual([
         {
           fieldName: 'NextActionDate',

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

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import ky from 'ky';
 import { BaseGitHubRepository } from '../BaseGitHubRepository';
 import { Project } from '../../../domain/entities/Project';
 import { Issue } from '../../../domain/entities/Issue';
@@ -50,33 +50,32 @@ export class GraphqlProjectItemRepository extends BaseGitHubRepository {
     };
 
     try {
-      const response = await axios<{
-        data: {
-          repository: {
-            issue: {
-              projectItems: {
-                nodes: {
-                  id: string;
-                  project: { id: string };
-                }[];
+      const response = await ky
+        .post('https://api.github.com/graphql', {
+          json: graphqlQuery,
+          headers: {
+            Authorization: `Bearer ${this.ghToken}`,
+          },
+        })
+        .json<{
+          data: {
+            repository: {
+              issue: {
+                projectItems: {
+                  nodes: {
+                    id: string;
+                    project: { id: string };
+                  }[];
+                };
               };
             };
           };
-        };
-      }>({
-        url: 'https://api.github.com/graphql',
-        method: 'post',
-        headers: {
-          Authorization: `Bearer ${this.ghToken}`,
-          'Content-Type': 'application/json',
-        },
-        data: JSON.stringify(graphqlQuery),
-      });
+        }>();
 
       const projectItems: {
         id: string;
         project: { id: string };
-      }[] = response.data.data.repository.issue.projectItems.nodes;
+      }[] = response.data.repository.issue.projectItems.nodes;
       const projectItemId = projectItems.find(
         (item) => item.project.id === projectId,
       )?.id;
@@ -240,56 +239,55 @@ query GetProjectItems($projectId: ID!, $after: String) {
           after: after,
         },
       };
-      const response = await axios<{
-        data: {
-          node: {
-            items: {
-              totalCount: number;
-              pageInfo: {
-                endCursor: string;
-                startCursor: string;
-                hasNextPage: boolean;
-              };
-              nodes: {
-                id: string;
-                fieldValues: {
-                  nodes: {
-                    text: string;
-                    number: number;
-                    date: string;
-                    field: {
-                      name: string;
-                    };
-                  }[];
-                };
-                content: {
-                  repository: { nameWithOwner: string };
-                  number: number;
-                  title: string;
-                  state: string;
-                  url: string;
-                  body: string;
-                  createdAt: string;
-                  labels: { nodes: { name: string }[] };
-                  assignees: { nodes: { login: string }[] };
+      const response = await ky
+        .post('https://api.github.com/graphql', {
+          json: graphqlQuery,
+          headers: {
+            Authorization: `Bearer ${this.ghToken}`,
+          },
+        })
+        .json<{
+          data: {
+            node: {
+              items: {
+                totalCount: number;
+                pageInfo: {
+                  endCursor: string;
+                  startCursor: string;
+                  hasNextPage: boolean;
                 };
-              }[];
+                nodes: {
+                  id: string;
+                  fieldValues: {
+                    nodes: {
+                      text: string;
+                      number: number;
+                      date: string;
+                      field: {
+                        name: string;
+                      };
+                    }[];
+                  };
+                  content: {
+                    repository: { nameWithOwner: string };
+                    number: number;
+                    title: string;
+                    state: string;
+                    url: string;
+                    body: string;
+                    createdAt: string;
+                    labels: { nodes: { name: string }[] };
+                    assignees: { nodes: { login: string }[] };
+                  };
+                }[];
+              };
             };
           };
-        };
-      }>({
-        url: 'https://api.github.com/graphql',
-        method: 'post',
-        headers: {
-          Authorization: `Bearer ${this.ghToken}`,
-          'Content-Type': 'application/json',
-        },
-        data: JSON.stringify(graphqlQuery),
-      });
-      if (!response.data.data) {
+        }>();
+      if (!response.data) {
         throw new Error('No data returned from GitHub API');
       }
-      return response.data.data;
+      return response.data;
     };
     const issues: ProjectItem[] = [];
     let after: string | null = null;
@@ -458,40 +456,39 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
         issueNumber: issueNumber,
       },
     };
-    const response = await axios<{
-      data: {
-        repository: {
-          issue: {
-            projectItems: {
-              nodes: {
-                id: string;
-                fieldValues: {
-                  nodes: {
-                    __typename: string;
-                    field: { name: string };
-                    date: string;
-                    name: string;
-                    text: string;
-                    repository: { name: string };
-                    user: { login: string };
-                  }[];
-                };
-              }[];
+    const response = await ky
+      .post('https://api.github.com/graphql', {
+        json: graphqlQuery,
+        headers: {
+          Authorization: `Bearer ${this.ghToken}`,
+        },
+      })
+      .json<{
+        data: {
+          repository: {
+            issue: {
+              projectItems: {
+                nodes: {
+                  id: string;
+                  fieldValues: {
+                    nodes: {
+                      __typename: string;
+                      field: { name: string };
+                      date: string;
+                      name: string;
+                      text: string;
+                      repository: { name: string };
+                      user: { login: string };
+                    }[];
+                  };
+                }[];
+              };
             };
           };
         };
-      };
-    }>({
-      url: 'https://api.github.com/graphql',
-      method: 'post',
-      headers: {
-        Authorization: `Bearer ${this.ghToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify(graphqlQuery),
-    });
+      }>();
 
-    const data = response.data.data;
+    const data = response.data;
     const issueFields: {
       fieldName: string;
       fieldValue: string;
@@ -615,48 +612,47 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
         number: issueNumber,
       },
     };
-    const response = await axios<{
-      data: {
-        repository: {
-          issue: {
-            number: number;
-            title: string;
-            state: string;
-            url: string;
-            body: string;
-            createdAt: string;
-            labels: { nodes: { name: string }[] };
-            assignees: { nodes: { login: string }[] };
-            repository: { nameWithOwner: string };
-            projectItems: {
-              nodes: {
-                id: string;
-                fieldValues: {
-                  nodes: {
-                    text: string;
-                    number: number;
-                    date: string;
-                    name: string;
-                    field: {
+    const response = await ky
+      .post('https://api.github.com/graphql', {
+        json: graphqlQuery,
+        headers: {
+          Authorization: `Bearer ${this.ghToken}`,
+        },
+      })
+      .json<{
+        data: {
+          repository: {
+            issue: {
+              number: number;
+              title: string;
+              state: string;
+              url: string;
+              body: string;
+              createdAt: string;
+              labels: { nodes: { name: string }[] };
+              assignees: { nodes: { login: string }[] };
+              repository: { nameWithOwner: string };
+              projectItems: {
+                nodes: {
+                  id: string;
+                  fieldValues: {
+                    nodes: {
+                      text: string;
+                      number: number;
+                      date: string;
                       name: string;
-                    };
-                  }[];
-                };
-              }[];
+                      field: {
+                        name: string;
+                      };
+                    }[];
+                  };
+                }[];
+              };
             };
           };
         };
-      };
-    }>({
-      url: 'https://api.github.com/graphql',
-      method: 'post',
-      headers: {
-        Authorization: `Bearer ${this.ghToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify(graphqlQuery),
-    });
-    const data = response.data.data;
+      }>();
+    const data = response.data;
     if (!data.repository.issue) {
       return null;
     }
@@ -738,26 +734,23 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
     }`,
     };
 
-    const res = await axios<{
-      data: {
-        updateProjectV2ItemFieldValue: {
-          clientMutationId: string;
+    const res = await ky
+      .post('https://api.github.com/graphql', {
+        json: graphqlQuery,
+        headers: {
+          Authorization: `Bearer ${this.ghToken}`,
+        },
+      })
+      .json<{
+        data: {
+          updateProjectV2ItemFieldValue: {
+            clientMutationId: string;
+          };
         };
-      };
-      errors: { message: string }[];
-    }>({
-      url: 'https://api.github.com/graphql',
-      method: 'post',
-      headers: {
-        Authorization: `Bearer ${this.ghToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify(graphqlQuery),
-    });
-    if (res.status !== 200) {
-      throw new Error('Failed to update project field');
-    } else if (res.data.errors) {
-      throw new Error(res.data.errors.map((e) => e.message).join('\n'));
+        errors: { message: string }[];
+      }>();
+    if (res.errors) {
+      throw new Error(res.errors.map((e) => e.message).join('\n'));
     }
   };
 
@@ -778,26 +771,23 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
     }`,
     };
 
-    const res = await axios<{
-      data: {
-        clearProjectV2ItemFieldValue: {
-          clientMutationId: string;
+    const res = await ky
+      .post('https://api.github.com/graphql', {
+        json: graphqlQuery,
+        headers: {
+          Authorization: `Bearer ${this.ghToken}`,
+        },
+      })
+      .json<{
+        data: {
+          clearProjectV2ItemFieldValue: {
+            clientMutationId: string;
+          };
         };
-      };
-      errors: { message: string }[];
-    }>({
-      url: 'https://api.github.com/graphql',
-      method: 'post',
-      headers: {
-        Authorization: `Bearer ${this.ghToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify(graphqlQuery),
-    });
-    if (res.status !== 200) {
-      throw new Error('Failed to clear project field');
-    } else if (res.data.errors) {
-      throw new Error(res.data.errors.map((e) => e.message).join('\n'));
+        errors: { message: string }[];
+      }>();
+    if (res.errors) {
+      throw new Error(res.errors.map((e) => e.message).join('\n'));
     }
   };
   updateProjectTextField = async (
@@ -825,27 +815,24 @@ query GetProjectFields($owner: String!, $repository: String!, $issueNumber: Int!
       },
     };
 
-    const res = await axios<{
-      data: {
-        deleteProjectV2Item: {
-          clientMutationId: string;
+    const res = await ky
+      .post('https://api.github.com/graphql', {
+        json: graphqlQuery,
+        headers: {
+          Authorization: `Bearer ${this.ghToken}`,
+        },
+      })
+      .json<{
+        data: {
+          deleteProjectV2Item: {
+            clientMutationId: string;
+          };
         };
-      };
-      errors?: { message: string }[];
-    }>({
-      url: 'https://api.github.com/graphql',
-      method: 'post',
-      headers: {
-        Authorization: `Bearer ${this.ghToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: JSON.stringify(graphqlQuery),
-    });
+        errors?: { message: string }[];
+      }>();
 
-    if (res.status !== 200) {
-      throw new Error('Failed to remove item from project');
-    } else if (res.data.errors) {
-      throw new Error(res.data.errors.map((e) => e.message).join('\n'));
+    if (res.errors) {
+      throw new Error(res.errors.map((e) => e.message).join('\n'));
     }
   };
 

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

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import ky from 'ky';
 import { BaseGitHubRepository } from '../BaseGitHubRepository';
 import typia from 'typia';
 import { Issue, IssueStatusTimeline } from './CheerioIssueRepository';
@@ -419,23 +419,27 @@ export class InternalGraphqlIssueRepository extends BaseGitHubRepository {
       for (let i = 0; i < maxRetries; i++) {
         try {
           console.log(url);
-          const response = await axios.get<GraphqlResponse>(url, {
+          const kyResponse = await ky.get(url, {
             headers: headers,
-            withCredentials: true,
+            throwHttpErrors: false,
           });
-          if (!response.data?.data?.node?.frontTimelineItems) {
+          if (!kyResponse.ok) {
+            throw new Error(`HTTP error ${kyResponse.status}`);
+          }
+          const rawResponse = await kyResponse.json<GraphqlResponse>();
+          if (!rawResponse?.data?.node?.frontTimelineItems) {
             throw new Error(
               `No frontTimelineItems found. URL: ${issueUrl}, Response: ${JSON.stringify(
-                response.data,
+                rawResponse,
               )}`,
             );
           }
           await new Promise((resolve) => setTimeout(resolve, 2000));
-          return response.data.data.node.frontTimelineItems;
+          return rawResponse.data.node.frontTimelineItems;
         } catch (e) {
           const statusCode =
-            axios.isAxiosError(e) && e.response?.status !== undefined
-              ? e.response.status
+            e instanceof Error && e.message.startsWith('HTTP error ')
+              ? parseInt(e.message.replace('HTTP error ', ''), 10)
               : null;
           const isRetryableError =
             statusCode !== null && [500, 502, 503, 504].includes(statusCode);