rez_core 2.2.197 → 2.2.198

package/package.json

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

package/src/module/communication/controller/communication.controller.ts

@@ -8,7 +8,6 @@ import {
   Param,
   ParseIntPipe,
   Post,
-  Put,
   Query,
 } from '@nestjs/common';
 import { CommunicationService } from '../service/communication.service';
@@ -18,10 +17,9 @@ import {
   GenericSendMessageDto,
   GmailOAuthInitDto,
   OutlookOAuthInitDto,
-  SendGridVerifiedSendersDto,
   SendGridTemplatesDto,
+  SendGridVerifiedSendersDto,
   UpdateConfigDto,
-  UpdateConfigStatusDto,
 } from '../dto/create-config.dto';
 
 export class ScheduledMessageDto extends GenericSendMessageDto {
@@ -232,10 +230,7 @@ export class CommunicationController {
   @Post('sendgrid/verified-senders')
   @HttpCode(HttpStatus.OK)
   async getSendGridVerifiedSenders(@Body() dto: SendGridVerifiedSendersDto) {
-    return this.communicationService.getSendGridVerifiedSenders(
-      dto.levelId,
-      dto.levelType,
-    );
+    return this.communicationService.getSendGridVerifiedSenders(dto.apiKey);
   }
 
   @Post('sendgrid/templates')

package/src/module/communication/dto/create-config.dto.ts

@@ -324,13 +324,9 @@ export class OutlookOAuthInitDto {
 }
 
 export class SendGridVerifiedSendersDto {
-  @IsNotEmpty()
-  @IsNumber()
-  levelId: number;
-
   @IsNotEmpty()
   @IsString()
-  levelType: string;
+  apiKey: string;
 }
 
 export class SendGridTemplatesDto {

package/src/module/communication/service/communication.service.ts

@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, Not } from 'typeorm';
+import { Not, Repository } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
 import { google } from 'googleapis';
 import {
@@ -1467,7 +1467,8 @@ export class CommunicationService {
     excludeHubId?: number,
   ): Promise<void> {
     // Find all active configurations of the same type for this level
-    const query = this.hubRepository.createQueryBuilder('hub')
+    const query = this.hubRepository
+      .createQueryBuilder('hub')
       .where('hub.level_id = :levelId', { levelId })
       .andWhere('hub.level_type = :levelType', { levelType })
       .andWhere('hub.communication_config_type = :configType', { configType })
@@ -1490,7 +1491,7 @@ export class CommunicationService {
           status: 1,
           ...(excludeHubId && { id: Not(excludeHubId) }),
         },
-        { status: 0 } // Deactivate
+        { status: 0 }, // Deactivate
       );
 
       this.logger.log(
@@ -1875,11 +1876,15 @@ export class CommunicationService {
   }> {
     try {
       // Find active SendGrid configurations for this level
-      const hubs = await this.getActiveHubs(levelId, levelType, CommunicationConfigType.EMAIL);
-      
+      const hubs = await this.getActiveHubs(
+        levelId,
+        levelType,
+        CommunicationConfigType.EMAIL,
+      );
+
       // Look for SendGrid provider
-      const sendGridHub = hubs.find(hub => hub.provider === 'sendgrid');
-      
+      const sendGridHub = hubs.find((hub) => hub.provider === 'sendgrid');
+
       if (!sendGridHub) {
         return {
           success: false,
@@ -1889,7 +1894,7 @@ export class CommunicationService {
 
       // Extract API key from configuration
       const apiKey = sendGridHub.config?.config_json?.apiKey;
-      
+
       if (!apiKey) {
         return {
           success: false,
@@ -1911,10 +1916,7 @@ export class CommunicationService {
     }
   }
 
-  async getSendGridVerifiedSenders(
-    levelId: number,
-    levelType: string,
-  ): Promise<{
+  async getSendGridVerifiedSenders(apiKey: string): Promise<{
     success: boolean;
     data?: Array<{
       label: string;
@@ -1923,22 +1925,6 @@ export class CommunicationService {
     error?: string;
   }> {
     try {
-      // Find active SendGrid configurations for this level
-      const hubs = await this.getActiveHubs(levelId, levelType, CommunicationConfigType.EMAIL);
-      
-      // Look for SendGrid provider
-      const sendGridHub = hubs.find(hub => hub.provider === 'sendgrid');
-      
-      if (!sendGridHub) {
-        return {
-          success: false,
-          error: 'No active SendGrid configuration found for this level',
-        };
-      }
-
-      // Extract API key from configuration
-      const apiKey = sendGridHub.config?.config_json?.apiKey;
-      
       if (!apiKey) {
         return {
           success: false,
@@ -1950,7 +1936,7 @@ export class CommunicationService {
       return this.sendGridApiStrategy.getVerifiedSenders(apiKey);
     } catch (error) {
       this.logger.error(
-        `Error fetching SendGrid verified senders for level ${levelId}/${levelType}:`,
+        `Error fetching SendGrid verified senders`,
         error.message,
       );
       return {