rez_core 3.1.89 → 3.1.92

package/src/module/integration/strategies/whatsapp/tubelight-whatsapp.strategy.ts

@@ -32,7 +32,7 @@ interface TubelightApiResponse {
 export class TubelightWhatsAppStrategy implements IntegrationStrategy {
   private readonly logger = new Logger(TubelightWhatsAppStrategy.name);
   private readonly defaultBaseUrl =
-      'https://portal.tubelightcommunications.com/whatsapp/api/v1';
+    'https://portal.tubelightcommunications.com/whatsapp/api/v1';
 
   async sendMessage(
     to: string,
@@ -86,8 +86,8 @@ export class TubelightWhatsAppStrategy implements IntegrationStrategy {
       } else {
         throw new Error(
           response.data?.error ||
-            response.data?.message ||
-            'Invalid response from Tubelight API',
+          response.data?.message ||
+          'Invalid response from Tubelight API',
         );
       }
     } catch (error) {
@@ -160,7 +160,7 @@ export class TubelightWhatsAppStrategy implements IntegrationStrategy {
     const basePayload = {
       cust_uuid: config.custUuid || randomUUID(),
       to: [this.formatPhoneNumber(to)],
-      };
+    };
 
     // If templateId exists, send template message
     if (config.templateId || config.templateName) {
@@ -286,8 +286,7 @@ export class TubelightWhatsAppStrategy implements IntegrationStrategy {
         throw new Error('Authentication failed');
       }
 
-      const baseUrl = config.baseUrl || this.defaultBaseUrl;
-      const url = `${baseUrl}/retreive/template`;
+      const url = `${this.defaultBaseUrl}/retreive/template`;
 
       const response = await axios.post(
         url,
@@ -305,9 +304,9 @@ export class TubelightWhatsAppStrategy implements IntegrationStrategy {
       // Format the response with templateName as both label and value
       const formattedTemplates = Array.isArray(templates)
         ? templates.map((template: any) => ({
-            label: template.templateName,
-            value: template.templateName,
-          }))
+          label: template.templateName,
+          value: template.templateName,
+        }))
         : [];
 
       return {

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

@@ -27,16 +27,19 @@ export class FieldMapperController {
   async resolve(
     @Req() req: any,
     @Query('integration_component') integration_component: number,
+    @Query('action') action: 'LOOKUP' | 'LOAD',
     @Query('entity_type') entity_type: string,
     @Query('entity_id') entity_id: number,
+    @Body() inputJson,
   ) {
     const loggedInUser = req.user.userData;
     return this.fieldMapperService.resolveData(
       integration_component,
-      'LOOKUP',
+      action,
       entity_type,
       entity_id,
       loggedInUser,
+      inputJson,
     );
   }
 

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

@@ -24,6 +24,7 @@ export class FieldMapperRepository {
   async findByMapperId(mapper_id: number) {
     return await this.fieldMapperRepository.find({
         where: {mapper_id},
+        order: {seq : 'ASC'}
       },
     );
   }

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

@@ -92,7 +92,7 @@ export class FieldMapperService extends EntityServiceImpl {
     const fieldMappers =
       await this.fieldMapperRepository.findByMapperId(mapper_id);
 
-    const result: Record<string, any> = {};
+    const result = new Map<string, any>();
     const inMemory: Record<string, Record<string, any>> = {}; // cache for entity lookups
 
     for (const field of fieldMappers) {
@@ -179,7 +179,7 @@ export class FieldMapperService extends EntityServiceImpl {
           }
 
           // Add to result
-          result[field.source_attribute] = value;
+          result.set(field.source_attribute, value);
         }
       }
 

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

@@ -5,6 +5,7 @@ import {
   HttpStatus,
   Param,
   Post,
+  Query,
   Req,
   Res,
   UseGuards,
@@ -57,7 +58,7 @@ export class MediaController {
     @Param('id') id: number,
     @Res() res: Response,
     @Req() req: Request & { user: any },
-    @Param('expiresIn') expiresIn?: number,
+    @Query('expiresIn') expiresIn?: number,
   ) {
     const loggedInUser = req.user.userData;
     try {

package/src/module/meta/service/entity-dynamic.service.ts

@@ -612,10 +612,14 @@ export class EntityDynamicService {
     }[]
   > {
     const result = await this.dataSource.query(
-      `SELECT attribute_key, db_datatype, element_type, is_hidden
+      `SELECT attribute_key,  
+    MAX(db_datatype) AS db_datatype,
+    MAX(element_type) AS element_type,
+    MAX(is_hidden) AS is_hidden
      FROM cr_attribute_master
      WHERE mapped_entity_type = ? AND organization_id = ? 
-     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes`,
+     and (is_hidden IS NULL OR is_hidden = 0)  -- Exclude hidden attributes
+     GROUP BY attribute_key`,
       [entityType, organizationId],
     );
 

package/src/module/meta/service/media-data.service.ts

@@ -129,7 +129,7 @@ export class MediaDataService extends EntityServiceImpl {
       const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
-        Expires: expiresIn || 60 * 5, // URL valid for 5 mins or custom time 
+        Expires: Number(expiresIn) || 60 * 5, // URL valid for 5 mins or custom time
       });
       return { signedUrl, fileName: mediaData.file_name, id: mediaData.id };
     } catch (error) {

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

@@ -4,7 +4,6 @@ import { WorkflowAutomationService } from './workflow-automation.service';
 import { FilterEvaluatorService } from '../../filter/service/filter-evaluator.service';
 import { Action } from '../interface/action.interface';
 import { DataSource } from 'typeorm';
-import { LoggingService } from 'src/utils/service/loggingUtil.service';
 
 @Injectable()
 export class WorkflowAutomationEngineService {
@@ -15,16 +14,12 @@ export class WorkflowAutomationEngineService {
     private readonly wfService: WorkflowAutomationService,
     private readonly filterEvaluator: FilterEvaluatorService,
     private readonly dataSource: DataSource,
-    @Inject() protected readonly loggingService: LoggingService,
   ) {}
 
   registerAction(actionName: string, actionInstance: Action) {
     this.actions.set(actionName, actionInstance);
-    this.loggingService.log(
-      'info',
-      'WorkflowAutomationEngine',
-      'registerAction',
-      `Registered action ${actionName}`,
+    console.log(
+      `⚙️ [WorkflowAutomationEngine] Registered action: ${actionName}`,
     );
   }
 
@@ -39,12 +34,9 @@ export class WorkflowAutomationEngineService {
     user: any,
     preUpdateStates?: Record<number, boolean> | null,
   ) {
-    this.loggingService.log(
-      'info',
-      'WorkflowAutomationEngine',
-      'handleEntityEvent',
-      `Handling entity event: ${eventType} for entityType: ${entityType}`,
-      [newEntity?.id, preUpdateStates],
+    console.log(
+      `🟢 [WorkflowAutomationEngine] Handling entity event: ${eventType} for entityType: ${entityType}`,
+      { entityId: newEntity?.id, preUpdateStates },
     );
 
     const workflows = await this.wfService.getActiveRules(
@@ -76,22 +68,17 @@ export class WorkflowAutomationEngineService {
       }
 
       // 🔍 Log Step 1 result
-      this.loggingService.log(
-        'debug',
-        'WorkflowAutomationEngine',
-        'handleEntityEvent',
-        `Step 1 - Trigger matched`,
-        [wf.id, triggerMatched],
+      console.log(
+        `🧩 [WorkflowAutomationEngine] Step 1 - Trigger matched for WF ${wf.id}: ${triggerMatched}`,
       );
 
       if (!triggerMatched) continue;
 
       // Step 2️⃣ Final criteria evaluation
-
       const entityIdToUse =
-      wf.mapped_entity_type === wf.applicable_entity_type
-    ? newEntity.id
-    : newEntity.parent_id;
+        wf.mapped_entity_type === wf.applicable_entity_type
+          ? newEntity.id
+          : newEntity.parent_id;
 
       const criteriaMatched = await this.filterEvaluator.evaluateCriteria(
         wf.mapped_entity_type,
@@ -101,12 +88,8 @@ export class WorkflowAutomationEngineService {
       );
 
       // 🔍 Log Step 2 result
-      this.loggingService.log(
-        'debug',
-        'WorkflowAutomationEngine',
-        'handleEntityEvent',
-        `Step 2 - Criteria matched`,
-        [wf.id, criteriaMatched],
+      console.log(
+        `⚖️ [WorkflowAutomationEngine] Step 2 - Criteria matched for WF ${wf.id}: ${criteriaMatched}`,
       );
 
       if (!criteriaMatched) continue;
@@ -127,11 +110,8 @@ export class WorkflowAutomationEngineService {
     );
 
     if (!actions.length) {
-      this.loggingService.log(
-        'warn',
-        'WorkflowAutomationEngine',
-        'executeActions',
-        `No actions found for workflow ${workflow_automation_id}`,
+      console.warn(
+        `⚠️ [WorkflowAutomationEngine] No actions found for workflow ${workflow_automation_id}`,
       );
       return;
     }
@@ -145,11 +125,8 @@ export class WorkflowAutomationEngineService {
         );
 
         if (!category?.action_decorator) {
-          this.loggingService.log(
-            'warn',
-            'WorkflowAutomationEngine',
-            'executeActions',
-            `No action_decorator found for category_id=${action.action_category_id}`,
+          console.warn(
+            `⚠️ [WorkflowAutomationEngine] No action_decorator found for category_id=${action.action_category_id}`,
           );
           continue;
         }
@@ -160,21 +137,14 @@ export class WorkflowAutomationEngineService {
         const impl = this.actions.get(decorator);
 
         if (!impl) {
-          this.loggingService.log(
-            'warn',
-            'WorkflowAutomationEngine',
-            'executeActions',
-            `No implementation found for action: ${decorator}`,
+          console.warn(
+            `⚠️ [WorkflowAutomationEngine] No implementation found for action: ${decorator}`,
           );
           continue;
         }
 
-        this.loggingService.log(
-          'info',
-          'WorkflowAutomationEngine',
-          'executeActions',
-          `Executing action ${decorator} for entity ${entity.id}`,
-          [workflow_automation_id],
+        console.log(
+          `🚀 [WorkflowAutomationEngine] Executing action "${decorator}" for entity ${entity.id} (WF ${workflow_automation_id})`,
         );
 
         // 4️ Execute action with required context
@@ -184,20 +154,13 @@ export class WorkflowAutomationEngineService {
           config: action.payload, // from cr_wf_action table
         });
 
-        this.loggingService.log(
-          'info',
-          'WorkflowAutomationEngine',
-          'executeActions',
-          `Action ${decorator} executed successfully`,
-          [workflow_automation_id],
+        console.log(
+          `✅ [WorkflowAutomationEngine] Action "${decorator}" executed successfully (WF ${workflow_automation_id})`,
         );
       } catch (err) {
-        this.loggingService.log(
-          'error',
-          'WorkflowAutomationEngine',
-          'executeActions',
-          `Error executing action (category_id=${action.action_category_id})`,
-          [err],
+        console.error(
+          `❌ [WorkflowAutomationEngine] Error executing action (category_id=${action.action_category_id}):`,
+          err,
         );
       }
     }