rez_core 2.2.126 → 2.2.128

package/package.json

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

package/src/config/database.config.ts

@@ -15,7 +15,7 @@ export class MySqlConfiguration implements TypeOrmOptionsFactory {
       password: this.configService.get('DB_PASS') || 'Rezolut@123',
       database: this.configService.get('DB_NAME') || 'core',
       entities: [__dirname + '/../module/**/*.entity.{ts,js}'],
-      synchronize: true,
+      synchronize: false,
       autoLoadEntities: true,
       poolSize: 5,
     };

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

@@ -235,16 +235,104 @@ export class MasterService {
       throw new Error(`No unique fields found for entityType: ${entityType}`);
     }
 
-    for (const row of sheetData) {
+    // for (const row of sheetData) {
+
+    //   if (row.parent_type && row.parent_id) {
+    //     await this.resolveParent(row);
+    //   }
+
+    //   for (const attr of attributes) {
+    //     console.log('inside for loop attr');
+    //     if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
+    //       console.log('inside if condition');
+
+    //       const refEntity = await this.entityMasterService.getEntityData(
+    //         attr.datasource_list,
+    //         loggedInUser,
+    //       );
+    //       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]}`,
+    //         );
+    //       }
+
+    //       row[attr.attribute_key] = refData[0].id;
+    //     }
+    //   }
+    // }
+
+    // const errors: any[] = [];
+
+    // for (let i = 0; i < sheetData.length; i++) {
+    //   const row = sheetData[i];
+
+    //   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]) {
+    //       const refEntity = await this.entityMasterService.getEntityData(
+    //         attr.datasource_list,
+    //         loggedInUser,
+    //       );
+    //       const refData = await this.entityManager.query(
+    //         `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
+    //         [row[attr.attribute_key]],
+    //       );
+    //       if (!refData.length) {
+    //         throw new Error(
+    //           `Reference entity not found for code: ${row[attr.attribute_key]}`,
+    //         );
+    //       }
+    //       row[attr.attribute_key] = refData[0].id;
+    //     }
+    //   }
+
+    //   const rowErrors = await this.entityValidationService.validateEntityData(
+    //     row,
+    //     entityMaster,
+    //     loggedInUser,
+    //   );
+
+    //   if (rowErrors && rowErrors.length > 0) {
+    //     errors.push({
+    //       row: i + 1,
+    //       errors: rowErrors,
+    //     });
+    //   }
+    // }
+
+    // await this.upsertViaService(
+    //   entityType,
+    //   sheetData,
+    //   attributes,
+    //   uniqueFields,
+    //   loggedInUser,
+    //   duplicateHandling,
+    // );
+
+    // return { message: 'Entity data uploaded successfully' };
+    const errors: any[] = [];
+
+    // ✅ Iterate row by row
+    for (let i = 0; i < sheetData.length; i++) {
+      const row = sheetData[i];
+
       if (row.parent_type && row.parent_id) {
         await this.resolveParent(row);
       }
 
+      // handle reference entity replacement
       for (const attr of attributes) {
-        console.log('inside for loop attr');
         if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
-          console.log('inside if condition');
-
           const refEntity = await this.entityMasterService.getEntityData(
             attr.datasource_list,
             loggedInUser,
@@ -254,19 +342,39 @@ export class MasterService {
             [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]}`,
-            );
+            errors.push({
+              row: i + 1,
+              errors: [
+                `Reference entity not found for code: ${row[attr.attribute_key]}`,
+              ],
+            });
+            continue; // skip further processing for this row
           }
 
+          // replace with reference id
           row[attr.attribute_key] = refData[0].id;
         }
       }
+
+      // ✅ validate single row
+      const rowErrors = await this.entityValidationService.validateEntityData(
+        row,
+        entityMaster,
+        loggedInUser,
+      );
+
+      if (rowErrors.length > 0) {
+        errors.push({ row: i + 1, errors: rowErrors });
+      }
     }
 
+    // ✅ if any row failed, return errors instead of inserting
+    if (errors.length > 0) {
+      return { message: 'Validation errors found', errors };
+    }
+
+    // ✅ only upsert if no validation errors
     await this.upsertViaService(
       entityType,
       sheetData,
@@ -357,6 +465,7 @@ export class MasterService {
       }
     }
   }
+
   async upsertViaService(
     entityType: string,
     data: any[],

package/src/module/meta/controller/entity-dynamic.controller.ts

@@ -96,4 +96,16 @@ export class EntityDynamicController {
 
     return entity;
   }
+
+  @Get('getDropdownList')
+  async getAttributesDropdownList(
+    @Req() req: Request & { user: any },
+    @Query('appcode') appcode?: string,
+  ) {
+    let loggedInUser = req.user.userData;
+    return await this.entityDynamicService.getEntitiesDropdownList(
+      loggedInUser,
+      appcode,
+    );
+  }
 }

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

@@ -575,4 +575,24 @@ export class EntityDynamicService {
     const result = await this.dataSource.query(deleteQuery, [id]);
     return result;
   }
+
+  // -----------------------------
+
+  async getEntitiesDropdownList(
+    loggedInUser: any,
+    appcode?: string,
+  ): Promise<any> {
+    const organizationId = loggedInUser.organization_id;
+
+    let query = `SELECT name as label,mapped_entity_type as value FROM cr_entity_master WHERE organization_id = ?`;
+    let params = [organizationId];
+
+    if (appcode) {
+      query += ` AND appcode = ?`;
+      params.push(appcode);
+    }
+
+    const dropdown = await this.dataSource.query(query, params);
+    return dropdown;
+  }
 }