rez_core 4.0.55 → 4.0.56

package/package.json

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

package/src/module/meta/controller/entity.controller.ts

@@ -143,26 +143,29 @@ export class EntityController {
   ) {
     const loggedInUser = req.user.userData;
     const appcode = loggedInUser.appcode;
-  
+
     if (!entityType) {
-      throw new BadRequestException(`Query parameter "entity_type" is required`);
+      throw new BadRequestException(
+        `Query parameter "entity_type" is required`,
+      );
     }
-  
+
     const entityMaster = await this.entityMasterService.getEntityData(
       entityType,
       loggedInUser,
     );
-  
-    const entityService = await this.reflectionHelper.getBean<EntityServiceImpl>(
-      entityMaster.entity_service,
-    );
-  
+
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
+      );
+
     if (!entityService) {
       throw new InternalServerErrorException(
         `No service found for entity_type "${entityType}"`,
       );
     }
-  
+
     // ✅ Create
     const savedData = await entityService.createEntity(
       entityData,
@@ -170,7 +173,7 @@ export class EntityController {
       null,
       appcode,
     );
-  
+
     // ✅ Run workflow automation (no preUpdateStates for CREATE)
     await this.workflowAutomationEngineService.handleEntityEvent(
       entityType,
@@ -179,10 +182,10 @@ export class EntityController {
       loggedInUser,
       null,
     );
-  
+
     return savedData;
   }
-  
+
   @Post('update/:id')
   @HttpCode(200)
   async update(
@@ -192,26 +195,29 @@ export class EntityController {
     @Req() req: Request & { user: any },
   ) {
     const loggedInUser = req.user.userData;
-  
+
     if (!entityType) {
-      throw new BadRequestException('Query parameter "entity_type" is required');
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
     }
-  
+
     const entityMaster = await this.entityMasterService.getEntityData(
       entityType,
       loggedInUser,
     );
-  
-    const entityService = await this.reflectionHelper.getBean<EntityServiceImpl>(
-      entityMaster.entity_service,
-    );
-  
+
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
+      );
+
     if (!entityService) {
       throw new InternalServerErrorException(
         `No service found for entity_type "${entityType}"`,
       );
     }
-  
+
     // 1️⃣ Get old state
     const existingEntity = await entityService.getEntityData(
       entityType,
@@ -221,26 +227,29 @@ export class EntityController {
     if (!existingEntity) {
       throw new NotFoundException(`No entity found for id "${id}"`);
     }
-  
+
     // 2️⃣ Pre-evaluate criteria
-    const workflows = await this.workflowAutomationEngineService['wfService'].getActiveRules(
-      entityType,
-      'UPDATE',
-      loggedInUser
-    );
+    const workflows = await this.workflowAutomationEngineService[
+      'wfService'
+    ].getActiveRules(entityType, 'UPDATE', loggedInUser);
     const preUpdateStates: Record<number, boolean> = {};
     for (const wf of workflows) {
       preUpdateStates[wf.id] = await this.workflowAutomationEngineService[
         'filterEvaluator'
-      ].evaluateCriteria(entityType, wf.condition_filter_code, existingEntity.id, loggedInUser);
+      ].evaluateCriteria(
+        entityType,
+        wf.condition_filter_code,
+        existingEntity.id,
+        loggedInUser,
+      );
     }
-  
+
     // 3️⃣ Update
     const updatedData = await entityService.updateEntity(
       entityData,
       loggedInUser as UserData,
     );
-  
+
     // 4️⃣ Run workflow automation (pass preUpdateStates)
     await this.workflowAutomationEngineService.handleEntityEvent(
       entityType,
@@ -249,11 +258,9 @@ export class EntityController {
       loggedInUser,
       preUpdateStates,
     );
-  
+
     return updatedData;
   }
-  
-  
 
   @Post('delete/:id')
   @HttpCode(200)

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -14,13 +14,50 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
     loggedInUser,
     mode?: number,
   ) {
-    const stageAction = await this.dataSource.query(
-      `
+    let stageAction = [] as any;
+
+    if (action_id != 0) {
+      stageAction = await this.dataSource.query(
+        `
       SELECT id FROM frm_wf_stage_action_mapping
-      WHERE stage_id = ? AND action_id = ?
+      WHERE action_id = ?
       `,
-      [stage_id, action_id],
-    );
+        [action_id],
+      );
+    } else {
+      // generic action
+      // get template by mode
+
+      let modeId = mode;
+      if (!modeId) {
+        const rows = await this.dataSource.query(
+          `
+      SELECT id
+      FROM frm_list_master_items 
+      WHERE organization_id = ? 
+        AND listtype = "MOD" AND code = ?
+    `,
+          [loggedInUser.organization_id, 'email'],
+        );
+        modeId = rows?.[0]?.id ?? 0;
+      }
+
+      const commTemplates = await this.dataSource.query(
+        `
+  SELECT code as value, name as label , id
+  FROM frm_wf_comm_template
+  WHERE mode = ? AND organization_id = ? AND level_type = ? AND level_id = ?
+  `,
+        [
+          modeId,
+          loggedInUser.organization_id,
+          loggedInUser.level_type,
+          loggedInUser.level_id,
+        ],
+      );
+
+      return commTemplates;
+    }
     if (!stageAction?.length) return [];
 
     const stgActMappingId = stageAction[0].id;
@@ -49,7 +86,7 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
 
     const commTemplates = await this.dataSource.query(
       `
-  SELECT id, name
+  SELECT code as value, name as label , id
   FROM frm_wf_comm_template
   WHERE code IN (?) AND mode = ? AND organization_id = ? AND level_type = ? AND level_id = ?
   `,