fix: lint

Author: Dobrunia

src/models/eventsFactory.js

@@ -95,7 +95,7 @@ class EventsFactory extends Factory {
 
   /**
    * Creates Event instance
-   * @param {ObjectId} projectId
+   * @param {ObjectId} projectId - project id
    */
   constructor(projectId) {
     super();
@@ -948,7 +948,7 @@ class EventsFactory extends Factory {
 
     return {
       updatedEventIds,
-      failedEventIds: [ ...new Set([ ...failedEventIds, ...failedByUpdate ]) ],
+      failedEventIds: this._mergeFailedEventIds(failedEventIds, failedByUpdate),
     };
   }
 
@@ -1068,7 +1068,7 @@ class EventsFactory extends Factory {
 
     return {
       updatedEventIds,
-      failedEventIds: [ ...new Set([ ...failedEventIds, ...failedByUpdate ]) ],
+      failedEventIds: this._mergeFailedEventIds(failedEventIds, failedByUpdate),
     };
   }
 
@@ -1088,6 +1088,7 @@ class EventsFactory extends Factory {
 
     const normalizedAssignee = assignee ? String(assignee) : '';
     const docsToUpdate = found.filter(doc => String(doc.assignee || '') !== normalizedAssignee);
+
     if (docsToUpdate.length === 0) {
       return {
         updatedEventIds: [],
@@ -1132,7 +1133,7 @@ class EventsFactory extends Factory {
 
     return {
       updatedEventIds,
-      failedEventIds: [ ...new Set([ ...failedEventIds, ...failedByUpdate ]) ],
+      failedEventIds: this._mergeFailedEventIds(failedEventIds, failedByUpdate),
     };
   }
 
@@ -1207,6 +1208,23 @@ class EventsFactory extends Factory {
     };
   }
 
+  /**
+   * Merge two failed ids collections preserving uniqueness.
+   *
+   * @param {string[]} baseFailedEventIds - existing failed ids
+   * @param {string[]} extraFailedEventIds - failed ids collected from update results
+   * @returns {string[]}
+   */
+  _mergeFailedEventIds(baseFailedEventIds, extraFailedEventIds) {
+    const mergedFailedEventIds = new Set(baseFailedEventIds);
+
+    extraFailedEventIds.forEach((eventId) => {
+      mergedFailedEventIds.add(eventId);
+    });
+
+    return Array.from(mergedFailedEventIds);
+  }
+
   /**
    * Compose event with repetition
    *

src/resolvers/event.js

@@ -1,9 +1,7 @@
 const getEventsFactory = require('./helpers/eventsFactory').default;
 const {
   parseBulkEventIds,
-  withMergedInvalidEventIds,
   enqueueAssigneeNotification,
-  enqueueBulkAssigneeNotifications,
 } = require('./helpers/bulkEventUtils');
 const { aiService } = require('../services/ai');
 const { UserInputError } = require('apollo-server-express');
@@ -163,8 +161,12 @@ module.exports = {
 
       const factory = getEventsFactory(context, projectId);
       const result = await factory.bulkVisitEvents(validEventIds, user.id);
+      const failedEventIds = Array.from(new Set([...(result.failedEventIds || []), ...invalidEventIds]));
 
-      return withMergedInvalidEventIds(result, invalidEventIds);
+      return {
+        ...result,
+        failedEventIds,
+      };
     },
 
     /**
@@ -207,8 +209,12 @@ module.exports = {
 
       const factory = getEventsFactory(context, projectId);
       const result = await factory.bulkToggleEventMark(validEventIds, mark);
+      const failedEventIds = Array.from(new Set([...(result.failedEventIds || []), ...invalidEventIds]));
 
-      return withMergedInvalidEventIds(result, invalidEventIds);
+      return {
+        ...result,
+        failedEventIds,
+      };
     },
 
     /**
@@ -332,15 +338,20 @@ module.exports = {
       }
 
       const result = await factory.bulkUpdateAssignee(validEventIds, assignee);
-      const resultWithInvalid = withMergedInvalidEventIds(result, invalidEventIds);
+      const resultWithInvalid = {
+        ...result,
+        failedEventIds: Array.from(new Set([...(result.failedEventIds || []), ...invalidEventIds])),
+      };
 
       if (assignee && resultWithInvalid.updatedEventIds.length > 0) {
-        enqueueBulkAssigneeNotifications({
-          assigneeData,
-          assigneeId: assignee,
-          projectId,
-          whoAssignedId: user.id,
-          eventIds: resultWithInvalid.updatedEventIds,
+        resultWithInvalid.updatedEventIds.forEach((eventId) => {
+          enqueueAssigneeNotification({
+            assigneeData,
+            assigneeId: assignee,
+            projectId,
+            whoAssignedId: user.id,
+            eventId,
+          });
         });
       }
 

src/resolvers/helpers/bulkEventUtils.ts

@@ -7,7 +7,8 @@ import { SenderWorkerTaskType } from '../../types/userNotifications/task-type';
 /**
  * Validate and normalize bulk event ids from resolver input.
  *
- * @param eventIds - raw event ids from GraphQL input
+ * @param {string[]} eventIds - raw event ids from GraphQL input
+ * @returns {object} normalized ids grouped by validity
  */
 export function parseBulkEventIds(eventIds: string[]): { validEventIds: string[]; invalidEventIds: string[] } {
   if (!eventIds || !eventIds.length) {
@@ -32,26 +33,6 @@ export function parseBulkEventIds(eventIds: string[]): { validEventIds: string[]
   };
 }
 
-/**
- * Merge failed ids returned by factory with invalid ids from resolver validation.
- */
-export function mergeFailedEventIds(result: { failedEventIds?: string[] }, invalidEventIds: string[]): string[] {
-  return [ ...new Set([ ...(result.failedEventIds || []), ...invalidEventIds ]) ];
-}
-
-/**
- * Merge resolver-level invalid ids into factory-level failed ids.
- */
-export function withMergedInvalidEventIds<T extends { failedEventIds?: string[] }>(
-  result: T,
-  invalidEventIds: string[]
-): T & { failedEventIds: string[] } {
-  return {
-    ...result,
-    failedEventIds: mergeFailedEventIds(result, invalidEventIds),
-  };
-}
-
 type AssigneeNotificationParams = {
   assigneeData: UserDBScheme | null;
   assigneeId: string;
@@ -74,7 +55,7 @@ export function enqueueAssigneeNotification({
     return;
   }
 
-  void sendPersonalNotification(assigneeData, {
+  sendPersonalNotification(assigneeData, {
     type: SenderWorkerTaskType.Assignee,
     payload: {
       assigneeId,
@@ -86,24 +67,3 @@ export function enqueueAssigneeNotification({
     console.error('Failed to enqueue assignee notification', error);
   });
 }
-
-/**
- * Enqueue assignee notifications for all updated original events.
- */
-export function enqueueBulkAssigneeNotifications({
-  assigneeData,
-  assigneeId,
-  projectId,
-  whoAssignedId,
-  eventIds,
-}: Omit<AssigneeNotificationParams, 'eventId'> & { eventIds: string[] }): void {
-  eventIds.forEach((eventId) => {
-    enqueueAssigneeNotification({
-      assigneeData,
-      assigneeId,
-      projectId,
-      whoAssignedId,
-      eventId,
-    });
-  });
-}

test/resolvers/bulk-events-helper.test.ts

@@ -1,11 +1,7 @@
 import '../../src/env-test';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { parseBulkEventIds, mergeFailedEventIds } = require('../../src/resolvers/helpers/bulkEventUtils') as {
+const { parseBulkEventIds } = require('../../src/resolvers/helpers/bulkEventUtils') as {
   parseBulkEventIds: (eventIds: string[]) => { validEventIds: string[]; invalidEventIds: string[] };
-  mergeFailedEventIds: (
-    result: { failedEventIds?: string[] },
-    invalidEventIds: string[]
-  ) => string[];
 };
 
 describe('bulkEvents helper', () => {
@@ -21,15 +17,6 @@ describe('bulkEvents helper', () => {
     });
   });
 
-  it('should merge failed ids from factory and invalid resolver ids', () => {
-    const result = mergeFailedEventIds(
-      { failedEventIds: [ '507f1f77bcf86cd799439011' ] },
-      [ 'bad-id', '507f1f77bcf86cd799439011' ]
-    );
-
-    expect(result).toEqual([ '507f1f77bcf86cd799439011', 'bad-id' ]);
-  });
-
   it('should throw when eventIds is empty', () => {
     expect(() => parseBulkEventIds([])).toThrow('eventIds must contain at least one id');
   });