rez_core 3.1.56 → 3.1.58

package/package.json

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

package/src/module/mapper/controller/field-mapper.controller.ts

@@ -48,4 +48,9 @@ export class FieldMapperController {
   async getFieldsByMapper(@Param('mapperId') mapperId: number) {
     return this.fieldMapperService.getMapperFields(mapperId);
   }
+
+  @Get('getLovs/:mapperFieldId')
+  async getLovsByMapperField(@Param('mapperFieldId') mapperFieldId: number) {
+    return this.fieldMapperService.getFieldLovs(mapperFieldId);
+  }
 }

package/src/module/mapper/dto/field-mapper.dto.ts

@@ -2,14 +2,13 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { FieldLovMapper } from '../entity/field-lovs.entity';
 
 export class FieldMapperDto extends BaseEntity {
-  mapper_id: string;
   action: string;
+  mapper_id: number;
   source_attribute: string;
-  destination_attribute: string;
-  destination_entity_type: string;
+  attribute_key: string;
+  mapper_entity_type: string;
   mapped_entity_type: string;
   filter_code?: string;
-  filter_json?: any;
   field_lovs?: FieldLovMapper[];
 }
 

package/src/module/mapper/repository/field-lovs.repository.ts

@@ -23,4 +23,10 @@ export class FieldLovsRepository {
       where: { mapper_field_id, destination_attribute_value },
     })
   }
+
+  async findByMapperFieldId(mapper_field_id: number) {
+    return await this.fieldLovMapperRepository.find({
+      where: { mapper_field_id },
+    })
+  }
 }

package/src/module/mapper/service/field-mapper.service.ts

@@ -1,9 +1,8 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldMapperDto } from '../dto/field-mapper.dto';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { UserData } from '../../user/entity/user.entity';
-import { SavedFilterService } from '../../filter/service/saved-filter.service';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
 import { DataSource } from 'typeorm';
 import { FilterService } from 'src/module/filter/service/filter.service';
