rez_core 3.1.34 → 3.1.35

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { Controller, Inject, Post, Query, Req, UseGuards } from '@nestjs/common';
+import { Body, Controller, Inject, Post, Query, Req, UseGuards } from '@nestjs/common';
 import { FieldMapperService } from '../service/field-mapper.service';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 
@@ -10,12 +10,18 @@ export class FieldMapperController {
   @Post('resolve')
   @UseGuards(JwtAuthGuard)
   async resolve(@Req() req: any, @Query('integration_component') integration_component: string,
-                @Query('parent_type') parent_type: string,
-                @Query('parent_id') parent_id: number) {
+                @Query('entity_type') entity_type: string,
+                @Query('entity_id') entity_id: number) {
     const loggedInUser = req.user.userData;
-    return this.fieldMapperService.resolveData(integration_component, parent_type, parent_id, loggedInUser);
+    return this.fieldMapperService.resolveData(integration_component, entity_type, entity_id, loggedInUser);
   }
 
 
+  @Post('bulk')
+  @UseGuards(JwtAuthGuard)
+  async createBulk(@Req() req: any, @Body() dtos: string) {
+    const loggedInUser = req.user.userData;
+    return this.fieldMapperService.createFieldMappers(dtos);
+  }
 
 }

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

@@ -1,7 +1,7 @@
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
 export class FieldMapperDto extends BaseEntity {
-  integration_component: string;
+  mapper_id: string;
   action: string;
   source_attribute: string;
   destination_attribute: string;

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

@@ -9,8 +9,8 @@ export class FieldMapper extends BaseEntity {
     this.entity_type = 'FMAP';
   }
 
-  @Column({ name: 'integration_component', type: 'varchar', length: 30 })
-  integration_component: string;
+  @Column({ name: 'mapper_id', type: 'varchar', length: 30 })
+  mapper_id: string;
 
   @Column({ name: 'action', type: 'varchar', length: 30 })
   action: string;
@@ -19,10 +19,10 @@ export class FieldMapper extends BaseEntity {
   source_attribute: string;
 
   @Column({ name: 'destination_attribute', type: 'varchar', length: 30 })
-  destination_attribute: string;
+  attribute_key: string;
 
   @Column({ name: 'destination_entity_type', type: 'varchar', length: 30 })
-  destination_entity_type: string;
+  mapper_entity_type: string;
 
   @Column({ name: 'mapped_entity_type', type: 'varchar', length: 30, nullable: true })
   mapped_entity_type: string;
@@ -30,7 +30,7 @@ export class FieldMapper extends BaseEntity {
   @Column({ name: 'filter_code', type: 'varchar', length: 30, default: 'default', nullable: true })
   filter_code: string;
 
-  @Column({ name: 'is_lov_present', type: 'tinyint' })
+  @Column({ name: 'is_lov_present', type: 'tinyint', nullable: true, default: 0 })
   is_lov_present: number;
 
 }

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

@@ -13,7 +13,7 @@ export class FieldMapperRepository {
 
   async findByIntegrationComponentAndDestinationEntityType(integrationComponent: string, destinationEntityType: string) {
     return await this.fieldMapperRepository.find({
-      where: { integration_component: integrationComponent, destination_entity_type: destinationEntityType },
+      where: { mapper_id: integrationComponent, mapped_entity_type: destinationEntityType },
     });
   }
 

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

@@ -43,7 +43,7 @@ export class FieldMapperService extends EntityServiceImpl {
     return super.updateEntity(dto, loggedInUser);
   }
 
-  async createFieldMappers(dtos: FieldMapperDto[]) {
+  async createFieldMappers(dtos) {
     return await this.fieldMapperRepository.saveBulk(dtos);
   }
 
@@ -65,7 +65,7 @@ export class FieldMapperService extends EntityServiceImpl {
     for (const field of fieldMappers) {
       const entityType = field.mapped_entity_type
         ? field.mapped_entity_type
-        : field.destination_entity_type;
+        : field.mapper_entity_type;
       const filterCode = field.filter_code || 'default';
 
       if (!inMemory[entityType]) {
@@ -75,7 +75,7 @@ export class FieldMapperService extends EntityServiceImpl {
       // Case 1️⃣ direct mapping (no mapped_entity_type or equal)
       if (
         !inMemory[entityType][filterCode] &&
-        field.mapped_entity_type == field.destination_entity_type
+        field.mapped_entity_type == field.mapper_entity_type
       ) {
         inMemory[entityType][filterCode] = await super.getResolvedEntityData(
           entityType,
@@ -140,7 +140,7 @@ export class FieldMapperService extends EntityServiceImpl {
       // Fetch mapped attribute values
       const entityData = inMemory[entityType][filterCode];
       if (entityData) {
-        let value = entityData[field.destination_attribute];
+        let value = entityData[field.mapper_entity_type];
 
         if (field.is_lov_present) {
           if (field.action === 'LOOKUP') {

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

@@ -26,6 +26,6 @@ export class MapperService extends EntityServiceImpl{
           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,37 +273,46 @@ 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,
+          };
+        }
       }
     }
 
-    // 3. CRITERIA FILTER
-    let filter: any = null;
-    if (workflowAutomation.criteria_filter_code) {
-      filter = {
-        filter_code: workflowAutomation.criteria_filter_code,
+    if (workflowAutomation.trigger_type === 'on_schedule') {
+      event = {
+        triggerType: workflowAutomation.trigger_type,
+        scheduleJson: workflowAutomation.schedule, // direct from DB
       };
     }
 
+    // 3. CRITERIA FILTER
+    let filter: any = null;
+
+    filter = {
+      filter_code: workflowAutomation.criteria_filter_code,
+    };
+
     // 4. ACTIONS
     const actions = await this.dataSource
       .getRepository(WorkflowAutomationActionEntity)