fix(): fix new pattern validation

Author: e11sy

src/models/project.ts

@@ -315,22 +315,6 @@ export default class ProjectModel extends AbstractModel<ProjectDBScheme> impleme
     return udpatedPattern;
   }
 
-  /**
-   * Method that gets all patterns for project
-   * @returns - list of patterns related to the current project
-   */
-  public async getProjectPatterns(): Promise<ProjectEventGroupingPatternsDBScheme[]> {
-    const project = await this.collection.findOne({
-      _id: this._id,
-    });
-
-    if (!project) {
-      throw new Error('Project with such id does not exist');
-    }
-
-    return project.eventGroupingPatterns ?? [];
-  }
-
   /**
    * Method that removes pattern by its id
    * @param payload - object that contains id of the pattern to be removed

src/resolvers/projectPatterns.ts

@@ -41,11 +41,38 @@ interface UpdateProjectPatternMutationPayload {
  * Type that represents payload for remove project pattern mutation
  */
 interface RemoveProjectPatternMutationPayload {
+  /**
+   * Id of the pattern to be removed
+   */
   id: string;
 
+  /**
+   * Id of the project to remove pattern
+   */
   projectId: string;
 }
 
+/**
+ * Validates a new event grouping pattern against existing patterns
+ * 
+ * @param newEventGroupingPattern - The new pattern to validate
+ * @param existingEventGroupingPatternList - List of existing patterns to check against
+ * @throws Error if pattern is invalid or collides with existing patterns
+ */
+function validateNewEventGroupingPattern(
+  newEventGroupingPattern: string
+): void {
+  /**
+   * Check if pattern is valid RegExp
+   */
+  try {
+    new RegExp(newEventGroupingPattern);
+  } catch (error) {
+    throw new ApolloError('Invalid regular expression pattern');
+  }
+}
+
+
 export default {
   Mutation: {
     /**
@@ -66,13 +93,7 @@ export default {
         throw new ApolloError('No project with such id');
       }
 
-      const existingPatterns = await project.getProjectPatterns();
-
-      existingPatterns.forEach(pattern => {
-        if (pattern.pattern.match(new RegExp(input.pattern)) || input.pattern.match(new RegExp(pattern.pattern))) {
-          throw new ApolloError('New pattern collides with existing one');
-        }
-      });
+      validateNewEventGroupingPattern(input.pattern);
 
       return project.createProjectEventGroupingPattern({ pattern: input.pattern });
     },
@@ -95,15 +116,7 @@ export default {
         throw new ApolloError('No project with such id');
       }
 
-      const existingPatterns = await project.getProjectPatterns();
-
-      existingPatterns.forEach(pattern => {
-        if (pattern._id.toString() !== input.id) {
-          if (pattern.pattern.match(new RegExp(input.pattern)) || input.pattern.match(new RegExp(pattern.pattern))) {
-            throw new ApolloError('New pattern collides with existing one');
-          }
-        }
-      });
+      validateNewEventGroupingPattern(input.pattern);
 
       return project.updateProjectEventGroupingPattern(input);
     },