rez_core 3.1.57 → 3.1.58

package/package.json

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

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

@@ -48,4 +48,9 @@ export class FieldMapperController {
   async getFieldsByMapper(@Param('mapperId') mapperId: number) {
     return this.fieldMapperService.getMapperFields(mapperId);
   }
+
+  @Get('getLovs/:mapperFieldId')
+  async getLovsByMapperField(@Param('mapperFieldId') mapperFieldId: number) {
+    return this.fieldMapperService.getFieldLovs(mapperFieldId);
+  }
 }

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

@@ -11,3 +11,4 @@ export class FieldMapperDto extends BaseEntity {
   filter_code?: string;
   field_lovs?: FieldLovMapper[];
 }
+

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

@@ -23,4 +23,10 @@ export class FieldLovsRepository {
       where: { mapper_field_id, destination_attribute_value },
     })
   }
+
+  async findByMapperFieldId(mapper_field_id: number) {
+    return await this.fieldLovMapperRepository.find({
+      where: { mapper_field_id },
+    })
+  }
 }

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

@@ -1,9 +1,8 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldMapperDto } from '../dto/field-mapper.dto';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { UserData } from '../../user/entity/user.entity';
-import { SavedFilterService } from '../../filter/service/saved-filter.service';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
 import { DataSource } from 'typeorm';
 import { FilterService } from 'src/module/filter/service/filter.service';
@@ -13,8 +12,6 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 export class FieldMapperService extends EntityServiceImpl {
   constructor(
     private readonly fieldMapperRepository: FieldMapperRepository,
-    @Inject('SavedFilterService')
-    private readonly savedFilterService: SavedFilterService,
     private readonly fieldLovsRepository: FieldLovsRepository,
     private readonly datasource: DataSource,
     private readonly filterService: FilterService,
@@ -28,7 +25,7 @@ export class FieldMapperService extends EntityServiceImpl {
     if (dto.field_lovs) {
       for (const lov of dto.field_lovs) {
         lov.mapper_field_id = savedEntity.id;
-        lov.entity_type = 'FLOV'
+        lov.entity_type = 'FLOV';
       }
       await this.fieldLovsRepository.saveBulk(dto.field_lovs);
     }
@@ -61,6 +58,10 @@ export class FieldMapperService extends EntityServiceImpl {
     return await this.fieldMapperRepository.findByMapperId(mapperId);
   }
 
+  async getFieldLovs(mapperFieldId: number) {
+    return await this.fieldLovsRepository.findByMapperFieldId(mapperFieldId);
+  }
+
   async resolveData(
     mapper_id: number,
     parent_type: string,

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

@@ -27,6 +27,9 @@ export class WorkflowAutomation extends BaseEntity {
   @Column({ type: 'varchar', nullable: true })
   trigger_type: string;
 
+  @Column({ type: 'varchar', nullable: true })
+  applicable_entity_type: string;
+
   @Column({ type: 'json', nullable: true })
   schedule: string;
 }

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

@@ -7,6 +7,7 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { UserData } from 'src/module/user/entity/user.entity';
 import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
+import { app } from 'firebase-admin';
 
 @Injectable()
 export class WorkflowAutomationService extends EntityServiceImpl {
@@ -90,6 +91,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
           filter_scope: 'RULE',
           organization_id: loggedInUser.organization_id,
           enterprise_id: loggedInUser.enterprise_id,
+          applicable_entity_type: workflow.applicable_entity_type,
         };
 
         if (workflow.condition_filter_code) {
@@ -128,6 +130,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       if (event.triggerType === 'on_schedule') {
         // just store JSON directly into schedule column
         workflow.schedule = event?.scheduleJson ?? null;
+          workflow.applicable_entity_type= workflow.applicable_entity_type,
         this.logger.log(
           `Stored schedule JSON for workflow ${workflow.id}: ${JSON.stringify(
             workflow.schedule,