rez_core 3.1.43 → 3.1.45

package/package.json

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

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

@@ -0,0 +1,14 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_integration_entity_mapper' })
+export class IntegrationEntityMapper extends BaseEntity {
+  @Column({ name: 'integration_config_id', type: 'bigint', nullable: true })
+  integration_config_id: number;
+
+  @Column({ name: 'did', type: 'varchar', length: 100 })
+  did: string;
+
+  @Column({ name: 'campaign_name', type: 'varchar', length: 100, nullable: true })
+  campaign_name: string;
+}

package/src/module/integration/integration.module.ts

@@ -43,6 +43,8 @@ import { WrapperController } from './controller/wrapper.controller';
 import { IcsMeetingModule } from '../ics/ics.module';
 import { IntegrationSource } from './entity/integration-source.entity';
 import { UserIntegration } from './entity/user-integration.entity';
+import { IntegrationEntityMapper } from './entity/integration-entity-mapper.entity';
+import { IntegrationEntityMapperService } from './service/integration-entity-mapper.service';
 
 @Module({
   imports: [
@@ -50,6 +52,7 @@ import { UserIntegration } from './entity/user-integration.entity';
       IntegrationConfig,
       IntegrationSource,
       UserIntegration,
+      IntegrationEntityMapper,
     ]),
     IcsMeetingModule,
   ],
@@ -58,6 +61,7 @@ import { UserIntegration } from './entity/user-integration.entity';
     // Main Services
     IntegrationService,
     IntegrationQueueService,
+    IntegrationEntityMapperService,
     OAuthService,
 
     // Email Strategies (API only)

package/src/module/integration/service/integration-entity-mapper.service.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { IntegrationEntityMapper } from '../entity/integration-entity-mapper.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class IntegrationEntityMapperService {
+  constructor(
+    @InjectRepository(IntegrationEntityMapper) private readonly integrationEntityMapperRepo: Repository<IntegrationEntityMapper>,
+  ) {
+  }
+
+  async findByDid(did: string) {
+    return this.integrationEntityMapperRepo.findOne({
+      where: { did },
+    });
+  }
+}

package/src/module/integration/service/integration.service.ts

@@ -5,6 +5,7 @@ import { ConfigService } from '@nestjs/config';
 import { google } from 'googleapis';
 import { IntegrationConfig } from '../entity/integration-config.entity';
 import { UserIntegration } from '../entity/user-integration.entity';
+import { IntegrationEntityMapper } from '../entity/integration-entity-mapper.entity';
 import { IntegrationFactory } from '../factories/integration.factory';
 import { IntegrationResult } from '../strategies/integration.strategy';
 import { GmailApiStrategy } from '../strategies/email/gmail-api.strategy';
@@ -73,6 +74,8 @@ export class IntegrationService {
     private readonly configRepository: Repository<IntegrationConfig>,
     @InjectRepository(UserIntegration)
     private readonly userIntegrationRepository: Repository<UserIntegration>,
+    @InjectRepository(IntegrationEntityMapper)
+    private readonly entityMapperRepository: Repository<IntegrationEntityMapper>,
 
     private readonly dataSource: DataSource,
     private readonly integrationFactory: IntegrationFactory,
@@ -1693,6 +1696,34 @@ export class IntegrationService {
       `Communication config created: ${configType}/${provider} for ${levelType} ${levelId}`,
     );
 
+    // Store DID mapping for TELEPHONE integration
+    if (configType === 'TELEPHONE') {
+      try {
+        // Extract DID from config (could be did, callerNumber, or fromNumber)
+        const did = config.did || config.callerNumber || config.fromNumber;
+
+        if (did) {
+          const entityMapper = this.entityMapperRepository.create({
+            integration_config_id: savedConfig.id,
+            level_id: String(levelId),
+            level_type: levelType,
+            appcode: app_code,
+            did: did,
+            campaign_name: config.campaignName || null,
+          });
+
+          await this.entityMapperRepository.save(entityMapper);
+          this.logger.log(
+            `DID mapping created for TELEPHONE integration: ${did} for ${levelType} ${levelId}`,
+          );
+        }
+      } catch (error) {
+        this.logger.warn(
+          `Failed to create DID mapping for TELEPHONE integration: ${error.message}`,
+        );
+      }
+    }
+
     return Array.isArray(savedConfig) ? savedConfig[0] : savedConfig;
   }
 

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

@@ -1,15 +1,16 @@
-import { Body, Controller, Inject, Post, Query, Req, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, Inject, Param, Post, Query, Req, UseGuards } from '@nestjs/common';
 import { FieldMapperService } from '../service/field-mapper.service';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
+import { FieldMapperDto } from '../dto/field-mapper.dto';
 
 @Controller('field-mapper')
