rez_core 5.0.28 → 5.0.29

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

@@ -1,43 +1,43 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  Post,
-  Req,
-  UseGuards,
-} from '@nestjs/common';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { WorkflowAutomationService } from '../service/workflow-automation.service';
-
-@Controller('/workflow-automation')
-@UseGuards(JwtAuthGuard)
-export class WorkflowAutomationController {
-  constructor(
-    @Inject('WorkflowAutomationService')
-    private readonly workflowAutomationService: WorkflowAutomationService,
-  ) {}
-
-  /**
-   * Endpoint to update the sequence of workflow automations.
-   * Accepts an array of objects with `id` and `sequence`.
-   */
-  @Post('/updateSequence')
-  @HttpCode(HttpStatus.OK)
-  async updateSequence(
-    @Body() body: any,
-    @Req() req: Request & { user?: any },
-  ) {
-    const loggedInUser = req.user?.userData;
-
-    if (!Array.isArray(body) || body.length === 0) {
-      throw new BadRequestException(
-        'Invalid input. Expected a non-empty array.',
-      );
-    }
-
-    return this.workflowAutomationService.updateSequence(body, loggedInUser);
-  }
-}
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  HttpCode,
+  HttpStatus,
+  Inject,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { WorkflowAutomationService } from '../service/workflow-automation.service';
+
+@Controller('/workflow-automation')
+@UseGuards(JwtAuthGuard)
+export class WorkflowAutomationController {
+  constructor(
+    @Inject('WorkflowAutomationService')
+    private readonly workflowAutomationService: WorkflowAutomationService,
+  ) {}
+
+  /**
+   * Endpoint to update the sequence of workflow automations.
+   * Accepts an array of objects with `id` and `sequence`.
+   */
+  @Post('/updateSequence')
+  @HttpCode(HttpStatus.OK)
+  async updateSequence(
+    @Body() body: any,
+    @Req() req: Request & { user?: any },
+  ) {
+    const loggedInUser = req.user?.userData;
+
+    if (!Array.isArray(body) || body.length === 0) {
+      throw new BadRequestException(
+        'Invalid input. Expected a non-empty array.',
+      );
+    }
+
+    return this.workflowAutomationService.updateSequence(body, loggedInUser);
+  }
+}

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

@@ -1,26 +1,26 @@
-import { WORKFLOW_AUTOMATION_ACTION } from 'src/constant/global.constant';
-import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'frm_wf_automation_action' })
-export class WorkflowAutomationActionEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = WORKFLOW_AUTOMATION_ACTION;
-  }
-
-  @Column({ type: 'int', nullable: true })
-  workflow_automation_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  action_category_id: number;
-
-  @Column({ type: 'json', nullable: true })
-  payload: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  entity_method: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  actioncategoryname: string;
-}
+import { WORKFLOW_AUTOMATION_ACTION } from 'src/constant/global.constant';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'frm_wf_automation_action' })
+export class WorkflowAutomationActionEntity extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = WORKFLOW_AUTOMATION_ACTION;
+  }
+
+  @Column({ type: 'int', nullable: true })
+  workflow_automation_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  action_category_id: number;
+
+  @Column({ type: 'json', nullable: true })
+  payload: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  entity_method: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  actioncategoryname: string;
+}

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

@@ -1,40 +1,40 @@
-import { WORKFLOW_AUTOMATION } from 'src/constant/global.constant';
-import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'frm_wf_automation' })
-export class WorkflowAutomation extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = WORKFLOW_AUTOMATION;
-  }
-
-  @Column({ type: 'varchar', nullable: true })
-  description: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  mapped_entity_type: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  trigger_event: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  condition_filter_code: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  criteria_filter_code: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  trigger_type: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  applicable_entity_type: string;
-
-  @Column({ type: 'json', nullable: true })
-  schedule: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  cron_type: string;
-  @Column({ type: 'int', nullable: true })
-  sequence: number;
-}
+import { WORKFLOW_AUTOMATION } from 'src/constant/global.constant';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'frm_wf_automation' })
+export class WorkflowAutomation extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = WORKFLOW_AUTOMATION;
+  }
+
+  @Column({ type: 'varchar', nullable: true })
+  description: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  mapped_entity_type: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  trigger_event: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  condition_filter_code: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  criteria_filter_code: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  trigger_type: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  applicable_entity_type: string;
+
+  @Column({ type: 'json', nullable: true })
+  schedule: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  cron_type: string;
+  @Column({ type: 'int', nullable: true })
+  sequence: number;
+}

package/src/module/workflow-automation/interface/action.decorator.ts

