refactor: clean up query merging implementation

- Remove commented-out debug code from notifications.ts
- Fix FIXME by using isAnsweredDiscussionFeatureSupported with account
- Remove unused extras field from GraphQLMergedQueryConfig type
- Add mergeQueryConfig tests for issue, pullRequest, discussion, and default handlers
- Document why integration test is skipped (complex mocking requirements)

Author: afonsojramos

src/renderer/hooks/useNotifications.test.ts

@@ -115,6 +115,9 @@ describe('renderer/hooks/useNotifications.ts', () => {
       expect(result.current.notifications[1].notifications.length).toBe(2);
     });
 
+    // Note: This integration test is skipped because the query merging functionality
+    // requires complex mocking of multiple endpoints. The merging functionality is
+    // tested via unit tests in notifications.test.ts and individual handler tests.
     it.skip('should fetch detailed notifications with success', async () => {
       const mockRepository = {
         name: 'notifications-test',

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

@@ -12,6 +12,13 @@ import {
 import { defaultHandler } from './default';
 
 describe('renderer/utils/notifications/handlers/default.ts', () => {
+  describe('mergeQueryConfig', () => {
+    it('should return undefined (no merge query support)', () => {
+      const config = defaultHandler.mergeQueryConfig();
+      expect(config).toBeUndefined();
+    });
+  });
+
   describe('enrich', () => {
     it('unhandled subject details', async () => {
       const mockNotification = createPartialMockNotification({

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

@@ -14,9 +14,11 @@ import {
   IconColor,
   type Link,
 } from '../../../types';
-import type {
-  DiscussionDetailsFragment,
-  DiscussionStateReason,
+import {
+  type DiscussionDetailsFragment,
+  DiscussionDetailsFragmentDoc,
+  DiscussionMergeQueryFragmentDoc,
+  type DiscussionStateReason,
 } from '../../api/graphql/generated/graphql';
 import { discussionHandler } from './discussion';
 
@@ -25,6 +27,16 @@ const mockCommenter = createMockGraphQLAuthor('discussion-commenter');
 const mockReplier = createMockGraphQLAuthor('discussion-replier');
 
 describe('renderer/utils/notifications/handlers/discussion.ts', () => {
+  describe('mergeQueryConfig', () => {
+    it('should return the correct query and response fragments', () => {
+      const config = discussionHandler.mergeQueryConfig();
+
+      expect(config).toBeDefined();
+      expect(config.queryFragment).toBe(DiscussionMergeQueryFragmentDoc);
+      expect(config.responseFragment).toBe(DiscussionDetailsFragmentDoc);
+    });
+  });
+
   describe('enrich', () => {
     const mockNotification = createPartialMockNotification({
       title: 'This is a mock discussion',

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

@@ -37,12 +37,6 @@ class DiscussionHandler extends DefaultHandler {
     return {
       queryFragment: DiscussionMergeQueryFragmentDoc,
       responseFragment: DiscussionDetailsFragmentDoc,
-      extras: [
-        { name: 'lastComments', type: 'Int', defaultValue: 100 },
-        { name: 'lastReplies', type: 'Int', defaultValue: 100 },
-        { name: 'firstLabels', type: 'Int', defaultValue: 100 },
-        { name: 'includeIsAnswered', type: 'Boolean!', defaultValue: true },
-      ],
     } as GraphQLMergedQueryConfig;
   }
 

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

@@ -14,17 +14,29 @@ import {
   IconColor,
   type Link,
 } from '../../../types';
-import type {
-  IssueDetailsFragment,
-  IssueState,
-  IssueStateReason,
+import {
+  type IssueDetailsFragment,
+  IssueDetailsFragmentDoc,
+  IssueMergeQueryFragmentDoc,
+  type IssueState,
+  type IssueStateReason,
 } from '../../api/graphql/generated/graphql';
 import { issueHandler } from './issue';
 
 const mockAuthor = createMockGraphQLAuthor('issue-author');
 const mockCommenter = createMockGraphQLAuthor('issue-commenter');
 
 describe('renderer/utils/notifications/handlers/issue.ts', () => {
+  describe('mergeQueryConfig', () => {
+    it('should return the correct query and response fragments', () => {
+      const config = issueHandler.mergeQueryConfig();
+
+      expect(config).toBeDefined();
+      expect(config.queryFragment).toBe(IssueMergeQueryFragmentDoc);
+      expect(config.responseFragment).toBe(IssueDetailsFragmentDoc);
+    });
+  });
+
   describe('enrich', () => {
     let mockNotification: GitifyNotification;
 

src/renderer/utils/notifications/handlers/issue.ts

@@ -32,12 +32,7 @@ class IssueHandler extends DefaultHandler {
   mergeQueryConfig() {
     return {
       queryFragment: IssueMergeQueryFragmentDoc,
-
       responseFragment: IssueDetailsFragmentDoc,
-      extras: [
-        { name: 'lastComments', type: 'Int', defaultValue: 100 },
-        { name: 'firstLabels', type: 'Int', defaultValue: 100 },
-      ],
     } as GraphQLMergedQueryConfig;
   }
 

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

@@ -14,10 +14,12 @@ import {
   IconColor,
   type Link,
 } from '../../../types';
-import type {
-  PullRequestDetailsFragment,
-  PullRequestReviewState,
-  PullRequestState,
+import {
+  type PullRequestDetailsFragment,
+  PullRequestDetailsFragmentDoc,
+  PullRequestMergeQueryFragmentDoc,
+  type PullRequestReviewState,
+  type PullRequestState,
 } from '../../api/graphql/generated/graphql';
 import { getLatestReviewForReviewers, pullRequestHandler } from './pullRequest';
 
@@ -37,6 +39,16 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
     });
   });
 
+  describe('mergeQueryConfig', () => {
+    it('should return the correct query and response fragments', () => {
+      const config = pullRequestHandler.mergeQueryConfig();
+
+      expect(config).toBeDefined();
+      expect(config.queryFragment).toBe(PullRequestMergeQueryFragmentDoc);
+      expect(config.responseFragment).toBe(PullRequestDetailsFragmentDoc);
+    });
+  });
+
   describe('enrich', () => {
     beforeEach(() => {
       // axios will default to using the XHR adapter which can't be intercepted

src/renderer/utils/notifications/handlers/pullRequest.ts

@@ -36,12 +36,6 @@ class PullRequestHandler extends DefaultHandler {
     return {
       queryFragment: PullRequestMergeQueryFragmentDoc,
       responseFragment: PullRequestDetailsFragmentDoc,
-      extras: [
-        { name: 'firstLabels', type: 'Int', defaultValue: 100 },
-        { name: 'lastComments', type: 'Int', defaultValue: 100 },
-        { name: 'lastReviews', type: 'Int', defaultValue: 100 },
-        { name: 'firstClosingIssues', type: 'Int', defaultValue: 100 },
-      ],
     } as GraphQLMergedQueryConfig;
   }
 

src/renderer/utils/notifications/handlers/types.ts

@@ -14,11 +14,6 @@ import type { TypedDocumentString } from '../../api/graphql/generated/graphql';
 export type GraphQLMergedQueryConfig = {
   queryFragment: TypedDocumentString<unknown, unknown>;
   responseFragment: TypedDocumentString<unknown, unknown>;
-  extras: Array<{
-    name: string;
-    type: string;
-    defaultValue: number | boolean;
-  }>;
 };
 
 export interface NotificationTypeHandler<TFragment = unknown> {

src/renderer/utils/notifications/notifications.ts

@@ -22,6 +22,7 @@ import {
 } from '../api/graphql/utils';
 import { transformNotification } from '../api/transform';
 import { getNumberFromUrl } from '../api/utils';
+import { isAnsweredDiscussionFeatureSupported } from '../features';
 import { rendererLogError, rendererLogWarn } from '../logger';
 import {
   filterBaseNotifications,
@@ -185,7 +186,6 @@ export async function enrichNotifications(
       notification.subject.type === 'PullRequest';
 
     const alias = `node${index}`;
-    // const queryFragmentBody = getQueryFragmentBody(config.queryFragment) ?? '';
     const queryFragmentBody = getQueryFragmentBody(
       BatchMergedDetailsQueryFragmentDoc,
     );
@@ -245,12 +245,11 @@ export async function enrichNotifications(
     lastComments: 1,
     lastThreadedComments: 10,
     lastReplies: 10,
-    includeIsAnswered: true,
+    includeIsAnswered: isAnsweredDiscussionFeatureSupported(
+      notifications[0].account,
+    ),
     firstClosingIssues: 100,
     lastReviews: 100,
-    // FIXME includeIsAnswered: isAnsweredDiscussionFeatureSupported(
-    //   notification.account,
-    // ),
   };
 
   let mergedData: Record<string, unknown> | null = null;