Update prod (#463)

* chore: added try-catch for sending report (#457)

* chore: added try-catch for sending report

* added res log

* chore(license): adopt BSL 1.1 (#460)

* chore: update license to BUSL-1.1 in package.json and README.md

* chore: update licensed work reference in LICENSE file

* imp(): get rid of duplicated releases (#462)

* imp(): get rid of duplicated releases

* chore(): eslint fix

* fix(grouper): skip notifications for muted errors (#459)

* feat(grouper): add event ignored check before notifying worker

* Implemented a new method to check if an event is marked as ignored.
* Updated the notifier task addition to only proceed if the event is not ignored.

* Removed the isEventIgnored method as its functionality is now integrated directly into the task addition logic.

* Removed unnecessary line break

* update @hawk.so/types dependency to version 0.1.35

* add tests for event marks handling in NotifierWorker

* fix

---------

Co-authored-by: Vyacheslav Chernyshev <81693471+slaveeks@users.noreply.github.com>
Co-authored-by: Dobrunia Kostrigin <48620984+Dobrunia@users.noreply.github.com>
Co-authored-by: e11sy <130844513+e11sy@users.noreply.github.com>

Author: 4 people

package.json

@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "@hawk.so/nodejs": "^3.1.1",
-        "@hawk.so/types": "^0.1.32",
+        "@hawk.so/types": "^0.1.35",
         "@types/amqplib": "^0.8.2",
         "@types/jest": "^29.2.3",
         "@types/mongodb": "^3.5.15",

workers/grouper/src/index.ts

@@ -223,20 +223,30 @@ export default class GrouperWorker extends Worker {
     /**
      * Store events counter by days
      */
-    await this.saveDailyEvents(task.projectId, uniqueEventHash, task.timestamp, repetitionId, incrementDailyAffectedUsers);
+    await this.saveDailyEvents(
+      task.projectId,
+      uniqueEventHash,
+      task.timestamp,
+      repetitionId,
+      incrementDailyAffectedUsers
+    );
 
     /**
-     * Add task for NotifierWorker
+     * Add task for NotifierWorker only if event is not ignored
      */
     if (process.env.IS_NOTIFIER_WORKER_ENABLED) {
-      await this.addTask(WorkerNames.NOTIFIER, {
-        projectId: task.projectId,
-        event: {
-          title: task.payload.title,
-          groupHash: uniqueEventHash,
-          isNew: isFirstOccurrence,
-        },
-      });
+      const isIgnored = isFirstOccurrence ? false : !!existedEvent?.marks?.ignored;
+
+      if (!isIgnored) {
+        await this.addTask(WorkerNames.NOTIFIER, {
+          projectId: task.projectId,
+          event: {
+            title: task.payload.title,
+            groupHash: uniqueEventHash,
+            isNew: isFirstOccurrence,
+          },
+        });
+      }
     }
   }
 

workers/grouper/tests/index.test.ts

@@ -589,6 +589,78 @@ describe('GrouperWorker', () => {
     });
   });
 
+  describe('Event marks handling', () => {
+    describe('Ignored events', () => {
+      it('should not add task for NotifierWorker when event is marked as ignored', async () => {
+        const mockAddTask = jest
+          .spyOn(worker as any, 'addTask')
+          .mockImplementation(() => Promise.resolve());
+
+        // Create an event first
+        const firstTask = generateTask({ title: 'Test ignored event' });
+        await worker.handle(firstTask);
+
+        // Mark the event as ignored by updating it in database
+        const eventHash = await (worker as any).getUniqueEventHash(firstTask);
+        await eventsCollection.updateOne(
+          { groupHash: eventHash },
+          { $set: { marks: { ignored: true } } }
+        );
+
+        // Handle the same event again (repetition)
+        const secondTask = generateTask({ title: 'Test ignored event' });
+        await worker.handle(secondTask);
+
+        // Verify that addTask was called only once (for the first occurrence)
+        expect(mockAddTask).toHaveBeenCalledTimes(1);
+
+        mockAddTask.mockRestore();
+      });
+
+      it('should add task for NotifierWorker when event is not marked as ignored', async () => {
+        const mockAddTask = jest
+          .spyOn(worker as any, 'addTask')
+          .mockImplementation(() => Promise.resolve());
+
+        // Create an event first
+        const firstTask = generateTask({ title: 'Test non-ignored event' });
+        await worker.handle(firstTask);
+
+        // Handle the same event again (repetition) - without marking as ignored
+        const secondTask = generateTask({ title: 'Test non-ignored event' });
+        await worker.handle(secondTask);
+
+        // Verify that addTask was called twice (for both occurrences)
+        expect(mockAddTask).toHaveBeenCalledTimes(2);
+
+        mockAddTask.mockRestore();
+      });
+
+      it('should add task for NotifierWorker for first occurrence even if marks field is undefined', async () => {
+        const mockAddTask = jest
+          .spyOn(worker as any, 'addTask')
+          .mockImplementation(() => Promise.resolve());
+
+        // Create a new event (first occurrence)
+        const task = generateTask({ title: 'Test new event without marks' });
+        await worker.handle(task);
+
+        // Verify that addTask was called for the first occurrence
+        expect(mockAddTask).toHaveBeenCalledTimes(1);
+        expect(mockAddTask).toHaveBeenCalledWith('notifier', {
+          projectId: task.projectId,
+          event: {
+            title: task.payload.title,
+            groupHash: expect.any(String),
+            isNew: true,
+          },
+        });
+
+        mockAddTask.mockRestore();
+      });
+    });
+  });
+
   afterAll(async () => {
     await redisClient.quit();
     await worker.finish();

yarn.lock

@@ -428,10 +428,10 @@
   dependencies:
     "@types/mongodb" "^3.5.34"
 
-"@hawk.so/types@^0.1.32":
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.32.tgz#5eb662e91da922e1cbab7af0cf03bfa567ee98df"
-  integrity sha512-7gdx/fq31iLxmc0hZKs+wPYqtRT4rLvTi9p4am2My9SQ4t/l8if5QEfxh6G4WABKOmhiZLchivFA9Oj+Nn5EcQ==
+"@hawk.so/types@^0.1.35":
+  version "0.1.35"
+  resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.35.tgz#6afd416dced1cc3282d721ca5621bf452b27aea1"
+  integrity sha512-uMTAeu6DlRlk+oputJBjTlrm1GzOkIwlMfGhpdOp3sRWe/YPGD6nMYlb9MZoVN6Yee7RIpYD7It+DPeUPAyIFw==
   dependencies:
     "@types/mongodb" "^3.5.34"