rez_core 2.1.6 → 2.1.10

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { Brackets, EntityManager } from 'typeorm';
 import { ExcelUtil } from 'src/utils/service/excelUtil.service';
 import { EntityMasterService } from '../../meta/service/entity-master.service';
@@ -199,8 +199,6 @@ export class MasterService {
     loggedInUser,
     duplicateHandling: 'skip_duplicates' | 'overwrite_items',
   ) {
-    const errors: { row: number; errors: any[] }[] = [];
-
     const data = ExcelUtil.readExcel(file.buffer);
     const entityMaster =
       await this.entityMasterService.findByMappedEntityType(entityType);
@@ -218,7 +216,6 @@ export class MasterService {
       await this.attributeMasterService.findAttributesByMappedEntityType(
         entityType,
       );
-
     const uniqueFields = attributes
       .filter((attr) => attr.is_unique)
       .map((attr) => attr.attribute_key);
@@ -227,71 +224,30 @@ export class MasterService {
       throw new Error(`No unique fields found for entityType: ${entityType}`);
     }
 
-    for (const [i, row] of sheetData.entries()) {
+    for (const row of sheetData) {
       if (row.parent_type && row.parent_id) {
         await this.resolveParent(row);
       }
 
       for (const attr of attributes) {
         if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
-          try {
-            const refEntity = await this.entityMasterService.getEntityData(
-              attr.datasource_list,
-            );
-
-            const refData = await this.entityManager.query(
-              `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
-              [row[attr.attribute_key]],
+          const refEntity = await this.entityMasterService.getEntityData(
+            attr.datasource_list,
+          );
+          const refData = await this.entityManager.query(
+            `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
+            [row[attr.attribute_key]],
+          );
+
+          //you will check the org id of refData and loggedInUser.organization_id
+
+          if (!refData.length) {
+            throw new Error(
+              `Reference entity not found for code: ${row[attr.attribute_key]}`,
             );
-
-            if (!refData.length) {
-              errors.push({
-                row: i + 1,
-                errors: [
-                  {
-                    field: attr.name,
-                    message: `Reference entity not found for code: ${row[attr.attribute_key]}`,
-                  },
-                ],
-              });
-              continue;
-            }
-
-            const existingError = errors.find((e) => e.row === i + 1);
-
-            if (refData[0].organization_id !== loggedInUser.organization_id) {
-              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;
-          } catch (err) {
-            errors.push({
-              row: i + 1,
-              errors: [
-                {
-                  field: attr.name,
-                  message: `Error fetching reference entity for ${attr.attribute_key}`,
-                },
-              ],
-            });
           }
+
+          row[attr.attribute_key] = refData[0].id;
         }
       }
     }
@@ -303,7 +259,6 @@ export class MasterService {
       uniqueFields,
       loggedInUser,
       duplicateHandling,
-      errors,
     );
 
     return { message: 'Entity data uploaded successfully' };
@@ -394,7 +349,6 @@ export class MasterService {
     uniqueFields: string[],
     loggedInUser: any,
     duplicateHandling: 'skip_duplicates' | 'overwrite_items',
-    errors: { row: number; errors: any[] }[],
   ): Promise<void> {
     const entityMaster =
       await this.entityMasterService.findByMappedEntityType(entityType);
@@ -407,39 +361,13 @@ export class MasterService {
     if (!entityService)
       throw new Error(`Entity service not found for ${entityType}`);
 
+    const errors: { row: number; errors: any[] }[] = [];
+
     for (const [i, row] of data.entries()) {
       row.entity_type = entityType;
       row.organization_id = loggedInUser.organization_id;
 
-      const rowErrors = await this.entityValidationService.validateEntityData(
-        row,
-        entityMaster,
-        loggedInUser,
-      );
-
-      const existingError = errors.find((e) => e.row === i + 1);
-
-      if (rowErrors?.length > 0) {
-        if (existingError) {
-          existingError.errors.push(...rowErrors);
-        } else {
-          errors.push({
-            row: i + 1,
-            errors: rowErrors,
-          });
-        }
-      }
-    }
-
-    if (errors.length > 0) {
-      throw new BadRequestException({
-        status: false,
-        message: `Validation errors found in the uploaded data.`,
-        error: errors,
-      });
-    }
-
-    for (const row of data) {
+      // 🧠 Check if this already exists
       const qb = this.entityManager
         .createQueryBuilder()
         .select('*')
@@ -476,6 +404,24 @@ export class MasterService {
           await entityService.updateEntity(row, loggedInUser);
         }
       } else {
+        const rowErrors = await this.entityValidationService.validateEntityData(
+          row,
+          entityMaster,
+          loggedInUser,
+        );
+
+        if (rowErrors && rowErrors.length > 0) {
+          errors.push({
+            row: i + 1,
+            errors: rowErrors,
+          });
+        }
+
+        if (errors.length > 0) {
+          throw new Error(
+            `Validation errors found in the uploaded data: ${JSON.stringify(errors)}`,
+          );
+        }
         await entityService.createEntity(row, loggedInUser);
       }
     }