rez_core 2.2.128 → 2.2.130

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, 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';
@@ -220,7 +220,7 @@ export class MasterService {
 
     const attributes =
       await this.attributeMasterService.findAttributesByMappedEntityType(
-        entityType,
+        entityMaster.mapped_entity_type,
         loggedInUser,
       );
 
@@ -358,7 +358,7 @@ export class MasterService {
       }
 
       // ✅ validate single row
-      const rowErrors = await this.entityValidationService.validateEntityData(
+      const rowErrors = await this.entityValidationService.validateImportData(
         row,
         entityMaster,
         loggedInUser,
@@ -371,7 +371,10 @@ export class MasterService {
 
     // ✅ if any row failed, return errors instead of inserting
     if (errors.length > 0) {
-      return { message: 'Validation errors found', errors };
+      throw new BadRequestException({
+        message: 'Validation errors found',
+        errors,
+      });
     }
 
     // ✅ only upsert if no validation errors
@@ -528,24 +531,6 @@ 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);
       }
     }

package/src/module/meta/service/entity-validation.service.ts

@@ -134,10 +134,9 @@ export class EntityValidationService {
   ): Promise<ValidationError[]> {
     const attributes =
       await this.attributeMasterService.findAttributesByMappedEntityType(
-        entityData.entity_type,
+        entityMaster.mapped_entity_type,
         loggedInUser,
       );
-
     const requiredErrors = this.validateRequiredFields(entityData, attributes);
     const uniqueErrors = await this.validateUniqueFields(
       entityData,
@@ -163,6 +162,21 @@ export class EntityValidationService {
   //   const regexErros = await this.validateRegexFields(entityData, attributes);
   //   return [...requiredErrors, ...regexErros];
   // }
+  async validateImportData(
+    entityData: Record<string, any>,
+    entityMaster,
+    loggedInUser: any,
+  ): Promise<ValidationError[]> {
+    const attributes =
+      await this.attributeMasterService.findAttributesByMappedEntityType(
+        entityMaster.mapped_entity_type,
+        loggedInUser,
+      );
+    const requiredErrors = this.validateRequiredFields(entityData, attributes);
+    const regexErros = await this.validateRegexFields(entityData, attributes);
+    return [...requiredErrors, ...regexErros];
+  }
+
   private hasValidValue(value: any): boolean {
     if (value === null || value === undefined) return false;
     if (typeof value === 'string' && value.trim() === '') return false;

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}