rez_core 4.0.292 → 4.0.295

package/package.json

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

package/src/module/entity_json/entity_json.module.ts

@@ -9,9 +9,14 @@ import { EntityJson } from './entity/entityJson.entity';
 import { EntityJSONRepository } from './service/entityJson.repository';
 
 @Module({
-  imports: [EntityModule, TypeOrmModule.forFeature([EntityJson]),FilterModule,UtilsModule],
+  imports: [
+    EntityModule,
+    TypeOrmModule.forFeature([EntityJson]),
+    FilterModule,
+    UtilsModule,
+  ],
   controllers: [EntityJSONController],
-  providers: [EntityJSONService,EntityJSONRepository],
+  providers: [EntityJSONService, EntityJSONRepository],
   exports: [],
 })
 export class EntityJSONModule {}

package/src/module/linked_attributes/controller/linked_attributes.controller.ts

@@ -29,6 +29,9 @@ export class LinkedAttributesController {
   @UseGuards(JwtAuthGuard)
   async upsertLinkedAttributes(@Req() req: any, @Body() payload: any) {
     const loggedInUser = req.user?.userData;
-    return this.linkedAttributesService.upsert(payload, loggedInUser);
+    return this.linkedAttributesService.upsertLinkedAttributes(
+      payload,
+      loggedInUser,
+    );
   }
 }

package/src/module/linked_attributes/service/linked_attributes.service.ts

@@ -15,7 +15,7 @@ export class LinkedAttributesService extends EntityServiceImpl {
       payload.attribute_key = payload.field_name
         .trim()
         .toLowerCase()
-        .replace(/\s+/g, '_'); // replace spaces with underscore
+        .replace(/\s+/g, '_');
     }
 
     // Pass to base class create method
@@ -32,71 +32,44 @@ export class LinkedAttributesService extends EntityServiceImpl {
       .getMany();
   }
 
-  async upsert(payloadList: any[], loggedInUser: any) {
+  async upsertLinkedAttributes(payloadList: any[], loggedInUser: any) {
     const orgId = loggedInUser.organization_id;
-    const output: any[] = [];
 
-    for (const payload of payloadList) {
-      payload.organization_id = orgId;
-
-      // ------------------------------------
-      // UPDATE CASE
-      // ------------------------------------
-      if (payload.id) {
-        const existing = await this.dataSource
-          .getRepository(LinkedAttributes)
-          .createQueryBuilder('la')
-          .where('la.id = :id', { id: payload.id })
-          .andWhere('la.organization_id = :orgId', { orgId })
-          .getOne();
-
-        if (!existing) {
-          continue;
-        }
-
-        await this.dataSource
-          .createQueryBuilder()
-          .update(LinkedAttributes)
-          .set(payload)
-          .where('id = :id', { id: payload.id })
-          .andWhere('organization_id = :orgId', { orgId })
-          .execute();
-
-        // fetch updated object
-        const updated = await this.dataSource
-          .getRepository(LinkedAttributes)
-          .createQueryBuilder('la')
-          .where('la.id = :id', { id: payload.id })
-          .andWhere('la.organization_id = :orgId', { orgId })
-          .getOne();
-
-        output.push(updated);
-        continue;
-      }
-
-      // ------------------------------------
-      // CREATE CASE
-      // ------------------------------------
-      const insertResult = await this.dataSource
-        .createQueryBuilder()
-        .insert()
-        .into(LinkedAttributes)
-        .values(payload)
-        .execute();
-
-      const newId = insertResult.identifiers[0].id;
-
-      // fetch the created object
-      const created = await this.dataSource
-        .getRepository(LinkedAttributes)
-        .createQueryBuilder('la')
-        .where('la.id = :id', { id: newId })
-        .andWhere('la.organization_id = :orgId', { orgId })
-        .getOne();
-
-      output.push(created);
-    }
+    // Step 1: Delete all existing rows for this organization
+    await this.dataSource
+      .createQueryBuilder()
+      .delete()
+      .from(LinkedAttributes)
+      .where('organization_id = :orgId', { orgId })
+      .execute();
+
+    // Step 2: Normalize & prepare payloads
+    const newPayloads = payloadList.map((item) => ({
+      ...item,
+      organization_id: orgId,
+      attribute_key: item.attribute_key
+        ? item.attribute_key.trim().toLowerCase().replace(/\s+/g, '_')
+        : item.field_name.trim().toLowerCase().replace(/\s+/g, '_'),
+    }));
+
+    // Step 3: Bulk Insert
+    const insertResult = await this.dataSource
+      .createQueryBuilder()
+      .insert()
+      .into(LinkedAttributes)
+      .values(newPayloads)
+      .execute();
+
+    // Step 4: Return inserted list
+    const ids = insertResult.identifiers.map((i) => i.id);
+
+    const newlyCreated = await this.dataSource
+      .getRepository(LinkedAttributes)
+      .createQueryBuilder('la')
+      .where('la.id IN (:...ids)', { ids })
+      .andWhere('la.organization_id = :orgId', { orgId })
+      .getMany();
 
-    return output;
+    return newlyCreated;
   }
 }

package/src/module/listmaster/service/list-master.service.ts

@@ -87,6 +87,20 @@ export class ListMasterService {
       config.appcode != loggedInUser?.appcode &&
       !publicCall
     ) {
+      const client = this.factory.getClient(config.appcode);
+
+      if (!client) {
+        return;
+      }
+
+      const res = await firstValueFrom(
+        client.send('listmaster.getDropdownData', {
+          type,
+          loggedInUser,
+        }),
+      );
+
+      console.log(res, '-------------------');
       // Call internal API for appcode mismatch
       try {
         const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
@@ -443,12 +457,16 @@ export class ListMasterService {
     return await this.listMasterRepo.findAllItems(organizationId, search);
   }
 
-  async getDropDownData(entity_type: string,
-                        attribute_key: string,
-                        loggedInUser: UserData,
-                        body: Record<string, string>
-                        ) {
-    let entityMaster = await this.entityMasterService.getEntityData(entity_type, loggedInUser);
+  async getDropDownData(
+    entity_type: string,
+    attribute_key: string,
+    loggedInUser: UserData,
+    body: Record<string, string>,
+  ) {
+    let entityMaster = await this.entityMasterService.getEntityData(
+      entity_type,
+      loggedInUser,
+    );
     let appCode = entityMaster.appcode;
 
     const { inactiveIds, ...params } = body;
@@ -460,11 +478,12 @@ export class ListMasterService {
     const currentAppCode = this.configService.get<string>('appcode');
 
     if (currentAppCode === appCode || !currentAppCode) {
-      const entityAttribute =  await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(
-        entity_type,
-        attribute_key,
-        loggedInUser
-      );
+      const entityAttribute =
+        await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(
+          entity_type,
+          attribute_key,
+          loggedInUser,
+        );
 
       if (entityAttribute && entityAttribute.data_source_type) {
         const listMaster = await this.listMasterRepo.findByType(
@@ -514,7 +533,9 @@ export class ListMasterService {
             }
 
           default:
-            throw new BadRequestException(`Unknown source: ${listMaster.source}`);
+            throw new BadRequestException(
+              `Unknown source: ${listMaster.source}`,
+            );
         }
       }
     } else {
@@ -524,12 +545,14 @@ export class ListMasterService {
         return;
       }
 
-      return client.send('getDropdownData', {
-        entity_type,
-        attribute_key,
-        loggedInUser,
-        body,
-      }).toPromise();
+      return client
+        .send('getDropdownData', {
+          entity_type,
+          attribute_key,
+          loggedInUser,
+          body,
+        })
+        .toPromise();
     }
   }
 }