rez_core 1.0.72 → 1.0.74

package/package.json

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

package/src/module/master/controller/master.controller.ts

@@ -1,5 +1,6 @@
 import {
   BadRequestException,
+  Body,
   Controller,
   Inject,
   Param,
@@ -46,13 +47,20 @@ export class MasterController {
 
   @Post('uploadEntity/:entityType')
   @UseInterceptors(FileInterceptor('file'))
-
-  async uploadEntityDataXls(@Param('entityType') entityType: string, @UploadedFile() file: Express.Multer.File,@Req() req: Request & { user: any }) {
+  async uploadEntityDataXls(
+    @Param('entityType') entityType: string,
+    @UploadedFile() file: Express.Multer.File,
+    @Req() req: Request & { user: any },
+    @Body('duplicateHandling') duplicateHandling: 'skip_duplicates' | 'overwrite_items',
+  ) {
     let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.id);
+    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER, requestedUser.id);
+  
     if (!file) {
       throw new BadRequestException('File is required');
     }
-    return await this.masterService.uploadEntityData(file.buffer,entityType,loggedInUser);
+  
+    return await this.masterService.uploadEntityData(file.buffer, entityType, loggedInUser, duplicateHandling);
   }
+  
 }

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

@@ -134,7 +134,7 @@ export class MasterService {
     };
   }
 
-  async uploadEntityData(file, entityType, loggedInUser) {
+  async uploadEntityData(file, entityType, loggedInUser, duplicateHandling: 'skip_duplicates' | 'overwrite_items') {
     const data = ExcelUtil.readExcel(file.buffer);
     const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
     if (!entityMaster) {
@@ -143,22 +143,17 @@ export class MasterService {
   
     const tableName = entityMaster.db_table_name;
     const sheetData = data[tableName];
-  
     if (!sheetData) {
       throw new Error(`Sheet for ${tableName} not found in uploaded file`);
     }
   
     const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityType);
-  
-    const uniqueFields = attributes
-      .filter(attr => attr.is_unique)
-      .map(attr => attr.attribute_key);
+    const uniqueFields = attributes.filter(attr => attr.is_unique).map(attr => attr.attribute_key);
   
     if (uniqueFields.length === 0) {
       throw new Error(`No unique fields found for entityType: ${entityType}`);
     }
   
-    // Transform reference fields
     for (const row of sheetData) {
       if (row.parent_type && row.parent_id) {
         await this.resolveParent(row);
@@ -181,11 +176,12 @@ export class MasterService {
       }
     }
   
-    await this.upsertViaService(entityType, sheetData, attributes, uniqueFields, loggedInUser);
+    await this.upsertViaService(entityType, sheetData, attributes, uniqueFields, loggedInUser, duplicateHandling);
   
     return { message: 'Entity data uploaded successfully' };
   }
   
+  
 
   private isMetaSheet(sheetName: string): boolean {
     return this.metaSheets.includes(sheetName.toLowerCase());
@@ -265,45 +261,57 @@ export class MasterService {
       }
     }
   }
-
   async upsertViaService(
     entityType: string,
     data: any[],
     attributes: any[],
     uniqueFields: string[],
     loggedInUser: any,
+    duplicateHandling: 'skip_duplicates' | 'overwrite_items',
   ): Promise<void> {
     const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
     if (!entityMaster) throw new Error(`Entity master not found for ${entityType}`);
   
     const serviceName = entityMaster.entity_service;
     const entityService = await this.reflectionHelper.getBean<EntityServiceImpl>(serviceName);
-  
     if (!entityService) throw new Error(`Entity service not found for ${entityType}`);
   
     for (const row of data) {
-      const whereClause = uniqueFields.reduce((acc, field) => {
-        acc[field] = row[field];
-        return acc;
-      }, {});
-  
-      const existing = await this.entityManager
+      const qb = this.entityManager
         .createQueryBuilder()
         .select('*')
-        .from(entityMaster.db_table_name, entityMaster.db_table_name)
-        .where(whereClause)
-        .limit(1)
-        .getRawOne();
+        .from(entityMaster.db_table_name, entityMaster.db_table_name);
+  
+      // Build OR conditions dynamically for unique fields
+      uniqueFields.forEach((field, index) => {
+        const condition = `${entityMaster.db_table_name}.${field} = :val${index}`;
+        const param = { [`val${index}`]: row[field] };
+  
+        if (index === 0) {
+          qb.where(condition, param);
+        } else {
+          qb.orWhere(condition, param);
+        }
+      });
+  
+      const existing = await qb.limit(1).getRawOne();
   
       row.entity_type = entityType;
+  
       if (existing) {
-        row.id = existing.id;
-        await entityService.updateEntity(row, loggedInUser);
+        if (duplicateHandling === 'skip_duplicates') {
+          continue; // Skip this row
+        } else if (duplicateHandling === 'overwrite_items') {
+          row.id = existing.id;
+          await entityService.updateEntity(row, loggedInUser);
+        }
       } else {
         await entityService.createEntity(row, loggedInUser);
       }
     }
   }
   
+  
+  
 
 }