rez_core 4.0.225 → 4.0.227

package/package.json

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

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

@@ -1,7 +1,11 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { FilterEvaluatorService } from 'src/module/filter/service/filter-evaluator.service';
-import { DataSource } from 'typeorm';
+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 {
@@ -10,36 +14,52 @@ export class ScheduleHandlerService {
   constructor(
     private readonly dataSource: DataSource,
     private readonly filterEvaluator: FilterEvaluatorService,
-    // @Inject('WorkflowAutomationEngineService')
     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.dataSource.query(
-      `SELECT * FROM frm_wf_automation WHERE id = ? AND organization_id = ?`,
-      [workflowId, jobData.organizationId],
-    );
+    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 event = JSON.parse(workflow.event_json || '{}');
-    const scheduleJson = workflow.schedule;
+    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.dataSource.query(
-      `SELECT data_source FROM frm_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
-      [entityType, jobData.organizationId],
-    );
+    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.dataSource.query(
-      `SELECT name FROM frm_list_master_items WHERE id = ${scheduleJson.executionDate}`
-    );
+    const executionDateItem = await this.listMasterRepo.findOne({
+      where: {
+        id: scheduleJson.executionDate,
+      },
+      select: ['name'],
+    });
     const executionDateName = executionDateItem?.name?.toLowerCase() || '';
     const executionDataOrTime = scheduleJson.executionDateOrTime;
 
@@ -66,18 +86,18 @@ export class ScheduleHandlerService {
   `;
     }
 
-    const query = `
-  SELECT *
-  FROM ${tableName}
-  WHERE ${comparisonDateCondition}
-    AND organization_id = ?
-`;
+    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: ${query}`);
+    this.logger.debug(`Executing Scheduler Query: ${qb.getSql()}`);
 
-    const results = await this.dataSource.query(query, [
-      jobData.organizationId,
-    ]);
+    const results = await qb.getRawMany();
 
     this.logger.log(
       `Found ${results.length} scheduled records for ${tableName}`,
@@ -103,7 +123,6 @@ export class ScheduleHandlerService {
     );
 
     // 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;
 

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

@@ -3,7 +3,9 @@ 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';
+import { ActionCategory } from 'src/module/workflow/entity/action-category.entity';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()
 export class WorkflowAutomationEngineService {
@@ -13,7 +15,8 @@ export class WorkflowAutomationEngineService {
     @Inject('WorkflowAutomationService')
     private readonly wfService: WorkflowAutomationService,
     private readonly filterEvaluator: FilterEvaluatorService,
-    private readonly dataSource: DataSource,
+    @InjectRepository(ActionCategory)
+    private readonly actionCateRepo: Repository<ActionCategory>,
   ) {}
 
   registerAction(actionName: string, actionInstance: Action) {
@@ -165,10 +168,17 @@ export class WorkflowAutomationEngineService {
     for (const action of actions) {
       try {
         // 2 Resolve action_decorator using action_category_id
-        const [category] = await this.dataSource.query(
-          `SELECT action_decorator FROM frm_wf_action_category WHERE id = ?`,
-          [action.action_category_id],
-        );
+        // const category = await this.dataSource.query(
+        //   `SELECT action_decorator FROM frm_wf_action_category WHERE id = ?`,
+        //   [action.action_category_id],
+        // );
+
+        const category = await this.actionCateRepo.findOne({
+          where: {
+            id: action.action_category_id,
+          },
+          select: ['action_decorator'],
+        });
 
         if (!category?.action_decorator) {
           console.warn(

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

@@ -16,6 +16,8 @@ import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
 import { ScheduledWorkflow } from 'src/module/workflow-schedule/entities/scheduled-workflow.entity';
 import { WorkflowScheduleService } from 'src/module/workflow-schedule/service/workflow-schedule.service';
 import * as moment from 'moment';
+import { Update } from 'aws-sdk/clients/dynamodb';
+import { UpdateScheduleDto } from 'src/module/workflow-schedule/dto/update-schedule.dto';
 
 @Injectable()
 export class WorkflowAutomationService extends EntityServiceImpl {
@@ -232,6 +234,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           existing.payload = a.actionPayload ?? {};
           existing.actionCategoryName =
             a.actionCategoryName ?? existing.actionCategoryName;
+           existing.status = a.status ?? existing.status;
           await this.dataSource
             .getRepository(WorkflowAutomationActionEntity)
             .save(existing);
@@ -377,6 +380,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     const cronExpression = await this.generateDailyCron(scheduleJson.fixedTime);
 
     const payload = {
+      id: Number(existingSchedule?.id ?? null),
       workflow_id: workflow.id,
       workflow_name: workflow.name,
       name: scheduleJson.name ?? `Schedule_${workflow.id}`,
@@ -401,8 +405,11 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       this.logger.log(
         `Existing schedule found (id=${existingSchedule.id}), updating...`,
       );
-      payload['id'] = existingSchedule.id;
-      // return await this.workflowScheduleService.updateSchedule(payload, loggedInUser);
+      // payload['id'] = existingSchedule.id;
+      return await this.workflowScheduleService.updateSchedule(
+        payload,
+        loggedInUser,
+      );
     } else {
       this.logger.log(`No existing schedule found, creating new one...`);
       return await this.workflowScheduleService.createSchedule(
@@ -436,7 +443,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       );
     }
 
-    return '*/1 * * * *';
+    return cron;
   }
   /**
    * Updates the sequence of multiple workflow automations.

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

@@ -12,6 +12,9 @@ import { ActionRegistryService } from './service/action-registery.service';
 import { ScheduleHandlerService } from './service/schedule-handler.service';
 import { ScheduledWorkflow } from '../workflow-schedule/entities/scheduled-workflow.entity';
 import { WorkflowExecutionLog } from '../workflow-schedule/entities/workflow-execution-log.entity';
+import {EntityMaster} from "../meta/entity/entity-master.entity";
+import { ListMasterData } from '../listmaster/entity/list-master.entity';
+import { ActionCategory } from '../workflow/entity/action-category.entity';
 
 @Module({
   imports: [
@@ -20,6 +23,9 @@ import { WorkflowExecutionLog } from '../workflow-schedule/entities/workflow-exe
       WorkflowAutomationActionEntity,
       ScheduledWorkflow, // 👈 Required by WorkflowAutomationService
       WorkflowExecutionLog, // 👈 May be used by services
+      EntityMaster,
+      ListMasterData,
+      ActionCategory
     ]),
     FilterModule,
     forwardRef(() => EntityModule),

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

@@ -539,7 +539,7 @@ export class WorkflowScheduleService {
 
     const job = await this.scheduleQueue.add(EXECUTE_SCHEDULED_WORKFLOW_JOB, jobData, {
       repeat: {
-        cron: '*/1 * * * *',
+        cron: schedule.cron_expression,
         tz: schedule.timezone,
         startDate: schedule.start_date || undefined,
         endDate: schedule.end_date || undefined,

package/.idea/250218_nodejs_core.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>