fixes checkDuplicates to work with update controllers

SprintCV-S24 · Feb 28, 2024 · e6565b8 · e6565b8
1 parent 1e2adf2
commit e6565b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/controllers/activities.controller.ts b/src/controllers/activities.controller.ts
@@ -85,7 +85,7 @@ export const updateActivity = async (
       );
     }
 
-		if (await checkDuplicateItemName(activitiesFields.itemName)) {
+		if (await checkDuplicateItemName(activitiesFields.itemName, activityId)) {
       throw new HttpError(HttpStatus.BAD_REQUEST, "Duplicate item name");
     }
 

diff --git a/src/controllers/education.controller.ts b/src/controllers/education.controller.ts
@@ -82,7 +82,7 @@ export const updateEducation = async (
       );
     }
 
-		if (await checkDuplicateItemName(educationFields.itemName)) {
+		if (await checkDuplicateItemName(educationFields.itemName, educationId)) {
       throw new HttpError(HttpStatus.BAD_REQUEST, "Duplicate item name");
     }
 

diff --git a/src/utils/checkDuplicates.ts b/src/utils/checkDuplicates.ts
@@ -7,7 +7,7 @@ import { ProjectModel } from "../models/project.model";
 import { SectionHeadingModel } from "../models/sectionHeading.model";
 import { SkillsModel } from "../models/skills.model";
 
-export const checkDuplicateItemName = async (value: string): Promise<boolean> => {
+export const checkDuplicateItemName = async (value: string, excludedId: string | null = null): Promise<boolean> => {
   const field = "itemName";
   const models = [
     ActivitiesModel,
@@ -21,7 +21,7 @@ export const checkDuplicateItemName = async (value: string): Promise<boolean> =>
 
   // Check each model for the count of documents with the specified itemName value
   const checks = models.map((model) =>
-    model.countDocuments({ [field]: value }).exec(),
+    model.countDocuments({ [field]: value, '_id': { $ne: excludedId } }).exec(),
   );
 
   // Await all checks to resolve
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,7 @@ export const updateActivity = async ( @@
           );
         }
-    		if (await checkDuplicateItemName(activitiesFields.itemName)) {
+    		if (await checkDuplicateItemName(activitiesFields.itemName, activityId)) {
           throw new HttpError(HttpStatus.BAD_REQUEST, "Duplicate item name");
         }
@@ Expand Down @@