fix: grouping patterns

Author: e11sy

workers/grouper/src/index.ts

@@ -6,7 +6,7 @@ import { Worker } from '../../../lib/worker';
 import * as WorkerNames from '../../../lib/workerNames';
 import * as pkg from '../package.json';
 import type { GroupWorkerTask, RepetitionDelta } from '../types/group-worker-task';
-import type { EventAddons, EventDataAccepted, GroupedEventDBScheme, BacktraceFrame, SourceCodeLine } from '@hawk.so/types';
+import type { EventAddons, EventDataAccepted, GroupedEventDBScheme, BacktraceFrame, SourceCodeLine, ProjectEventGroupingPatternsDBScheme } from '@hawk.so/types';
 import type { RepetitionDBScheme } from '../types/repetition';
 import { DatabaseReadWriteError, DiffCalculationError, ValidationError } from '../../../lib/workerErrors';
 import { decodeUnsafeFields, encodeUnsafeFields } from '../../../lib/utils/unsafeFields';
@@ -317,11 +317,11 @@ export default class GrouperWorker extends Worker {
 
       if (matchingPattern !== null && matchingPattern !== undefined) {
         try {
-          const originalEvent = await this.cache.get(`${projectId}:${matchingPattern}:originalEvent`, async () => {
+          const originalEvent = await this.cache.get(`${projectId}:${matchingPattern._id}:originalEvent`, async () => {
             return await this.eventsDb.getConnection()
               .collection(`events:${projectId}`)
               .findOne(
-                { 'payload.title': { $regex: matchingPattern } },
+                { 'payload.title': { $regex: matchingPattern.pattern } },
                 { sort: { _id: 1 } }
               );
           });
@@ -345,15 +345,18 @@ export default class GrouperWorker extends Worker {
    *
    * @param patterns - list of the patterns of the related project
    * @param event - event which title would be cheched
-   * @returns {string | null} matched pattern or null if no match
+   * @returns {ProjectEventGroupingPatternsDBScheme | null} matched pattern object or null if no match
    */
-  private async findMatchingPattern(patterns: string[], event: EventDataAccepted<EventAddons>): Promise<string | null> {
+  private async findMatchingPattern(
+    patterns: ProjectEventGroupingPatternsDBScheme[],
+    event: EventDataAccepted<EventAddons>
+  ): Promise<ProjectEventGroupingPatternsDBScheme | null> {
     if (!patterns || patterns.length === 0) {
       return null;
     }
 
     return patterns.filter(pattern => {
-      const patternRegExp = new RegExp(pattern);
+      const patternRegExp = new RegExp(pattern.pattern);
 
       return event.title.match(patternRegExp);
     }).pop() || null;
@@ -363,9 +366,9 @@ export default class GrouperWorker extends Worker {
    * Method that gets event patterns for a project
    *
    * @param projectId - id of the project to find related event patterns
-   * @returns {string[]} EventPatterns object with projectId and list of patterns
+   * @returns {ProjectEventGroupingPatternsDBScheme[]} EventPatterns object with projectId and list of patterns
    */
-  private async getProjectPatterns(projectId: string): Promise<string[]> {
+  private async getProjectPatterns(projectId: string): Promise<ProjectEventGroupingPatternsDBScheme[]> {
     return this.cache.get(`project:${projectId}:patterns`, async () => {
       const project = await this.accountsDb.getConnection()
         .collection('projects')

workers/grouper/tests/index.test.ts

@@ -490,7 +490,9 @@ describe('GrouperWorker', () => {
       });
 
       test('should group events with titles matching one pattern', async () => {
-        jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([ 'New error .*' ]);
+        jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([ 
+          { _id: new mongodb.ObjectId, pattern: 'New error .*' }
+        ]);
         const findMatchingPatternSpy = jest.spyOn(GrouperWorker.prototype as any, 'findMatchingPattern');
 
         await worker.handle(generateTask({ title: 'New error 0000000000000000' }));
@@ -507,9 +509,9 @@ describe('GrouperWorker', () => {
 
       test('should handle multiple patterns and match the first one that applies', async () => {
         jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([
-          'Database error: .*',
-          'Network error: .*',
-          'New error: .*',
+          { _id: mongodb.ObjectId(), pattern: 'Database error: .*' },
+          { _id: mongodb.ObjectId(), pattern: 'Network error: .*' },
+          { _id: mongodb.ObjectId(), pattern: 'New error: .*' },
         ]);
 
         await worker.handle(generateTask({ title: 'Database error: connection failed' }));
@@ -526,8 +528,8 @@ describe('GrouperWorker', () => {
 
       test('should handle complex regex patterns', async () => {
         jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([
-          'Error \\d{3}: [A-Za-z\\s]+ in file .*\\.js$',
-          'Warning \\d{3}: .*',
+          { _id: mongodb.ObjectId(), pattern: 'Error \\d{3}: [A-Za-z\\s]+ in file .*\\.js$' },
+          { _id: mongodb.ObjectId(), pattern: 'Warning \\d{3}: .*' },
         ]);
 
         await worker.handle(generateTask({ title: 'Error 404: Not Found in file index.js' }));
@@ -544,8 +546,8 @@ describe('GrouperWorker', () => {
 
       test('should maintain separate groups for different patterns', async () => {
         jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([
-          'TypeError: .*',
-          'ReferenceError: .*',
+          { _id: mongodb.ObjectId(), pattern: 'TypeError: .*' },
+          { _id: mongodb.ObjectId(), pattern: 'ReferenceError: .*' },
         ]);
 
         await worker.handle(generateTask({ title: 'TypeError: null is not an object' }));
@@ -566,8 +568,8 @@ describe('GrouperWorker', () => {
 
       test('should handle patterns with special regex characters', async () => {
         jest.spyOn(GrouperWorker.prototype as any, 'getProjectPatterns').mockResolvedValue([
-          'Error \\[\\d+\\]: .*',
-          'Warning \\(code=\\d+\\): .*',
+          { _id: new mongodb.ObjectID(), pattern: 'Error \\[\\d+\\]: .*'} ,
+          { _id: new mongodb.ObjectID(), pattern: 'Warning \\(code=\\d+\\): .*'} ,
         ]);
 
         await worker.handle(generateTask({ title: 'Error [123]: Database connection failed' }));