rez_core 4.0.222 → 4.0.225

package/package.json

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

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

@@ -103,7 +103,6 @@ export class EntityJSONService extends EntityServiceImpl {
         'attr.id',
         'attr.name',
         'attr.attribute_key',
-        'fla.saved_filter_code',
       ])
       .where('attr.organization_id = :orgId', { orgId })
       .getRawMany();
@@ -212,33 +211,27 @@ export class EntityJSONService extends EntityServiceImpl {
     }
   
     // 5. Merge linked attributes using saved filters
-// 5. Merge linked attributes using saved filters
-for (const linkAttr of safeAttributes.linkedAttributes) {
-  const childEntityType = linkAttr.fla_applicable_entity_type;
-  const childAttributeKey = linkAttr.attr_attribute_key;
-
-  if (!childEntityType || !childAttributeKey) continue;
-
-  // mappingValue can come from mainData or relatedData if you have parent key
-  const mappingValue = mainData?.[childAttributeKey] ?? null;
-
-  const value = await this.applyLinkedFilterUsingSavedFilter(
-    childEntityType,
-    linkAttr.fla_saved_filter_code,   // make sure this column exists in your query
-    childAttributeKey,
-    mappingValue,
-    childAttributeKey, // target attribute in flatJson
-    loggedInUser,
-    entityId
-  );
-
-  if (value !== null && value !== undefined) {
-    // Use attrMap if flat_json_key exists
-    const flatKey = attrMap[childAttributeKey] || childAttributeKey;
-    flatJson[flatKey] = value;
-  }
-}
-
+    for (const linkAttr of safeAttributes.linkedAttributes) {
+      if (!linkAttr.applicable_entity_type || !linkAttr.applicable_attribute_key) continue;
+  
+      const mappingValue = mainData?.[linkAttr.parent_attribute_key || ''] ?? null;
+      const value = await this.applyLinkedFilterUsingSavedFilter(
+        linkAttr.applicable_entity_type,
+        linkAttr.saved_filter_code,
+        linkAttr.applicable_attribute_key,
+        mappingValue,
+        linkAttr.target_attribute_key || linkAttr.applicable_attribute_key,
+        loggedInUser,
+        entityId,
+      );
+  
+      if (value !== null && value !== undefined) {
+        const flatKey = attrMap[linkAttr.target_attribute_key || linkAttr.applicable_attribute_key]
+          || (linkAttr.target_attribute_key || linkAttr.applicable_attribute_key);
+        flatJson[flatKey] = value;
+      }
+    }
+  
     // 6. Save JSON
     await this.dataSource.query(
       `INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)

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

@@ -1,4 +1,12 @@
-import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Inject,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
 import { LinkedAttributesService } from '../service/linked_attributes.service';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
@@ -16,4 +24,11 @@ export class LinkedAttributesController {
 
     return this.linkedAttributesService.getAllLinkedAttributes(loggedInUser);
   }
+
+  @Post('upsert')
+  @UseGuards(JwtAuthGuard)
+  async upsertLinkedAttributes(@Req() req: any, @Body() payload: any) {
+    const loggedInUser = req.user?.userData;
+    return this.linkedAttributesService.upsert(payload, loggedInUser);
+  }
 }

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

@@ -31,4 +31,72 @@ export class LinkedAttributesService extends EntityServiceImpl {
       .where('fla.organization_id = :orgId', { orgId })
       .getMany();
   }
+
+  async upsert(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);
+    }
+
+    return output;
+  }
 }