rez_core 2.2.246 → 2.2.248

package/package.json

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

package/src/module/filter/filter.module.ts

@@ -13,15 +13,19 @@ import { FilterEvaluatorService } from './service/filter-evaluator.service';
   imports: [
     TypeOrmModule.forFeature([SavedFilterDetail, SavedFilterMaster]),
     forwardRef(() => EntityModule),
-    
   ],
   controllers: [FilterController],
   providers: [
     { provide: 'SavedFilterService', useClass: SavedFilterService },
     SavedFilterRepositoryService,
     FilterService,
-    FilterEvaluatorService
+    FilterEvaluatorService,
+  ],
+  exports: [
+    'SavedFilterService',
+    SavedFilterRepositoryService,
+    FilterService,
+    FilterEvaluatorService,
   ],
-  exports: ['SavedFilterService', SavedFilterRepositoryService, FilterService,FilterEvaluatorService],
 })
 export class FilterModule {}

package/src/module/filter/service/filter.service.ts

@@ -139,10 +139,16 @@ export class FilterService {
     console.log("IN FILTER SERVICE",savedFilterCode);
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     console.log("SAVED FILTERS", savedFilters);
+    const savedFiltersNormalized = savedFilters.map(f => ({
+      filter_attribute: f.filter_attribute,
+      filter_operator: f.filter_operator,
+      filter_value: f.filter_value
+    }));
+    
     const baseFilters = [
-      ...(quickFilter || []).filter((f) => f.filter_value !== ''),
-      ...savedFilters.filter((f) => f.filter_value !== ''),
-      ...(attributeFilter || []).filter((f) => f.filter_value !== ''),
+      ...(quickFilter || []).filter(f => f.filter_value != null && f.filter_value !== ''),
+      ...savedFiltersNormalized.filter(f => f.filter_value != null && f.filter_value !== ''),
+      ...(attributeFilter || []).filter(f => f.filter_value != null && f.filter_value !== ''),
     ];
 
     // Build where clauses

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

@@ -1,9 +1,11 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { WorkflowAutomation } from '../entity/workflow-automation.entity';
 import { WorkflowAutomationActionEntity } from '../entity/workflow-automation-action.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 
 @Injectable()
 export class WorkflowAutomationService extends EntityServiceImpl {
@@ -12,6 +14,8 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     private readonly wfRepo: Repository<WorkflowAutomation>,
     @InjectRepository(WorkflowAutomationActionEntity)
     private readonly actionRepo: Repository<WorkflowAutomationActionEntity>,
+    @Inject('SavedFilterService')
+    private readonly savedFilterService: SavedFilterService,
   ) {
     super();
   }
@@ -58,4 +62,66 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       where: { workflow_automation_id },
     });
   }
+
+  async updateEntity(entityData: any, loggedInUser: UserData) {
+    // 1. Extract "core" workflow fields
+    const { event, criteria, action, ...workflowData } = entityData;
+
+    // 2. Update only valid workflow columns
+    let workflow = await super.updateEntity(workflowData, loggedInUser);
+
+    // 3. EVENT
+    if (event) {
+      const eventFilterMaster = {
+        entity_type: 'SFM',
+        name: `Event_Filter_${workflow.id}`,
+        filterDetails: event.eventFilterJson,
+        filter_scope: 'RULE',
+      };
+
+      const savedEvent = await this.savedFilterService.createEntity(
+        eventFilterMaster,
+        loggedInUser,
+      );
+
+      workflow.trigger_type = event.triggerType;
+      workflow.trigger_event = event.event;
+      workflow.condition_filter_code = savedEvent.code;
+    }
+
+    // 4. CRITERIA
+    if (criteria) {
+      const criteriaFilterMaster = {
+        entity_type: 'SFM',
+        name: `Criteria_Filter_${workflow.id}`,
+        filterDetails: criteria.criteriaFilterJson,
+        filter_scope: 'RULE',
+      };
+
+      const savedCriteria = await this.savedFilterService.createEntity(
+        criteriaFilterMaster,
+        loggedInUser,
+      );
+
+      workflow.criteria_filter_code = savedCriteria.code;
+    }
+
+    // 5. ACTIONS
+    if (action?.length) {
+      for (const a of action) {
+        const actionEntity = new WorkflowAutomationActionEntity();
+        actionEntity.entity_type = 'WFAA';
+        actionEntity.workflow_automation_id = workflow.id;
+        actionEntity.entity_method = a.actionCategory;
+        actionEntity.payload = a.actionPayload;
+
+        await super.createEntity(actionEntity, loggedInUser);
+      }
+    }
+
+    // 6. Save workflow with updated trigger/criteria codes
+    workflow = await super.updateEntity(workflow, loggedInUser);
+
+    return workflow;
+  }
 }