fix: improve error handling (#901)

* fix: improve error handling

* fix: improve error handling

* incorporate pr feedback

* Merge remote-tracking branch 'origin/main' into bugfix/improve-error-handling

Author: setchy

src/utils/__snapshots__/api-requests.test.ts.snap

@@ -1,34 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`apiRequest should make a request with the correct parameters 1`] = `
+exports[`apiRequestAuth should make an authenticated request with the correct parameters 1`] = `
 {
   "Accept": "application/json",
+  "Authorization": "token yourAuthToken",
   "Cache-Control": "no-cache",
   "Content-Type": "application/json",
 }
 `;
 
-exports[`apiRequest should make a request with the correct parameters and default data 1`] = `
+exports[`apiRequestAuth should make an authenticated request with the correct parameters and default data 1`] = `
 {
   "Accept": "application/json",
+  "Authorization": "token yourAuthToken",
   "Cache-Control": "no-cache",
   "Content-Type": "application/json",
 }
 `;
 
-exports[`apiRequestAuth should make an authenticated request with the correct parameters 1`] = `
+exports[`utils/api-requests.ts should make a request with the correct parameters 1`] = `
 {
   "Accept": "application/json",
-  "Authorization": "token yourAuthToken",
   "Cache-Control": "no-cache",
   "Content-Type": "application/json",
 }
 `;
 
-exports[`apiRequestAuth should make an authenticated request with the correct parameters and default data 1`] = `
+exports[`utils/api-requests.ts should make a request with the correct parameters and default data 1`] = `
 {
   "Accept": "application/json",
-  "Authorization": "token yourAuthToken",
   "Cache-Control": "no-cache",
   "Content-Type": "application/json",
 }

src/utils/api-requests.test.ts

@@ -6,7 +6,11 @@ jest.mock('axios');
 const url = 'https://example.com';
 const method = 'get';
 
-describe('apiRequest', () => {
+describe('utils/api-requests.ts', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should make a request with the correct parameters', async () => {
     const data = { key: 'value' };
 
@@ -38,6 +42,10 @@ describe('apiRequest', () => {
 describe('apiRequestAuth', () => {
   const token = 'yourAuthToken';
 
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should make an authenticated request with the correct parameters', async () => {
     const data = { key: 'value' };
 

src/utils/api-requests.ts

@@ -4,7 +4,7 @@ export function apiRequest(
   url: string,
   method: Method,
   data = {},
-): AxiosPromise {
+): AxiosPromise | null {
   axios.defaults.headers.common['Accept'] = 'application/json';
   axios.defaults.headers.common['Content-Type'] = 'application/json';
   axios.defaults.headers.common['Cache-Control'] = 'no-cache';
@@ -16,7 +16,7 @@ export function apiRequestAuth(
   method: Method,
   token: string,
   data = {},
-): AxiosPromise {
+): AxiosPromise | null {
   axios.defaults.headers.common['Accept'] = 'application/json';
   axios.defaults.headers.common['Authorization'] = `token ${token}`;
   axios.defaults.headers.common['Cache-Control'] = 'no-cache';

src/utils/helpers.test.ts

@@ -445,6 +445,34 @@ describe('utils/helpers.ts', () => {
           `https://github.com/manosim/notifications-test/discussions/612?${mockedNotificationReferrer}#discussioncomment-2300902`,
         );
       });
+
+      it('default to base discussions url when graphql query fails', async () => {
+        const subject = {
+          title: '1.16.0',
+          url: null,
+          latest_comment_url: null,
+          type: 'Discussion' as SubjectType,
+        };
+
+        const requestPromise = new Promise((resolve) =>
+          resolve(null as AxiosResponse),
+        ) as AxiosPromise;
+
+        apiRequestAuthMock.mockResolvedValue(requestPromise);
+
+        const result = await generateGitHubWebUrl(
+          {
+            ...mockedSingleNotification,
+            subject: subject,
+          },
+          mockAccounts,
+        );
+
+        expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
+        expect(result).toBe(
+          `https://github.com/manosim/notifications-test/discussions?${mockedNotificationReferrer}`,
+        );
+      });
     });
 
     it('Repository Invitation url', async () => {

src/utils/helpers.ts

@@ -136,8 +136,9 @@ async function getDiscussionUrl(
 
     let latestCommentId: string | number;
 
-    if (comments?.length) {
-      latestCommentId = getLatestDiscussionComment(comments)?.databaseId;
+    latestCommentId = getLatestDiscussionComment(comments)?.databaseId;
+
+    if (latestCommentId) {
       url += `#discussioncomment-${latestCommentId}`;
     }
   }
@@ -218,9 +219,13 @@ export async function fetchDiscussion(
 export function getLatestDiscussionComment(
   comments: DiscussionCommentNode[],
 ): DiscussionSubcommentNode | null {
+  if (!comments || comments.length == 0) {
+    return null;
+  }
+
   return comments
     .flatMap((comment) => comment.replies.nodes)
-    .concat([comments.at(-1)])
+    .concat([comments[comments.length - 1]])
     .reduce((a, b) => (a.createdAt > b.createdAt ? a : b));
 }