fix: Validators error messages not showing properly

implerhq · Sep 20, 2024 · 784b91e · 784b91e
1 parent 744fabe
commit 784b91e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts
@@ -193,10 +193,6 @@ export class BaseReview {
     let field: string;
 
     return errors.reduce((obj, error) => {
-      if (error.keyword === 'required') field = error.params.missingProperty;
-      else [, field] = error.instancePath.split('/');
-
-      field = field.replace(/~1/g, '/');
       if (!!uniqueCombinations[error.keyword]) {
         uniqueCombinations[error.keyword].forEach((columnKey) => {
           obj[columnKey] = this.getMessage({
@@ -208,7 +204,11 @@ export class BaseReview {
             validatorErrorMessages,
           });
         });
-      } else
+      } else {
+        if (error.keyword === 'required') field = error.params.missingProperty;
+        else [, , field] = error.instancePath.split('/');
+
+        field = field.replace(/~1/g, '/');
         obj[field] = this.getMessage({
           error,
           data: error.data,
@@ -217,6 +217,7 @@ export class BaseReview {
           uniqueCombinations,
           validatorErrorMessages,
         });
+      }
 
       return obj;
     }, {});

diff --git a/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts b/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts
@@ -69,7 +69,7 @@ export class DoReReview extends BaseReview {
     });
 
     const columns = JSON.parse(uploadInfo.customSchema) as ITemplateSchemaItem[];
-    const uniqueFieldsSet = new Set(...columns.filter((column) => column.isUnique).map((column) => column.key));
+    const uniqueFieldsSet = new Set(columns.filter((column) => column.isUnique).map((column) => column.key));
     const multiSelectColumnHeadings: Record<string, string> = {};
     const validatorErrorMessages = {};
     (columns as ITemplateSchemaItem[]).forEach((column) => {
@@ -205,6 +205,7 @@ export class DoReReview extends BaseReview {
     validator,
     dateFormats,
     uniqueCombinations,
+    validatorErrorMessages,
     multiSelectColumnHeadings,
   }: {
     uploadId: string;
@@ -231,6 +232,7 @@ export class DoReReview extends BaseReview {
         dateFormats,
         uniqueCombinations,
         index: record.index,
+        validatorErrorMessages,
         passRecord: record.record,
       });
       response.totalRecords++;