feat(api): codegen for discussions

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

package.json

@@ -19,7 +19,7 @@
     "package:win": "electron-builder --win --config ./config/electron-builder.js",
     "lint:check": "biome check",
     "lint": "biome check --fix",
-    "test": "jest",
+    "test": "TZ=UTC jest",
     "start": "electron . --enable-logging",
     "prepare": "husky",
     "codegen": "graphql-codegen --config codegen.ts"

src/renderer/utils/helpers.test.ts

@@ -14,7 +14,10 @@ import {
   mockDiscussionByNumberGraphQLResponse,
   mockSingleNotification,
 } from './api/__mocks__/response-mocks';
+import * as apiClient from './api/client';
+import type { FetchDiscussionByNumberQuery } from './api/graphql/generated/graphql';
 import * as apiRequests from './api/request';
+import type { GitHubGraphQLResponse } from './api/types';
 import {
   generateGitHubWebUrl,
   generateNotificationReferrerId,
@@ -273,9 +276,9 @@ describe('renderer/utils/helpers.ts', () => {
     });
 
     describe('Discussions URLs', () => {
-      const performGraphQLRequestSpy = jest.spyOn(
-        apiRequests,
-        'performGraphQLRequest',
+      const fetchDiscussionByNumberSpy = jest.spyOn(
+        apiClient,
+        'fetchDiscussionByNumber',
       );
 
       it('when no subject urls and no discussions found via query, default to linking to repository discussions', async () => {
@@ -286,16 +289,16 @@ describe('renderer/utils/helpers.ts', () => {
           type: 'Discussion' as SubjectType,
         };
 
-        performGraphQLRequestSpy.mockResolvedValue({
-          data: { data: { search: { nodes: [] } } },
-        } as AxiosResponse);
+        fetchDiscussionByNumberSpy.mockResolvedValue({
+          data: { repository: { discussion: null } },
+        } as any);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(performGraphQLRequestSpy).toHaveBeenCalledTimes(1);
+        expect(fetchDiscussionByNumberSpy).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `${mockSingleNotification.repository.html_url}/discussions?${mockNotificationReferrer}`,
         );
@@ -309,18 +312,16 @@ describe('renderer/utils/helpers.ts', () => {
           type: 'Discussion' as SubjectType,
         };
 
-        performGraphQLRequestSpy.mockResolvedValue({
-          data: {
-            ...mockDiscussionByNumberGraphQLResponse,
-          },
-        } as AxiosResponse);
+        fetchDiscussionByNumberSpy.mockResolvedValue({
+          data: mockDiscussionByNumberGraphQLResponse,
+        } as GitHubGraphQLResponse<FetchDiscussionByNumberQuery>);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(performGraphQLRequestSpy).toHaveBeenCalledTimes(1);
+        expect(fetchDiscussionByNumberSpy).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/discussions/612?${mockNotificationReferrer}#discussioncomment-2300902`,
         );
@@ -338,14 +339,20 @@ describe('renderer/utils/helpers.ts', () => {
           type: 'Discussion' as SubjectType,
         };
 
-        performGraphQLRequestSpy.mockResolvedValue(null as AxiosResponse);
+        fetchDiscussionByNumberSpy.mockResolvedValue({
+          errors: [
+            {
+              message: 'Something failed',
+            },
+          ],
+        } as GitHubGraphQLResponse<FetchDiscussionByNumberQuery>);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(performGraphQLRequestSpy).toHaveBeenCalledTimes(1);
+        expect(fetchDiscussionByNumberSpy).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/discussions?${mockNotificationReferrer}`,
         );

src/renderer/utils/helpers.ts

@@ -160,6 +160,10 @@ export async function generateGitHubWebUrl(
       err,
       notification,
     );
+
+    if (notification.subject.type === 'Discussion') {
+      url.pathname += '/discussions';
+    }
   }
 
   url.searchParams.set(

src/renderer/utils/notifications/handlers/discussion.test.ts

@@ -26,11 +26,15 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
   describe('enrich', () => {
     const partialRepository: Partial<Repository> = {
       full_name: 'gitify-app/notifications-test',
+      owner: {
+        login: 'gitify-app',
+      } as any,
     };
 
     const mockNotification = createPartialMockNotification({
       title: 'This is a mock discussion',
       type: 'Discussion',
+      url: 'https://api.github.com/repos/gitify-app/notifications-test/discussions/123' as Link,
     });
     mockNotification.updated_at = '2024-01-01T00:00:00Z';
     mockNotification.repository = {
@@ -48,8 +52,8 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [mockDiscussionNode(null, true)],
+            repository: {
+              discussion: mockDiscussionNode(null, true),
             },
           },
         });
@@ -78,10 +82,11 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [
-                mockDiscussionNode(DiscussionStateReason.Duplicate, false),
-              ],
+            repository: {
+              discussion: mockDiscussionNode(
+                DiscussionStateReason.Duplicate,
+                false,
+              ),
             },
           },
         });
@@ -110,8 +115,8 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [mockDiscussionNode(null, false)],
+            repository: {
+              discussion: mockDiscussionNode(null, false),
             },
           },
         });
@@ -140,10 +145,11 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [
-                mockDiscussionNode(DiscussionStateReason.Outdated, false),
-              ],
+            repository: {
+              discussion: mockDiscussionNode(
+                DiscussionStateReason.Outdated,
+                false,
+              ),
             },
           },
         });
@@ -172,10 +178,11 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [
-                mockDiscussionNode(DiscussionStateReason.Reopened, false),
-              ],
+            repository: {
+              discussion: mockDiscussionNode(
+                DiscussionStateReason.Reopened,
+                false,
+              ),
             },
           },
         });
@@ -204,8 +211,11 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [mockDiscussionNode(DiscussionStateReason.Resolved, true)],
+            repository: {
+              discussion: mockDiscussionNode(
+                DiscussionStateReason.Resolved,
+                true,
+              ),
             },
           },
         });
@@ -243,8 +253,8 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [mockDiscussion],
+            repository: {
+              discussion: mockDiscussion,
             },
           },
         });
@@ -273,8 +283,8 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
         .post('/graphql')
         .reply(200, {
           data: {
-            search: {
-              nodes: [mockDiscussionNode(null, false)],
+            repository: {
+              discussion: mockDiscussionNode(null, false),
             },
           },
         });
@@ -324,11 +334,7 @@ function mockDiscussionNode(
     url: 'https://github.com/gitify-app/notifications-test/discussions/1' as Link,
     stateReason: state || undefined,
     isAnswered: isAnswered,
-    author: {
-      login: mockDiscussionAuthor.login,
-      url: mockDiscussionAuthor.url,
-      avatarUrl: mockDiscussionAuthor.avatar_url,
-    } as Partial<Discussion>['author'],
+    author: mockDiscussionAuthor,
     comments: {
       nodes: [],
       totalCount: 0,
@@ -338,7 +344,7 @@ function mockDiscussionNode(
         startCursor: null,
         endCursor: null,
       },
-    } as Partial<Discussion>['comments'],
+    } as unknown as Partial<Discussion>['comments'],
     labels: null as Partial<Discussion>['labels'],
-  } as Partial<Discussion>;
+  } as unknown as Partial<Discussion>;
 }