rez_core 1.0.99 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "1.0.99",
+  "version": "1.1.0",
   "description": "",
   "author": "",
   "private": false,

package/src/module/master/service/master.service.ts

@@ -257,17 +257,27 @@ export class MasterService {
               continue;
             }
 
+            const existingError = errors.find((e) => e.row === i + 1);
+
             if (refData[0].organization_id !== loggedInUser.organization_id) {
-              errors.push({
-                row: i + 1,
-                errors: [
-                  {
-                    field: attr.name,
-                    message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
-                  },
-                ],
-              });
-              continue;
+              if (existingError) {
+                existingError.errors.push({
+                  field: attr.name,
+                  message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
+                });
+                continue;
+              } else {
+                errors.push({
+                  row: i + 1,
+                  errors: [
+                    {
+                      field: attr.name,
+                      message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
+                    },
+                  ],
+                });
+                continue;
+              }
             }
 
             row[attr.attribute_key] = refData[0].id;
@@ -407,11 +417,17 @@ export class MasterService {
           entityMaster,
         );
 
+      const existingError = errors.find((e) => e.row === i + 1);
+
       if (rowErrors?.length > 0) {
-        errors.push({
-          row: i + 1,
-          errors: rowErrors,
-        });
+        if (existingError) {
+          existingError.errors.push(...rowErrors);
+        } else {
+          errors.push({
+            row: i + 1,
+            errors: rowErrors,
+          });
+        }
       }
     }
 
@@ -419,7 +435,7 @@ export class MasterService {
       throw new BadRequestException({
         status: false,
         message: `Validation errors found in the uploaded data.`,
-        details: errors,
+        error: errors,
       });
     }