rez_core 3.1.70 → 3.1.76

package/package.json

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

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

@@ -38,19 +38,46 @@ export class IntegrationController {
   @Post('send')
   @HttpCode(HttpStatus.OK)
   async sendMessage(@Body() sendMessageDto: GenericSendMessageDto) {
-    return this.integrationService.sendGenericMessage(sendMessageDto);
+    try {
+      return await this.integrationService.sendGenericMessage(sendMessageDto);
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'SEND_MESSAGE_ERROR',
+        message: error.message || 'Failed to send message',
+        code: 'MESSAGE_SEND_ERROR',
+      });
+    }
   }
 
   @Post('send/bulk')
   @HttpCode(HttpStatus.OK)
   async sendBulkMessage(@Body() bulkMessageDto: BulkMessageDto) {
-    return this.integrationService.sendBulkMessage(bulkMessageDto);
+    try {
+      return await this.integrationService.sendBulkMessage(bulkMessageDto);
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'SEND_BULK_MESSAGE_ERROR',
+        message: error.message || 'Failed to send bulk messages',
+        code: 'BULK_MESSAGE_SEND_ERROR',
+      });
+    }
   }
 
   @Post('send/scheduled')
   @HttpCode(HttpStatus.OK)
   async scheduleMessage(@Body() scheduledMessageDto: ScheduledMessageDto) {
-    return this.integrationService.scheduleMessage(scheduledMessageDto);
+    try {
+      return await this.integrationService.scheduleMessage(scheduledMessageDto);
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'SCHEDULE_MESSAGE_ERROR',
+        message: error.message || 'Failed to schedule message',
+        code: 'MESSAGE_SCHEDULE_ERROR',
+      });
+    }
   }
 
   @Post('send/template')
@@ -67,7 +94,16 @@ export class IntegrationController {
       type?: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE';
     },
   ) {
-    return this.integrationService.sendTemplateMessage(templateMessage);
+    try {
+      return await this.integrationService.sendTemplateMessage(templateMessage);
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'SEND_TEMPLATE_MESSAGE_ERROR',
+        message: error.message || 'Failed to send template message',
+        code: 'TEMPLATE_MESSAGE_SEND_ERROR',
+      });
+    }
   }
 
   @Post('check-agent-status')
@@ -162,7 +198,16 @@ export class IntegrationController {
 
   @Get('supported-combinations')
   async getSupportedCombinations() {
-    return this.integrationService.getSupportedCombinations();
+    try {
+      return await this.integrationService.getSupportedCombinations();
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_COMBINATIONS_ERROR',
+        message: error.message || 'Failed to get supported combinations',
+        code: 'FETCH_ERROR',
+      });
+    }
   }
 
   @Get('level/:id/:type/configs')
@@ -174,11 +219,20 @@ export class IntegrationController {
     configType?: 'WA' | 'SMS' | 'EMAIL' | 'TELEPHONE',
     @Query('provider') provider?: string,
   ) {
-    return this.integrationService.getLevelConfigs(levelId, levelType, {
-      app_code,
-      integration_type: configType,
-      integration_provider: provider,
-    });
+    try {
+      return await this.integrationService.getLevelConfigs(levelId, levelType, {
+        app_code,
+        integration_type: configType,
+        integration_provider: provider,
+      });
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_LEVEL_CONFIGS_ERROR',
+        message: error.message || 'Failed to get level configurations',
+        code: 'FETCH_ERROR',
+      });
+    }
   }
 
   @Get('config/:id')
@@ -242,17 +296,35 @@ export class IntegrationController {
   @Post('sendgrid/verified-senders')
   @HttpCode(HttpStatus.OK)
   async getSendGridVerifiedSenders(@Body() dto: SendGridVerifiedSendersDto) {
-    return this.integrationService.getSendGridVerifiedSenders(dto.apiKey);
+    try {
+      return await this.integrationService.getSendGridVerifiedSenders(dto.apiKey);
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_SENDGRID_SENDERS_ERROR',
+        message: error.message || 'Failed to get SendGrid verified senders',
+        code: 'SENDGRID_ERROR',
+      });
+    }
   }
 
   @Post('sendgrid/templates')
   @HttpCode(HttpStatus.OK)
   async getSendGridTemplates(@Body() dto: SendGridTemplatesDto) {
-    return this.integrationService.getSendGridTemplates(
-      dto.levelId,
-      dto.levelType,
-      dto.app_code,
-    );
+    try {
+      return await this.integrationService.getSendGridTemplates(
+        dto.levelId,
+        dto.levelType,
+        dto.app_code,
+      );
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_SENDGRID_TEMPLATES_ERROR',
+        message: error.message || 'Failed to get SendGrid templates',
+        code: 'SENDGRID_ERROR',
+      });
+    }
   }
 
   @Post('config/delete/:configId')
@@ -464,15 +536,24 @@ export class IntegrationController {
     @Query('integration_type')
     integration_type?: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE',
   ) {
-    const loggedInUser = req.user.userData;
+    try {
+      const loggedInUser = req.user.userData;
 
-    const allIntegrationData =
-      await this.integrationService.getAllIntegrationData(
-        loggedInUser,
-        integration_type,
-      );
+      const allIntegrationData =
+        await this.integrationService.getAllIntegrationData(
+          loggedInUser,
+          integration_type,
+        );
 
-    return allIntegrationData;
+      return allIntegrationData;
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_ALL_INTEGRATIONS_ERROR',
+        message: error.message || 'Failed to get all integrations',
+        code: 'FETCH_ERROR',
+      });
+    }
   }
 
   @Get('provider-urls')

package/src/module/integration/strategies/email/sendgrid-api.strategy.ts

@@ -25,6 +25,9 @@ export class SendGridApiStrategy implements IntegrationStrategy {
 
       } = config;
 
+      console.log("Rich Text:", richText);
+      console.log("Message: ", message);
+
       if (!apiKey || !fromEmail) {
         throw new Error(
           'Missing required SendGrid credentials: apiKey and fromEmail are required',

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

@@ -98,7 +98,7 @@ export class FieldMapperService extends EntityServiceImpl {
 
       // Case 1️⃣ direct mapping (no mapped_entity_type or equal)
       if (
-        !inMemory[entityType][filterCode] ||
+        !inMemory[entityType][filterCode] &&
         field.mapped_entity_type == field.mapper_entity_type
       ) {
         inMemory[entityType][filterCode] = await super.getResolvedEntityData(

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

@@ -54,7 +54,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
   ): Promise<WorkflowAutomation[]> {
     return this.wfRepo.find({
       where: {
-        mapped_entity_type: entityType,
+        applicable_entity_type: entityType,
         trigger_event: event,
         organization_id: loggedInUser.organization_id,
       },