rez_core 3.1.61 → 3.1.63

package/package.json

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

package/src/module/filter/repository/saved-filter.repository.ts

@@ -74,7 +74,7 @@ export class SavedFilterRepositoryService {
 
   async getDefaultFilterByEntityType(
     entityType: string,
-  ): Promise<{ label: string; value: number } | null> {
+  ): Promise<{ label: string; value: number ,code: string} | null> {
     const filter = await this.savedFilterMasterRepo.findOne({
       where: {
         mapped_entity_type: entityType,
@@ -82,7 +82,7 @@ export class SavedFilterRepositoryService {
       },
     });
 
-    return filter ? { label: filter.name, value: filter.id } : null;
+    return filter ? { label: filter.name, value: filter.id , code: filter.code} : null;
   }
 
   async getSavedFiltersByUserIdAndEntityType(
@@ -103,6 +103,7 @@ export class SavedFilterRepositoryService {
     return filters.map((filter) => ({
       label: filter.name,
       value: filter.id,
+      code: filter.code,
     }));
   }
 

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

@@ -413,7 +413,7 @@ export class IntegrationController {
     }
   }
 
-  @Post('user-integration/:id')
+  @Post('user-integration/delete/:id')
   @HttpCode(HttpStatus.OK)
   async deleteUserIntegration(@Param('id', ParseIntPipe) id: number) {
     try {

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

@@ -1279,7 +1279,7 @@ export class IntegrationService {
     if (!commTemplate.template_id) {
       let richText = commTemplate.rich_text;
 
-      richText.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+      richText = richText.replace(/\{\{(\w+)\}\}/g, (match, key) => {
         const value = variables[key];
         return value !== undefined ? String(value) : match;
       });
@@ -2370,7 +2370,7 @@ export class IntegrationService {
 
   /**
    * Check agent status for TELEPHONE integration
-   * Currently supports: Ozonetel
+   * Works with any provider that implements checkAgentStatus method
    */
   async checkAgentStatus(
     levelId: number,
@@ -2431,37 +2431,24 @@ export class IntegrationService {
         );
       }
 
-      // Check if strategy is Ozonetel (currently only Ozonetel supports status check)
-      if (config.integration_provider.toLowerCase() === 'ozonetel') {
-        const ozonetelStrategy = strategy as any;
-
-        // Generate token
-        const token = await ozonetelStrategy.generateToken(mergedConfig);
-        if (!token) {
-          return {
-            success: false,
-            error: 'Failed to authenticate with telephone provider',
-          };
-        }
-
-        // Check agent status
-        const statusResult = await ozonetelStrategy.checkAgentStatus(
-          mergedConfig,
-          token,
-        );
-
+      // Check if strategy supports agent status check
+      if (typeof (strategy as any).checkAgentStatus !== 'function') {
         return {
-          success: true,
-          isReady: statusResult.isReady,
-          state: statusResult.state,
-          error: statusResult.error,
+          success: false,
+          error: `Agent status check not supported for provider: ${config.integration_provider}`,
         };
       }
 
-      // For other providers, return not supported
+      // Check agent status
+      const statusResult = await (strategy as any).checkAgentStatus(
+        mergedConfig,
+      );
+
       return {
-        success: false,
-        error: `Agent status check not supported for provider: ${config.integration_provider}`,
+        success: true,
+        isReady: statusResult.isReady,
+        state: statusResult.state,
+        error: statusResult.error,
       };
     } catch (error) {
       this.logger.error(

package/src/module/integration/strategies/telephone/ozonetel-voice.strategy.ts

@@ -50,27 +50,27 @@ export class OzonetelVoiceStrategy implements IntegrationStrategy {
     }
 
     try {
-      // First, get JWT token
-      const token = await this.generateToken(config);
-      if (!token) {
+      // Check agent status before making the call
+      const agentStatus = await this.checkAgentStatus(config);
+      if (!agentStatus.isReady) {
         return {
           success: false,
           provider: 'ozonetel',
           service: 'THIRD_PARTY',
-          error: 'Failed to generate Ozonetel authentication token',
+          error: agentStatus.error ||
+                 `Agent is not ready. Current state: ${agentStatus.state || 'Unknown'}. Please login to your agent dashboard.`,
           timestamp: new Date(),
         };
       }
 
-      // Check agent status before making the call
-      const agentStatus = await this.checkAgentStatus(config, token);
-      if (!agentStatus.isReady) {
+      // Get JWT token for manual dial
+      const token = await this.generateToken(config);
+      if (!token) {
         return {
           success: false,
           provider: 'ozonetel',
           service: 'THIRD_PARTY',
-          error: agentStatus.error ||
-                 `Agent is not ready. Current state: ${agentStatus.state || 'Unknown'}. Please login to your agent dashboard.`,
+          error: 'Failed to generate Ozonetel authentication token',
           timestamp: new Date(),
         };
       }
@@ -149,9 +149,17 @@ export class OzonetelVoiceStrategy implements IntegrationStrategy {
 
   async checkAgentStatus(
     config: OzonetelVoiceConfig,
-    token: string,
   ): Promise<{ isReady: boolean; state?: string; error?: string }> {
     try {
+      // Generate token first
+      const token = await this.generateToken(config);
+      if (!token) {
+        return {
+          isReady: false,
+          error: 'Failed to authenticate with Ozonetel',
+        };
+      }
+
       const url = `${this.baseUrl}/ca_apis/AgentDetails`;
 
       const response = await axios.post<AgentDetailsResponse>(

package/src/module/integration/strategies/telephone/tubelight-voice.strategy.ts

@@ -10,6 +10,7 @@ interface TubelightVoiceConfig {
   userName: string;
   password: string;
   tenantId: string;
+  accessKey?: string; // For agent status check
   agentLoginUrl?: string;
   // Agent phone number from config JSON
   agentPhoneNumber?: string;
@@ -123,7 +124,86 @@ export class TubelightVoiceStrategy implements IntegrationStrategy {
     }
   }
 
+  async checkAgentStatus(
+    config: TubelightVoiceConfig,
+  ): Promise<{ isReady: boolean; state?: string; error?: string }> {
+    try {
+      if (!config.accessKey) {
+        return {
+          isReady: false,
+          error: 'Access key is required for agent status check',
+        };
+      }
+
+      if (!config.external_user_id) {
+        return {
+          isReady: false,
+          error: 'Agent email (external_user_id) is required',
+        };
+      }
+
+      const url = `https://dashboard.hellotubelight.com/tenant/v1/user/sso/agent/user/state/${config.external_user_id}`;
+
+      const response = await axios.post(
+        url,
+        {},
+        {
+          headers: {
+            'accept': '*/*',
+            'X-TENANT-ID': config.tenantId,
+            'access-key': config.accessKey,
+          },
+        },
+      );
+
+      // Parse the response to determine agent status
+      const data = response.data;
+      const state = data?.state || data?.status;
+
+      // Determine if agent is ready based on the state
+      // Adjust this logic based on actual Tubelight API response format
+      const isReady = state?.toUpperCase() === 'READY' ||
+                      state?.toUpperCase() === 'AVAILABLE' ||
+                      state?.toUpperCase() === 'IDLE';
+
+      return {
+        isReady,
+        state: state,
+      };
+    } catch (error) {
+      console.error('Failed to check Tubelight agent status:', error);
+      return {
+        isReady: false,
+        error: axios.isAxiosError(error)
+          ? error.response?.data?.message || error.message
+          : 'Unknown error checking agent status',
+      };
+    }
+  }
+
   validateConfig(config: Partial<TubelightVoiceConfig>): boolean {
     return !!(config && config.userName && config.password && config.tenantId);
   }
+
+  /**
+   * Create configuration with user agent data merged with admin credentials
+   */
+  createUserSpecificConfig(
+    baseConfig: Pick<
+      TubelightVoiceConfig,
+      'userName' | 'password' | 'tenantId' | 'accessKey' | 'agentLoginUrl' | 'agentPhoneNumber'
+    >,
+    externalUserId?: string,
+  ): TubelightVoiceConfig {
+    if (!externalUserId) {
+      throw new Error(
+        'External user ID (agent email) is required for Tubelight voice calls',
+      );
+    }
+
+    return {
+      ...baseConfig,
+      external_user_id: externalUserId,
+    };
+  }
 }

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

@@ -39,7 +39,7 @@ export class FieldMapperService extends EntityServiceImpl {
   async createFieldMappers(dtos: FieldMapperDto[], loggedInUser: UserData) {
     let result: BaseEntity[] = [];
     for (const dto of dtos) {
-      const fieldMapper = await super.createEntity(dto, loggedInUser);
+      const fieldMapper = await this.createEntity(dto, loggedInUser);
       result.push(fieldMapper);
     }
     return result;