+@UseGuards(JwtAuthGuard)
 export class FieldMapperController {
   constructor(@Inject('FieldMapperService') private readonly fieldMapperService: FieldMapperService) {
   }
 
   @Post('resolve')
-  @UseGuards(JwtAuthGuard)
-  async resolve(@Req() req: any, @Query('integration_component') integration_component: string,
+  async resolve(@Req() req: any, @Query('integration_component') integration_component: number,
                 @Query('entity_type') entity_type: string,
                 @Query('entity_id') entity_id: number) {
     const loggedInUser = req.user.userData;
@@ -18,10 +19,13 @@ export class FieldMapperController {
 
 
   @Post('bulk')
-  @UseGuards(JwtAuthGuard)
-  async createBulk(@Req() req: any, @Body() dtos: string) {
+  async createBulk(@Req() req: any, @Body() dtos: FieldMapperDto[]) {
     const loggedInUser = req.user.userData;
-    return this.fieldMapperService.createFieldMappers(dtos);
+    return this.fieldMapperService.createFieldMappers(dtos, loggedInUser);
   }
 
+  @Get('getFields/:mapperId')
+  async getFieldsByMapper(@Param('mapperId') mapperId: number) {
+    return this.fieldMapperService.getMapperFields(mapperId);
+  }
 }

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

@@ -9,8 +9,8 @@ export class FieldMapper extends BaseEntity {
     this.entity_type = 'FMAP';
   }
 
-  @Column({ name: 'mapper_id', type: 'varchar', length: 30 })
-  mapper_id: string;
+  @Column({ name: 'mapper_id', type: 'bigint' })
+  mapper_id: number;
 
   @Column({ name: 'action', type: 'varchar', length: 30 })
   action: string;

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

@@ -11,9 +11,9 @@ export class FieldMapperRepository {
   ) {
   }
 
-  async findByIntegrationComponentAndDestinationEntityType(integrationComponent: string, destinationEntityType: string) {
+  async findByMapperIdAndMappedEntityType(mapper_id: number, mapped_entity_type: string) {
     return await this.fieldMapperRepository.find({
-      where: { mapper_id: integrationComponent, mapped_entity_type: destinationEntityType },
+      where: { mapper_id, mapped_entity_type },
     });
   }
 
@@ -21,7 +21,10 @@ export class FieldMapperRepository {
     return await this.fieldMapperRepository.save(dto);
   }
 
-  async saveBulk(dtos: Partial<FieldMapper>[]) {
-    return await this.fieldMapperRepository.save(dtos);
+  async findByMapperId(mapper_id: number) {
+    return await this.fieldMapperRepository.find({
+        where: {mapper_id},
+      },
+    );
   }
 }

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

@@ -22,13 +22,6 @@ export class FieldMapperService extends EntityServiceImpl {
   }
 
   async createEntity(dto: FieldMapperDto, loggedInUser: UserData) {
-    if (dto.filter_json) {
-      const savedFilter = await this.savedFilterService.createEntity(
-        dto.filter_json,
-        loggedInUser,
-      );
-      dto.filter_code = savedFilter.code;
-    }
     return super.createEntity(dto, loggedInUser);
   }
 
@@ -43,19 +36,26 @@ export class FieldMapperService extends EntityServiceImpl {
     return super.updateEntity(dto, loggedInUser);
   }
 
-  async createFieldMappers(dtos) {
-    return await this.fieldMapperRepository.saveBulk(dtos);
+  async createFieldMappers(dtos: FieldMapperDto[], loggedInUser: UserData) {
+    for (const dto of dtos) {
+      await super.createEntity(dto, loggedInUser);
+    }
   }
 
+  async getMapperFields(mapperId: number) {
+    return await this.fieldMapperRepository.findByMapperId(mapperId);
+  }
+
+
   async resolveData(
-    integration_component: string,
+    mapper_id: number,
     parent_type: string,
     parent_id: number,
     userData: UserData,
   ) {
     const fieldMappers =
-      await this.fieldMapperRepository.findByIntegrationComponentAndDestinationEntityType(
-        integration_component,
+      await this.fieldMapperRepository.findByMapperIdAndMappedEntityType(
+        mapper_id,
         parent_type,
       );
 

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

@@ -28,5 +28,5 @@ export class WorkflowAutomation extends BaseEntity {
   trigger_type: string;
 
   @Column({ type: 'json', nullable: true })
-  schedule: JSON;
+  schedule: string;
 }

package/dist/module/integration/entity/integration-ivr-mapper.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"integration-ivr-mapper.entity.js","sourceRoot":"","sources":["../../../../src/module/integration/entity/integration-ivr-mapper.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;CAShD,CAAA;AATY,8CAAiB;AAE5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;8CAC1C;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;wDAC1C;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;6DACzC;4BARhB,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iCAAiC,EAAE,CAAC;GACvC,iBAAiB,CAS7B"}

package/src/module/integration/entity/integration-ivr-mapper.entity.ts

@@ -1,14 +0,0 @@
-import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'cr_integration_telephone_mapper' })
-export class IntegrationSource extends BaseEntity {
-  @Column({ name: 'did', type: 'varchar', length: 100 })
-  did: string;
-
-  @Column({ name: 'campaign_name', type: 'varchar', length: 100 })
-  campaign_name: string;
-
-  @Column({ name: 'mapped_entity_type', type: 'varchar', length: 20 })
-  mapped_entity_type: string;
-}