@@ -13,8 +12,6 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 export class FieldMapperService extends EntityServiceImpl {
   constructor(
     private readonly fieldMapperRepository: FieldMapperRepository,
-    @Inject('SavedFilterService')
-    private readonly savedFilterService: SavedFilterService,
     private readonly fieldLovsRepository: FieldLovsRepository,
     private readonly datasource: DataSource,
     private readonly filterService: FilterService,
@@ -23,20 +20,19 @@ export class FieldMapperService extends EntityServiceImpl {
   }
 
   async createEntity(dto: FieldMapperDto, loggedInUser: UserData) {
+    let savedEntity = await super.createEntity(dto, loggedInUser);
+
     if (dto.field_lovs) {
+      for (const lov of dto.field_lovs) {
+        lov.mapper_field_id = savedEntity.id;
+        lov.entity_type = 'FLOV';
+      }
       await this.fieldLovsRepository.saveBulk(dto.field_lovs);
     }
-    return super.createEntity(dto, loggedInUser);
+    return savedEntity;
   }
 
   async updateEntity(dto: FieldMapperDto, loggedInUser: UserData) {
-    if (dto.filter_json) {
-      const savedFilter = await this.savedFilterService.createEntity(
-        dto.filter_json,
-        loggedInUser,
-      );
-      dto.filter_code = savedFilter.code;
-    }
     return super.updateEntity(dto, loggedInUser);
   }
 
@@ -62,6 +58,10 @@ export class FieldMapperService extends EntityServiceImpl {
     return await this.fieldMapperRepository.findByMapperId(mapperId);
   }
 
+  async getFieldLovs(mapperFieldId: number) {
+    return await this.fieldLovsRepository.findByMapperFieldId(mapperFieldId);
+  }
+
   async resolveData(
     mapper_id: number,
     parent_type: string,
@@ -88,7 +88,7 @@ export class FieldMapperService extends EntityServiceImpl {
 
       // Case 1️⃣ direct mapping (no mapped_entity_type or equal)
       if (
-        !inMemory[entityType][filterCode] &&
+        !inMemory[entityType][filterCode] ||
         field.mapped_entity_type == field.mapper_entity_type
       ) {
         inMemory[entityType][filterCode] = await super.getResolvedEntityData(

package/src/module/workflow/entity/action-category.entity.ts

@@ -32,4 +32,7 @@ export class ActionCategory extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   mode: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  action_decorator: string;
 }

package/src/module/workflow-automation/entity/workflow-automation-action.entity.ts

@@ -16,10 +16,7 @@ export class WorkflowAutomationActionEntity extends BaseEntity {
   action_category_id: number;
 
   @Column({ type: 'json', nullable: true })
-  payload: JSON;
-
-  @Column({ type: 'varchar', nullable: true })
-  action_decorator: string;
+  payload: string;
 
   @Column({ type: 'varchar', nullable: true })
   entity_method: string;

package/src/module/workflow-automation/entity/workflow-automation.entity.ts

@@ -27,6 +27,9 @@ export class WorkflowAutomation extends BaseEntity {
   @Column({ type: 'varchar', nullable: true })
   trigger_type: string;
 
+  @Column({ type: 'varchar', nullable: true })
+  applicable_entity_type: string;
+
   @Column({ type: 'json', nullable: true })
   schedule: string;
 }

package/src/module/workflow-automation/service/workflow-automation-engine.service.ts

@@ -3,6 +3,7 @@ import { Injectable, Inject } from '@nestjs/common';
 import { WorkflowAutomationService } from './workflow-automation.service';
 import { FilterEvaluatorService } from '../../filter/service/filter-evaluator.service';
 import { Action } from '../interface/action.interface';
+import { DataSource } from 'typeorm';
 
 @Injectable()
 export class WorkflowAutomationEngineService {
@@ -12,6 +13,7 @@ export class WorkflowAutomationEngineService {
     @Inject('WorkflowAutomationService')
     private readonly wfService: WorkflowAutomationService,
     private readonly filterEvaluator: FilterEvaluatorService,
+    private readonly dataSource: DataSource,
   ) {}
 
   registerAction(actionName: string, actionInstance: Action) {
@@ -90,24 +92,57 @@ export class WorkflowAutomationEngineService {
     entity: any,
     user: any,
   ) {
-    // Load actions for this rule from DB
+    // 1️ Get actions from workflow automation
     const actions = await this.wfService.getActionsForRule(
       workflow_automation_id,
     );
 
+    if (!actions.length) {
+      console.log(`No actions found for workflow ${workflow_automation_id}`);
+      return;
+    }
+
     for (const action of actions) {
-      const impl = this.actions.get(String(action.action_decorator)); // action_code = registered name
-      if (!impl) {
-        console.warn(
-          `⚠️ No implementation found for action: ${action.action_decorator}`,
+      try {
+        // 2 Resolve action_decorator using action_category_id
+        const [category] = await this.dataSource.query(
+          `SELECT action_decorator FROM cr_wf_action_category WHERE id = ?`,
+          [action.action_category_id],
         );
-        continue;
-      }
 
-      console.log(
-        `🚀 Executing action ${action.action_decorator} for entity ${entity.id}`,
-      );
-      await impl.execute({ entity, user, config: action.payload });
+        if (!category?.action_decorator) {
+          console.warn(
+            `No action_decorator found for category_id=${action.action_category_id}`,
+          );
+          continue;
+        }
+
+        const decorator = String(category.action_decorator);
+
+        // 3️ Get implementation from the registered action map
+        const impl = this.actions.get(decorator);
+
+        if (!impl) {
+          console.warn(` No implementation found for action: ${decorator}`);
+          continue;
+        }
+
+        console.log(`Executing action ${decorator} for entity ${entity.id}`);
+
+        // 4️ Execute action with required context
+        await impl.execute({
+          entity,
+          user,
+          config: action.payload, // from cr_wf_action table
+        });
+
+        console.log(`Action ${decorator} executed successfully`);
+      } catch (err) {
+        console.error(
+          `Error executing action (category_id=${action.action_category_id}):`,
+          err,
+        );
+      }
     }
   }
 }

package/src/module/workflow-automation/service/workflow-automation.service.ts

@@ -7,6 +7,7 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { UserData } from 'src/module/user/entity/user.entity';
 import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
+import { app } from 'firebase-admin';
 
 @Injectable()
 export class WorkflowAutomationService extends EntityServiceImpl {
@@ -90,6 +91,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           filter_scope: 'RULE',
           organization_id: loggedInUser.organization_id,
           enterprise_id: loggedInUser.enterprise_id,
+          applicable_entity_type: workflow.applicable_entity_type,
         };
 
         if (workflow.condition_filter_code) {
@@ -128,6 +130,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       if (event.triggerType === 'on_schedule') {
         // just store JSON directly into schedule column
         workflow.schedule = event?.scheduleJson ?? null;
+          workflow.applicable_entity_type= workflow.applicable_entity_type,
         this.logger.log(
           `Stored schedule JSON for workflow ${workflow.id}: ${JSON.stringify(
             workflow.schedule,

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}