rez_core 2.2.258 → 2.2.259

package/src/module/{communication → integration}/service/oauth.service.ts

@@ -8,7 +8,7 @@ export class OAuthService {
     process.env.GMAIL_CLIENT_ID,
     process.env.GMAIL_CLIENT_SECRET,
     process.env.GMAIL_REDIRECT_URI ||
-      'http://localhost:3000/api/communication/oauth/callback/gmail',
+      'http://localhost:3000/api/integration/oauth/callback/gmail',
   );
 
   private readonly outlookScopes = [

package/src/module/{communication → integration}/service/wrapper.service.ts

@@ -1,9 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 import {
-  CommunicationService,
+  IntegrationService,
   GenericMessageDto,
-} from './communication.service';
+} from './integration.service';
 import { GoogleService } from './calendar-event.service';
 import { IcsMeetingService } from 'src/module/ics/service/ics.service';
 
@@ -13,7 +13,7 @@ export class WrapperService {
 
   constructor(
     private readonly datasource: DataSource,
-    private readonly communicationService: CommunicationService,
+    private readonly integrationService: IntegrationService,
     private readonly googleService: GoogleService,
     private readonly icsService: IcsMeetingService,
   ) {}
@@ -34,12 +34,11 @@ export class WrapperService {
         `Fetching configs for level_id=${level_id}, level_type=${level_type}`,
       );
       const configs = await this.datasource.query(
-        `SELECT * 
-         FROM cr_communication_hub 
+        `SELECT * FROM cr_integration_config 
          WHERE level_id = ? 
            AND level_type = ? 
            AND status = 1
-           AND communication_config_type = 'EMAIL'`,
+           AND integration_type = 'EMAIL'`,
         [level_id, level_type],
       );
       this.logger.debug(`Configs found: ${JSON.stringify(configs)}`);
@@ -74,6 +73,7 @@ export class WrapperService {
         payloadSendMail = {
           levelId: level_id,
           levelType: level_type,
+          app_code: 'DEFAULT', // Legacy wrapper default
           to: payload.to,
           message: payload.message,
           subject: payload.subject,
@@ -90,10 +90,10 @@ export class WrapperService {
           `No user-level configs found. Falling back to ORG-level`,
         );
         const fallbackConfigs = await this.datasource.query(
-          `SELECT * 
-           FROM cr_communication_hub 
+          `SELECT * FROM cr_integration_config 
            WHERE level_type = 'ORG' 
-             AND communication_config_type = 'EMAIL'`,
+             AND integration_type = 'EMAIL'
+             AND status = 1`,
         );
         this.logger.debug(
           `ORG-level configs: ${JSON.stringify(fallbackConfigs)}`,
@@ -106,6 +106,7 @@ export class WrapperService {
         payloadSendMail = {
           levelId: 1,
           levelType: 'ORG',
+          app_code: 'DEFAULT', // Legacy wrapper default
           to: payload.to,
           message: payload.message,
           subject: payload.subject,
@@ -120,11 +121,11 @@ export class WrapperService {
       }
 
       this.logger.debug(
-        `Final payload for CommunicationService: ${JSON.stringify(payloadSendMail)}`,
+        `Final payload for IntegrationService: ${JSON.stringify(payloadSendMail)}`,
       );
 
       const result =
-        await this.communicationService.sendGenericMessage(payloadSendMail);
+        await this.integrationService.sendGenericMessage(payloadSendMail);
 
       this.logger.log(
         `sendMailWrapper SUCCESS. Result: ${JSON.stringify(result)}`,
@@ -182,21 +183,19 @@ export class WrapperService {
 
       // ---- Step 1: Check user-level configs ----
       const userConfigs = await this.datasource.query(
-        `SELECT * 
-       FROM cr_communication_hub 
+        `SELECT * FROM cr_integration_config 
        WHERE level_id = ? 
          AND level_type = ? 
          AND status = 1
-         AND communication_config_type = 'EMAIL' 
-         AND service = 'API'`,
+         AND integration_type = 'EMAIL'`,
         [level_id, level_type],
       );
 
       this.logger.debug(`User configs found: ${JSON.stringify(userConfigs)}`);
 
       if (userConfigs && userConfigs.length > 0) {
-        const provider = userConfigs[0]?.provider;
-        const configId = userConfigs[0]?.config_id;
+        const provider = userConfigs[0]?.integration_provider;
+        const configId = userConfigs[0]?.id;
 
         if (provider === 'gmail') {
           this.logger.log(`Using Google Calendar (user-level)`);
@@ -232,20 +231,19 @@ export class WrapperService {
       this.logger.log(`No user-level config found, checking ORG-level...`);
 
       const orgConfigs = await this.datasource.query(
-        `SELECT * 
-       FROM cr_communication_hub 
+        `SELECT * FROM cr_integration_config 
        WHERE level_id = 1
          AND level_type = 'ORG' 
-         AND communication_config_type = 'EMAIL' 
-         AND service = 'API'`,
+         AND integration_type = 'EMAIL'
+         AND status = 1`,
         [],
       );
 
       this.logger.debug(`ORG configs found: ${JSON.stringify(orgConfigs)}`);
 
       if (orgConfigs && orgConfigs.length > 0) {
-        const provider = orgConfigs[0]?.provider;
-        const configId = orgConfigs[0]?.config_id;
+        const provider = orgConfigs[0]?.integration_provider;
+        const configId = orgConfigs[0]?.id;
 
         if (provider === 'gmail') {
           this.logger.log(`Using Google Calendar (ORG-level)`);
@@ -302,7 +300,7 @@ export class WrapperService {
     this.logger.debug(`Fetching config JSON for configId=${configId}`);
     const configRes = await this.datasource.query(
       `SELECT config_json 
-       FROM cr_communication_config 
+       FROM cr_integration_config 
        WHERE id = ?`,
       [configId],
     );
@@ -344,6 +342,7 @@ export class WrapperService {
     const payloadSendMail: GenericMessageDto = {
       levelId,
       levelType,
+      app_code: 'DEFAULT', // Legacy wrapper default
       to: toList,
       message: payload.message,
       subject: payload.subject,
@@ -367,7 +366,7 @@ export class WrapperService {
       `Final payload for ICS send: ${JSON.stringify(payloadSendMail)}`,
     );
     const result =
-      await this.communicationService.sendGenericMessage(payloadSendMail);
+      await this.integrationService.sendGenericMessage(payloadSendMail);
     this.logger.log(`ICS fallback mail send result: ${JSON.stringify(result)}`);
     return result;
   }

package/src/module/{communication → integration}/strategies/email/gmail-api.strategy.ts

@@ -2,20 +2,20 @@ import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { google } from 'googleapis';
 import {
-  CommunicationStrategy,
-  CommunicationResult,
+  IntegrationStrategy,
+  IntegrationResult,
   EmailAttachment,
   EmailAttachmentValidator,
-} from '../communication.strategy';
+} from '../integration.strategy';
 
 @Injectable()
-export class GmailApiStrategy implements CommunicationStrategy {
+export class GmailApiStrategy implements IntegrationStrategy {
   constructor(private readonly configService: ConfigService) {}
   async sendMessage(
     to: string | string[],
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       if (!config || !config.refreshToken) {
         throw new Error(
@@ -27,7 +27,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
 
       console.log('---- Using Google SDK Gmail API ----');
 
-      // Validate attachments if present
       if (attachments && attachments.length > 0) {
         EmailAttachmentValidator.validate(
           attachments,
@@ -36,14 +35,10 @@ export class GmailApiStrategy implements CommunicationStrategy {
         );
       }
 
-      // Setup OAuth2 client with Google SDK
       const oauth2Client = await this.setupOAuth2Client(config);
 
-      // Initialize Gmail API
       const gmail = google.gmail({ version: 'v1', auth: oauth2Client });
 
-      console.log('---- Gmail SDK client initialized, preparing email ----');
-
       const toRecipients = Array.isArray(to) ? to.join(', ') : to;
       const ccRecipients = cc
         ? Array.isArray(cc)
@@ -56,7 +51,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
           : bcc
         : undefined;
 
-      // Build email content with or without attachments
       const emailContent =
         attachments && attachments.length > 0
           ? this.buildMultipartEmail(
@@ -81,7 +75,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
         .replace(/\//g, '_')
         .replace(/=+$/, '');
 
-      // Send email using Google SDK
       const result = await gmail.users.messages.send({
         userId: 'me',
         requestBody: {
@@ -89,10 +82,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
         },
       });
 
-      console.log('---- Gmail SDK API Success ----');
-      console.log('Message ID:', result.data.id);
-
-      // Get fresh access token for database update
       const credentials = oauth2Client.credentials;
       const freshAccessToken = credentials.access_token;
 
@@ -102,7 +91,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
         provider: 'gmail',
         service: 'API',
         timestamp: new Date(),
-        refreshedToken: freshAccessToken, // Return fresh token for database update
       };
     } catch (error) {
       console.error('---- Gmail SDK API Error ----');
@@ -295,4 +283,4 @@ export class GmailApiStrategy implements CommunicationStrategy {
 
     return emailLines.join('\n');
   }
-}
+}

package/src/module/{communication → integration}/strategies/email/outlook-api.strategy.ts

@@ -1,16 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import {
-  CommunicationStrategy,
-  CommunicationResult,
-} from '../communication.strategy';
+  IntegrationStrategy,
+  IntegrationResult,
+} from '../integration.strategy';
 
 @Injectable()
-export class OutlookApiStrategy implements CommunicationStrategy {
+export class OutlookApiStrategy implements IntegrationStrategy {
   async sendMessage(
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       if (!this.validateConfig(config)) {
         throw new Error('Invalid Outlook API configuration');

package/src/module/{communication → integration}/strategies/email/outlook.strategy.ts

@@ -1,17 +1,17 @@
 import { Injectable } from '@nestjs/common';
 import { Client } from '@microsoft/microsoft-graph-client';
 import {
-  CommunicationStrategy,
-  CommunicationResult,
-} from '../communication.strategy';
+  IntegrationStrategy,
+  IntegrationResult,
+} from '../integration.strategy';
 
 @Injectable()
-export class OutlookStrategy implements CommunicationStrategy {
+export class OutlookStrategy implements IntegrationStrategy {
   async sendMessage(
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       const { accessToken } = config;
 

package/src/module/{communication → integration}/strategies/email/sendgrid-api.strategy.ts

@@ -2,18 +2,18 @@ import { Injectable } from '@nestjs/common';
 import * as sgMail from '@sendgrid/mail';
 import axios from 'axios';
 import {
-  CommunicationResult,
-  CommunicationStrategy,
+  IntegrationResult,
+  IntegrationStrategy,
   EmailAttachment,
-} from '../communication.strategy';
+} from '../integration.strategy';
 
 @Injectable()
-export class SendGridApiStrategy implements CommunicationStrategy {
+export class SendGridApiStrategy implements IntegrationStrategy {
   async sendMessage(
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       const {
         apiKey,

package/src/module/{communication/strategies/communication.strategy.ts → integration/strategies/integration.strategy.ts}

@@ -1,13 +1,17 @@
-export interface CommunicationStrategy {
+export interface IntegrationStrategy {
   sendMessage(
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult>;
+  ): Promise<IntegrationResult>;
   validateConfig(config: any): boolean;
+  createUserSpecificConfig?(
+    baseConfig: any,
+    userIntegrationData?: any,
+  ): any;
 }
 
-export interface CommunicationResult {
+export interface IntegrationResult {
   success: boolean;
   messageId?: string;
   provider: string;

package/src/module/{communication → integration}/strategies/telephone/ozonetel-voice.strategy.ts

@@ -1,33 +1,37 @@
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
 import {
-  CommunicationResult,
-  CommunicationStrategy,
-} from '../communication.strategy';
+  IntegrationResult,
+  IntegrationStrategy,
+} from '../integration.strategy';
 
 interface OzonetelVoiceConfig {
+  // Admin-level credentials (kept in config)
   apiKey: string;
   userName: string;
-  agentID: string;
   campaignName: string;
   agentLoginUrl?: string;
+  // User-specific agent info (from UserIntegration mapping)
+  agentID?: string;
+  external_user_id?: string;
 }
 
 @Injectable()
-export class OzonetelVoiceStrategy implements CommunicationStrategy {
+export class OzonetelVoiceStrategy implements IntegrationStrategy {
   private readonly baseUrl = 'https://in1-ccaas-api.ozonetel.com';
 
   async sendMessage(
     to: string,
     message: string,
     config: OzonetelVoiceConfig,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     if (!this.validateConfig(config)) {
       return {
         success: false,
         provider: 'ozonetel',
         service: 'THIRD_PARTY',
-        error: 'Invalid Ozonetel Voice configuration',
+        error:
+          'Invalid Ozonetel Voice configuration. Missing agent information.',
         timestamp: new Date(),
       };
     }
@@ -47,12 +51,13 @@ export class OzonetelVoiceStrategy implements CommunicationStrategy {
 
       // Then make the manual dial call
       const url = `${this.baseUrl}/ca_apis/AgentManualDial`;
+
       await axios.post(
         url,
         {
           userName: config.userName,
-          agentID: config.agentID,
-          campaignName: config.campaignName,
+          agentID: config.external_user_id || config.agentID,
+          campaignName: config.campaignName, // Always from config
           customerNumber: to,
           UCID: true,
           uui: message,
@@ -120,9 +125,32 @@ export class OzonetelVoiceStrategy implements CommunicationStrategy {
     return !!(
       config &&
       config.apiKey &&
-      config.userName &&
-      config.agentID &&
-      config.campaignName
+      config.campaignName &&
+      config.userName
     );
   }
+
+  /**
+   * Create configuration with user agent data merged with admin credentials
+   * Admin credentials (apiKey, userName, campaignName) stay in base config
+   * Only agent-specific info (agentID) comes from user integration
+   */
+  createUserSpecificConfig(
+    baseConfig: Pick<
+      OzonetelVoiceConfig,
+      'apiKey' | 'userName' | 'campaignName' | 'agentLoginUrl'
+    >,
+    userIntegrationData?: any,
+  ): OzonetelVoiceConfig {
+    if (!userIntegrationData) {
+      throw new Error(
+        'User integration data is required for Ozonetel voice calls',
+      );
+    }
+
+    return {
+      ...baseConfig,
+      agentID: userIntegrationData.agentId,
+    };
+  }
 }

package/src/module/{communication → integration}/strategies/telephone/tubelight-voice.strategy.ts

@@ -1,33 +1,40 @@
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
 import {
-  CommunicationResult,
-  CommunicationStrategy,
-} from '../communication.strategy';
+  IntegrationResult,
+  IntegrationStrategy,
+} from '../integration.strategy';
 
 interface TubelightVoiceConfig {
+  // Admin-level credentials (kept in config)
   userName: string;
   password: string;
-  agentVerificationKey: string;
   tenantId: string;
   agentLoginUrl?: string;
+  // Agent phone number from config JSON
+  agentPhoneNumber?: string;
+  // User-specific agent info (from UserIntegration mapping)
+  agentVerificationKey?: string;
+  external_user_id?: string;
 }
 
 @Injectable()
-export class TubelightVoiceStrategy implements CommunicationStrategy {
-  private readonly baseUrl = 'https://portal.tubelightcommunications.com/voice/api/v1';
+export class TubelightVoiceStrategy implements IntegrationStrategy {
+  private readonly baseUrl =
+    'https://portal.tubelightcommunications.com/voice/api/v1';
 
   async sendMessage(
     to: string,
     message: string,
     config: TubelightVoiceConfig,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     if (!this.validateConfig(config)) {
       return {
         success: false,
         provider: 'tubelight',
         service: 'THIRD_PARTY',
-        error: 'Invalid Tubelight Voice configuration',
+        error:
+          'Invalid Tubelight Voice configuration. Missing agent verification key.',
         timestamp: new Date(),
       };
     }
@@ -45,10 +52,12 @@ export class TubelightVoiceStrategy implements CommunicationStrategy {
       }
 
       const url = `${this.baseUrl}/user/sso/agent/outbound-call`;
+
       await axios.post(
         url,
         {
-          agentVerificationKey: config.agentVerificationKey,
+          agentVerificationKey:
+            config.external_user_id || config.agentVerificationKey,
           customerNumber: to,
         },
         {
@@ -102,7 +111,11 @@ export class TubelightVoiceStrategy implements CommunicationStrategy {
         },
       );
 
-      const data = response.data as { bearer_token?: string; access_token?: string; token?: string };
+      const data = response.data as {
+        bearer_token?: string;
+        access_token?: string;
+        token?: string;
+      };
       return data?.bearer_token || data?.access_token || data?.token || null;
     } catch (error) {
       console.error('Failed to authenticate with Tubelight:', error);
@@ -111,12 +124,6 @@ export class TubelightVoiceStrategy implements CommunicationStrategy {
   }
 
   validateConfig(config: Partial<TubelightVoiceConfig>): boolean {
-    return !!(
-      config &&
-      config.userName &&
-      config.password &&
-      config.agentVerificationKey &&
-      config.tenantId
-    );
+    return !!(config && config.userName && config.password && config.tenantId);
   }
 }

package/src/module/{communication → integration}/strategies/whatsapp/whatsapp-cloud.strategy.ts

@@ -1,9 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common';
 import axios, { AxiosResponse } from 'axios';
 import {
-  CommunicationStrategy,
-  CommunicationResult,
-} from '../communication.strategy';
+  IntegrationStrategy,
+  IntegrationResult,
+} from '../integration.strategy';
 
 interface WhatsAppConfig {
   accessToken: string;
@@ -74,7 +74,7 @@ interface WhatsAppApiResponse {
 }
 
 @Injectable()
-export class WhatsAppCloudStrategy implements CommunicationStrategy {
+export class WhatsAppCloudStrategy implements IntegrationStrategy {
   private readonly logger = new Logger(WhatsAppCloudStrategy.name);
   private readonly baseUrl = 'https://graph.facebook.com';
 
@@ -82,7 +82,7 @@ export class WhatsAppCloudStrategy implements CommunicationStrategy {
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       if (!this.validateConfig(config)) {
         throw new Error('Invalid WhatsApp Cloud API configuration');

package/src/module/{communication → integration}/strategies/whatsapp/whatsapp.strategy.ts

@@ -1,17 +1,17 @@
 import { Injectable } from '@nestjs/common';
 import axios from 'axios';
 import {
-  CommunicationStrategy,
-  CommunicationResult,
-} from '../communication.strategy';
+  IntegrationStrategy,
+  IntegrationResult,
+} from '../integration.strategy';
 
 @Injectable()
-export class WhatsAppStrategy implements CommunicationStrategy {
+export class WhatsAppStrategy implements IntegrationStrategy {
   async sendMessage(
     to: string,
     message: string,
     config: any,
-  ): Promise<CommunicationResult> {
+  ): Promise<IntegrationResult> {
     try {
       const { accessToken, phoneNumberId, apiVersion = 'v17.0' } = config;
 

package/src/module/meta/entity/entity-master.entity.ts

@@ -73,6 +73,6 @@ export class EntityMaster extends BaseEntity {
   @Column({ name: 'data_source', nullable: true })
   data_source: string;
 
-  @Column({ name: 'show_workflow', nullable: true })
-  show_workflow: boolean;
+  @Column({ name: 'is_workflow', nullable: true })
+  is_workflow: boolean;
 }