rez_core 3.1.33 → 3.1.36

package/package.json

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

package/src/core.module.ts

@@ -15,7 +15,6 @@ import { LeadModule } from './module/lead/lead.module';
 import { LayoutPreferenceModule } from './module/layout_preference/layout_preference.module';
 import { WorkflowModule } from './module/workflow/workflow.module';
 import { WorkflowAutomationModule } from './module/workflow-automation/workflow-automation.module';
-import { MapperModule } from './module/mapper/mapper.module';
 
 @Global()
 @Module({})
@@ -37,8 +36,7 @@ export class CoreModule {
       LeadModule,
       LayoutPreferenceModule,
       WorkflowModule,
-      WorkflowAutomationModule,
-      MapperModule
+      WorkflowAutomationModule
     ];
 
     const exportsArray = [
@@ -53,8 +51,7 @@ export class CoreModule {
       LeadModule,
       LayoutPreferenceModule,
       WorkflowModule,
-      WorkflowAutomationModule,
-      MapperModule
+      WorkflowAutomationModule
     ];
 
     if (isSso) {

package/src/module/filter/repository/saved-filter.repository.ts

@@ -39,7 +39,7 @@ export class SavedFilterRepositoryService {
   }
 
   async getDetailsByCode(code: string) {
-    console.log("IN GET DETAILS BY CODE", code);
+    console.log('IN GET DETAILS BY CODE', code);
     let data = await this.savedFilterDetailRepo.find({
       where: { mapped_filter_code: code },
     });

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

@@ -22,7 +22,7 @@ export class MapperService extends EntityServiceImpl{
     
         return mappers.map((m) => ({
           id: m.id,
-          name: m.name,
+          label: m.name,
           value: m.id,
           code: m.code,
         }));

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

@@ -79,54 +79,67 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     this.logger.debug(`Workflow updated (id=${workflow.id})`);
 
     // 2. EVENT FILTER
-    if (event?.eventFilterJson || event?.triggerType || event?.event) {
+    if (event?.triggerType) {
       this.logger.log(`Processing EVENT filter for workflow ${workflow.id}`);
 
-      const eventFilterMaster = {
-        entity_type: 'SFM',
-        name: `Event_Filter_${workflow.id}`,
-        filterDetails: event?.eventFilterJson ?? [],
-        filter_scope: 'RULE',
-        organization_id: loggedInUser.organization_id,
-        enterprise_id: loggedInUser.enterprise_id,
-      };
-
-      if (workflow.condition_filter_code) {
-        this.logger.debug(
-          `Existing event filter found: ${workflow.condition_filter_code}`,
-        );
-        const existing = await this.savedFilterService.getEntityDataByCode(
-          ENTITYTYPE_SAVEDFILTERMASTER,
-          workflow.condition_filter_code,
-          loggedInUser,
-        );
+      if (event.triggerType === 'on_event') {
+        const eventFilterMaster = {
+          entity_type: 'SFM',
+          name: `Event_Filter_${workflow.id}`,
+          filterDetails: event?.eventFilterJson ?? [],
+          filter_scope: 'RULE',
+          organization_id: loggedInUser.organization_id,
+          enterprise_id: loggedInUser.enterprise_id,
+        };
 
-        if (existing) {
-          eventFilterMaster['id'] = existing.id;
-          const updatedEvent = await this.savedFilterService.updateEntity(
-            eventFilterMaster as any,
+        if (workflow.condition_filter_code) {
+          this.logger.debug(
+            `Existing event filter found: ${workflow.condition_filter_code}`,
+          );
+          const existing = await this.savedFilterService.getEntityDataByCode(
+            ENTITYTYPE_SAVEDFILTERMASTER,
+            workflow.condition_filter_code,
             loggedInUser,
           );
-          workflow.condition_filter_code = updatedEvent.code;
-          this.logger.log(
-            `Updated existing event filter: ${updatedEvent.code}`,
+
+          if (existing) {
+            eventFilterMaster['id'] = existing.id;
+            const updatedEvent = await this.savedFilterService.updateEntity(
+              eventFilterMaster as any,
+              loggedInUser,
+            );
+            workflow.condition_filter_code = updatedEvent.code;
+            this.logger.log(
+              `Updated existing event filter: ${updatedEvent.code}`,
+            );
+          }
+        } else {
+          const savedEvent = await this.savedFilterService.createEntity(
+            eventFilterMaster,
+            loggedInUser,
           );
+          workflow.condition_filter_code = savedEvent.code;
+          this.logger.log(`Created new event filter: ${savedEvent.code}`);
         }
-      } else {
-        const savedEvent = await this.savedFilterService.createEntity(
-          eventFilterMaster,
-          loggedInUser,
+
+        workflow.trigger_event = event?.event ?? null;
+      }
+
+      if (event.triggerType === 'on_schedule') {
+        // just store JSON directly into schedule column
+        workflow.schedule = event?.scheduleJson ?? null;
+        this.logger.log(
+          `Stored schedule JSON for workflow ${workflow.id}: ${JSON.stringify(
+            workflow.schedule,
+          )}`,
         );
-        workflow.condition_filter_code = savedEvent.code;
-        this.logger.log(`Created new event filter: ${savedEvent.code}`);
       }
 
-      workflow.trigger_type = event?.triggerType ?? null;
-      workflow.trigger_event = event?.event ?? null;
+      workflow.trigger_type = event.triggerType;
     }
 
     // 3. CRITERIA FILTER
-    if (filter?.filter_code) {
+    if (filter) {
       this.logger.log(`Processing CRITERIA filter for workflow ${workflow.id}`);
 
       // const criteriaFilterMaster = {
@@ -168,7 +181,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       //   this.logger.log(`Created new criteria filter: ${savedCriteria.code}`);
       // }
 
-      workflow.criteria_filter_code = entityData.filter.filter_code;
+      workflow.criteria_filter_code = filter.filter_code ?? null;
     }
 
     // 4. ACTIONS
@@ -260,29 +273,39 @@ export class WorkflowAutomationService extends EntityServiceImpl {
 
     // 2. EVENT FILTER
     let event: any = null;
-    if (workflowAutomation.condition_filter_code) {
-      const eventFilterMaster: any =
-        await this.savedFilterService.getEntityDataByCode(
-          ENTITYTYPE_SAVEDFILTERMASTER,
-          workflowAutomation.condition_filter_code,
-          loggedInUser,
-        );
 
-      if (eventFilterMaster) {
-        // 🔑 fetch filter details using mapped_filter_code
-        const eventFilterDetails =
-          await this.savedFilterService.getDetailsByCode(
-            eventFilterMaster.code,
+    if (workflowAutomation.trigger_type === 'on_event') {
+      if (workflowAutomation.condition_filter_code) {
+        const eventFilterMaster: any =
+          await this.savedFilterService.getEntityDataByCode(
+            ENTITYTYPE_SAVEDFILTERMASTER,
+            workflowAutomation.condition_filter_code,
+            loggedInUser,
           );
 
-        event = {
-          eventFilterJson: eventFilterDetails ?? [],
-          triggerType: workflowAutomation.trigger_type,
-          event: workflowAutomation.trigger_event,
-        };
+        if (eventFilterMaster) {
+          // 🔑 fetch filter details using mapped_filter_code
+          const eventFilterDetails =
+            await this.savedFilterService.getDetailsByCode(
+              eventFilterMaster.code,
+            );
+
+          event = {
+            eventFilterJson: eventFilterDetails ?? [],
+            triggerType: workflowAutomation.trigger_type,
+            event: workflowAutomation.trigger_event,
+          };
+        }
       }
     }
 
+    if (workflowAutomation.trigger_type === 'on_schedule') {
+      event = {
+        triggerType: workflowAutomation.trigger_type,
+        scheduleJson: workflowAutomation.schedule, // direct from DB
+      };
+    }
+
     // 3. CRITERIA FILTER
     let filter: any = null;
     if (workflowAutomation.criteria_filter_code) {