rez_core 1.0.73 → 1.0.74

package/package.json

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

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

@@ -261,7 +261,6 @@ export class MasterService {
       }
     }
   }
-
   async upsertViaService(
     entityType: string,
     data: any[],
@@ -278,18 +277,24 @@ export class MasterService {
     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;
   
@@ -307,5 +312,6 @@ export class MasterService {
   }
   
   
+  
 
 }