@@ -1,7 +1,7 @@
-// src/module/workflow-automation/interface/action.decorator.ts
-import { SetMetadata } from '@nestjs/common';
-
-export const ACTION_HANDLER = 'ACTION_HANDLER';
-
-export const ActionHandler = (actionName: string) =>
-  SetMetadata(ACTION_HANDLER, actionName);
+// src/module/workflow-automation/interface/action.decorator.ts
+import { SetMetadata } from '@nestjs/common';
+
+export const ACTION_HANDLER = 'ACTION_HANDLER';
+
+export const ActionHandler = (actionName: string) =>
+  SetMetadata(ACTION_HANDLER, actionName);

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

@@ -1,5 +1,5 @@
-// package/src/interfaces/action.interface.ts
-export interface Action {
-  name: string; // unique identifier of the action
-  execute(payload: any): Promise<any>; // execution logic
-}
+// package/src/interfaces/action.interface.ts
+export interface Action {
+  name: string; // unique identifier of the action
+  execute(payload: any): Promise<any>; // execution logic
+}

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

@@ -1,35 +1,35 @@
-// src/module/workflow-automation/service/action-registry.service.ts
-import { Injectable, OnModuleInit } from '@nestjs/common';
-import { DiscoveryService, ModuleRef, Reflector } from '@nestjs/core';
-import { WorkflowAutomationEngineService } from './workflow-automation-engine.service';
-import { Action } from '../interface/action.interface';
-import { ACTION_HANDLER } from '../interface/action.decorator';
-
-@Injectable()
-export class ActionRegistryService implements OnModuleInit {
-  constructor(
-    private readonly discoveryService: DiscoveryService,
-    private readonly moduleRef: ModuleRef,
-    private readonly reflector: Reflector,
-    private readonly engine: WorkflowAutomationEngineService,
-  ) {}
-
-  onModuleInit() {
-    const providers = this.discoveryService.getProviders();
-
-    for (const wrapper of providers) {
-      const { instance } = wrapper;
-      if (!instance) continue;
-
-      const actionName = this.reflector.get<string>(
-        ACTION_HANDLER,
-        instance.constructor,
-      );
-
-      if (actionName) {
-        this.engine.registerAction(actionName, instance as Action);
-        console.log(`✅ Registered action handler: ${actionName}`);
-      }
-    }
-  }
-}
+// src/module/workflow-automation/service/action-registry.service.ts
+import { Injectable, OnModuleInit } from '@nestjs/common';
+import { DiscoveryService, ModuleRef, Reflector } from '@nestjs/core';
+import { WorkflowAutomationEngineService } from './workflow-automation-engine.service';
+import { Action } from '../interface/action.interface';
+import { ACTION_HANDLER } from '../interface/action.decorator';
+
+@Injectable()
+export class ActionRegistryService implements OnModuleInit {
+  constructor(
+    private readonly discoveryService: DiscoveryService,
+    private readonly moduleRef: ModuleRef,
+    private readonly reflector: Reflector,
+    private readonly engine: WorkflowAutomationEngineService,
+  ) {}
+
+  onModuleInit() {
+    const providers = this.discoveryService.getProviders();
+
+    for (const wrapper of providers) {
+      const { instance } = wrapper;
+      if (!instance) continue;
+
+      const actionName = this.reflector.get<string>(
+        ACTION_HANDLER,
+        instance.constructor,
+      );
+
+      if (actionName) {
+        this.engine.registerAction(actionName, instance as Action);
+        console.log(`✅ Registered action handler: ${actionName}`);
+      }
+    }
+  }
+}

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

@@ -1,149 +1,168 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
-import { FilterEvaluatorService } from 'src/module/filter/service/filter-evaluator.service';
-import { DataSource } from 'typeorm';
-import { WorkflowAutomationEngineService } from './workflow-automation-engine.service';
-
-@Injectable()
-export class ScheduleHandlerService {
-  private readonly logger = new Logger(ScheduleHandlerService.name);
-
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly filterEvaluator: FilterEvaluatorService,
-    // @Inject('WorkflowAutomationEngineService')
-    private readonly workflowAutomationEngineService: WorkflowAutomationEngineService,
-  ) {}
-
-  async scheduleQueryBuilder(workflowId: number, jobData: any) {
-    // 1️⃣ Fetch workflow automation config
-    const [workflow] = await this.dataSource.query(
-      `SELECT * FROM frm_wf_automation WHERE id = ? AND organization_id = ?`,
-      [workflowId, jobData.organizationId],
-    );
-
-    if (!workflow) throw new Error(`Workflow with ID ${workflowId} not found`);
-
-    const event = JSON.parse(workflow.event_json || '{}');
-    const scheduleJson = workflow.schedule;
-    const entityType = workflow.applicable_entity_type;
-
-    // 2️⃣ Get table name from frm_entity_master
-    const [entity] = await this.dataSource.query(
-      `SELECT data_source FROM frm_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
-      [entityType, jobData.organizationId],
-    );
-    if (!entity?.data_source) throw new Error(`Entity ${entityType} not found`);
-
-    const tableName = entity.data_source;
-
-    // 3️⃣ Resolve executionDate (list master item name)
-    const [executionDateItem] = await this.dataSource.query(
-      `SELECT name FROM frm_list_master_items WHERE id = ${scheduleJson.executionDate}`
-    );
-    const executionDateName = executionDateItem?.name?.toLowerCase() || '';
-    const executionDataOrTime = scheduleJson.executionDateOrTime;
-
-    const executionUnits = Number(scheduleJson.executionDateUnits || 0);
-    const fixedTime = scheduleJson.fixedTime; // e.g. "16:00"
-
-    // Build time window logic
-    let comparisonDateCondition = '';
-
-    if (executionDateName.includes('after')) {
-      comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
-  `;
-    } else if (executionDateName.includes('before')) {
-      comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
-    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
-  `;
-    } else if (executionDateName.includes('same')) {
-      comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE()
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
-  `;
-    }
-
-    const query = `
-  SELECT *
-  FROM ${tableName}
-  WHERE ${comparisonDateCondition}
-    AND organization_id = ?
-`;
-
-    this.logger.debug(`Executing Scheduler Query: ${query}`);
-
-    const results = await this.dataSource.query(query, [
-      jobData.organizationId,
-    ]);
-
-    this.logger.log(
-      `Found ${results.length} scheduled records for ${tableName}`,
-    );
-
-    return { results, workflow, tableName };
-  }
-
-  // ⚙️ Step 2: Handle scheduled automation (main entry point)
-  async handleScheduledWorkflow(workflowId: number, jobData: any) {
-    const { results, workflow, tableName } = await this.scheduleQueryBuilder(
-      workflowId,
-      jobData,
-    );
-
-    if (!results?.length) {
-      this.logger.warn(`No records found for scheduled workflow ${workflowId}`);
-      return;
-    }
-
-    this.logger.log(
-      `Processing ${results.length} records for workflow ${workflowId}`,
-    );
-
-    // Parse the workflow event JSON again to get filter/action info
-    const event = JSON.parse(workflow.event_json || '{}');
-    const filter = workflow.condition_filter_code;
-    const mappedEntityType = workflow.applicable_entity_type;
-
-    const matchedEntities: any[] = [];
-
-    // 🔁 Step 2A: Evaluate criteria for each record
-    for (const record of results) {
-      const entityIdToUse = record.id; // assuming 'id' column in the table
-      const criteriaMatched = await this.filterEvaluator.evaluateCriteria(
-        mappedEntityType,
-        filter,
-        entityIdToUse,
-        jobData,
-      );
-
-      this.logger.debug(
-        `⚖️ Criteria check for entity ${entityIdToUse} -> ${criteriaMatched}`,
-      );
-
-      if (criteriaMatched) {
-        matchedEntities.push(record);
-      }
-    }
-
-    // 🧮 Step 3: Execute workflow actions for matched entities
-    if (!matchedEntities.length) {
-      this.logger.log(`No records passed criteria for workflow ${workflowId}`);
-      return;
-    }
-
-    this.logger.log(
-      `✅ ${matchedEntities.length} entities passed criteria, executing actions...`,
-    );
-
-    for (const entity of matchedEntities) {
-      await this.workflowAutomationEngineService.executeActions(
-        workflowId,
-        entity,
-        jobData,
-      );
-    }
-  }
-}
+import { Inject, Injectable, Logger } from '@nestjs/common';
+import { FilterEvaluatorService } from 'src/module/filter/service/filter-evaluator.service';
+import { DataSource, Repository } from 'typeorm';
+import { WorkflowAutomationEngineService } from './workflow-automation-engine.service';
+import { WorkflowAutomation } from '../entity/workflow-automation.entity';
+import { InjectRepository } from '@nestjs/typeorm';
+import { EntityMaster } from 'src/module/meta/entity/entity-master.entity';
+import { ListMasterData } from 'src/module/listmaster/entity/list-master.entity';
+
+@Injectable()
+export class ScheduleHandlerService {
+  private readonly logger = new Logger(ScheduleHandlerService.name);
+
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly filterEvaluator: FilterEvaluatorService,
+    private readonly workflowAutomationEngineService: WorkflowAutomationEngineService,
+    @InjectRepository(WorkflowAutomation)
+    private readonly workflowAutomation: Repository<WorkflowAutomation>,
+    @InjectRepository(EntityMaster)
+    private readonly entityMasterRepository: Repository<EntityMaster>,
+    @InjectRepository(ListMasterData)
+    private readonly listMasterRepo: Repository<ListMasterData>,
+  ) {}
+
+  async scheduleQueryBuilder(workflowId: number, jobData: any) {
+    // 1️⃣ Fetch workflow automation config
+    const workflow = await this.workflowAutomation.findOne({
+      where: {
+        id: workflowId,
+        organization_id: jobData.organizationId,
+      },
+    });
+
+    if (!workflow) throw new Error(`Workflow with ID ${workflowId} not found`);
+
+    const scheduleJson =
+      typeof workflow.schedule === 'string'
+        ? JSON.parse(workflow.schedule)
+        : workflow.schedule;
+        
+    const entityType = workflow.applicable_entity_type;
+
+    // 2️⃣ Get table name from frm_entity_master
+    const entity = await this.entityMasterRepository.findOne({
+      where: {
+        mapped_entity_type: entityType,
+        organization_id: jobData.organizationId,
+      },
+      select: ['data_source'],
+    });
+    if (!entity?.data_source) throw new Error(`Entity ${entityType} not found`);
+
+    const tableName = entity.data_source;
+
+    // 3️⃣ Resolve executionDate (list master item name)
+    const executionDateItem = await this.listMasterRepo.findOne({
+      where: {
+        id: scheduleJson.executionDate,
+      },
+      select: ['name'],
+    });
+    const executionDateName = executionDateItem?.name?.toLowerCase() || '';
+    const executionDataOrTime = scheduleJson.executionDateOrTime;
+
+    const executionUnits = Number(scheduleJson.executionDateUnits || 0);
+    const fixedTime = scheduleJson.fixedTime; // e.g. "16:00"
+
+    // Build time window logic
+    let comparisonDateCondition = '';
+
+    if (executionDateName.includes('after')) {
+      comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
+  `;
+    } else if (executionDateName.includes('before')) {
+      comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
+    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
+  `;
+    } else if (executionDateName.includes('same')) {
+      comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE()
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
+  `;
+    }
+
+    const qb = this.dataSource
+      .createQueryBuilder()
+      .from(tableName, tableName)
+      .select('*')
+      .where(comparisonDateCondition)
+      .andWhere(`${tableName}.organization_id = :orgId`, {
+        orgId: jobData.organizationId,
+      });
+
+    this.logger.debug(`Executing Scheduler Query: ${qb.getSql()}`);
+
+    const results = await qb.getRawMany();
+
+    this.logger.log(
+      `Found ${results.length} scheduled records for ${tableName}`,
+    );
+
+    return { results, workflow, tableName };
+  }
+
+  // ⚙️ Step 2: Handle scheduled automation (main entry point)
+  async handleScheduledWorkflow(workflowId: number, jobData: any) {
+    const { results, workflow, tableName } = await this.scheduleQueryBuilder(
+      workflowId,
+      jobData,
+    );
+
+    if (!results?.length) {
+      this.logger.warn(`No records found for scheduled workflow ${workflowId}`);
+      return;
+    }
+
+    this.logger.log(
+      `Processing ${results.length} records for workflow ${workflowId}`,
+    );
+
+    // Parse the workflow event JSON again to get filter/action info
+    const filter = workflow.condition_filter_code;
+    const mappedEntityType = workflow.applicable_entity_type;
+
+    const matchedEntities: any[] = [];
+
+    // 🔁 Step 2A: Evaluate criteria for each record
+    for (const record of results) {
+      const entityIdToUse = record.id; // assuming 'id' column in the table
+      const criteriaMatched = await this.filterEvaluator.evaluateCriteria(
+        mappedEntityType,
+        filter,
+        entityIdToUse,
+        jobData,
+      );
+
+      this.logger.debug(
+        `⚖️ Criteria check for entity ${entityIdToUse} -> ${criteriaMatched}`,
+      );
+
+      if (criteriaMatched) {
+        matchedEntities.push(record);
+      }
+    }
+
+    // 🧮 Step 3: Execute workflow actions for matched entities
+    if (!matchedEntities.length) {
+      this.logger.log(`No records passed criteria for workflow ${workflowId}`);
+      return;
+    }
+
+    this.logger.log(
+      `✅ ${matchedEntities.length} entities passed criteria, executing actions...`,
+    );
+
+    for (const entity of matchedEntities) {
+      await this.workflowAutomationEngineService.executeActions(
+        workflowId,
+        entity,
+        jobData,
+      );
+    }
+  }
+}