rez_core 2.2.185 → 2.2.187

package/package.json

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

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

@@ -11,6 +11,7 @@ import {
   Query,
 } from '@nestjs/common';
 import { CommunicationService } from '../service/communication.service';
+import { SendGridApiStrategy } from '../strategies/email/sendgrid-api.strategy';
 import {
   CreateConfigDto,
   UpdateConfigStatusDto,
@@ -18,6 +19,7 @@ import {
   BulkMessageDto,
   GmailOAuthInitDto,
   OutlookOAuthInitDto,
+  SendGridVerifiedSendersDto,
 } from '../dto/create-config.dto';
 
 export class ScheduledMessageDto extends GenericSendMessageDto {
@@ -27,7 +29,10 @@ export class ScheduledMessageDto extends GenericSendMessageDto {
 
 @Controller('communication')
 export class CommunicationController {
-  constructor(private readonly communicationService: CommunicationService) {}
+  constructor(
+    private readonly communicationService: CommunicationService,
+    private readonly sendGridApiStrategy: SendGridApiStrategy,
+  ) {}
 
   @Post('send')
   @HttpCode(HttpStatus.OK)
@@ -141,4 +146,10 @@ export class CommunicationController {
       initDto.email,
     );
   }
+
+  @Post('sendgrid/verified-senders')
+  @HttpCode(HttpStatus.OK)
+  async getSendGridVerifiedSenders(@Body() dto: SendGridVerifiedSendersDto) {
+    return this.sendGridApiStrategy.getVerifiedSenders(dto.apiKey);
+  }
 }

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

@@ -251,3 +251,29 @@ export class OutlookOAuthInitDto {
   @IsString()
   email?: string;
 }
+
+export class SendGridVerifiedSendersDto {
+  @IsNotEmpty()
+  @IsString()
+  apiKey: string;
+}
+
+export class VerifiedSenderDto {
+  @IsString()
+  label: string;
+
+  @IsString()
+  value: string;
+}
+
+export class VerifiedSendersResponseDto {
+  @IsBoolean()
+  success: boolean;
+
+  @IsOptional()
+  data?: VerifiedSenderDto[];
+
+  @IsOptional()
+  @IsString()
+  error?: string;
+}

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

@@ -1075,6 +1075,7 @@ export class CommunicationService {
         'https://www.googleapis.com/auth/gmail.send',
         'https://www.googleapis.com/auth/gmail.readonly',
         'https://www.googleapis.com/auth/userinfo.email',
+        'https://www.googleapis.com/auth/calendar',
       ];
 
       const authUrl = oauth2Client.generateAuthUrl({

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

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import * as sgMail from '@sendgrid/mail';
+import axios from 'axios';
 import {
   CommunicationStrategy,
   CommunicationResult,
@@ -114,4 +115,68 @@ export class SendGridApiStrategy implements CommunicationStrategy {
   validateConfig(config: any): boolean {
     return !!(config.apiKey && config.fromEmail);
   }
+
+  async getVerifiedSenders(apiKey: string): Promise<{
+    success: boolean;
+    data?: Array<{
+      label: string;
+      value: string;
+    }>;
+    error?: string;
+  }> {
+    try {
+      if (!apiKey) {
+        throw new Error('SendGrid API key is required');
+      }
+
+      const response = await axios.get(
+        'https://api.sendgrid.com/v3/verified_senders',
+        {
+          headers: {
+            Authorization: `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+
+      const verifiedSenders = response.data.results || response.data || [];
+
+      // Format the response for dropdown usage with label and value both as from_email
+      const formattedSenders = verifiedSenders
+        .filter((sender: any) => sender.verified === true)
+        .map((sender: any) => {
+          const fromEmail = sender.from_email || sender.email;
+          return {
+            label: fromEmail,
+            value: fromEmail,
+          };
+        });
+
+      return {
+        success: true,
+        data: formattedSenders,
+      };
+    } catch (error) {
+      let errorMessage = 'Failed to fetch verified senders';
+
+      if (error.response?.status === 401) {
+        errorMessage = 'Invalid SendGrid API key';
+      } else if (error.response?.status === 403) {
+        errorMessage = 'SendGrid API key does not have required permissions';
+      } else if (error.response?.data?.errors) {
+        errorMessage = error.response.data.errors
+          .map((err: any) => err.message)
+          .join(', ');
+      } else if (error.response?.data?.message) {
+        errorMessage = error.response.data.message;
+      } else if (error.message) {
+        errorMessage = error.message;
+      }
+
+      return {
+        success: false,
+        error: errorMessage,
+      };
+    }
+  }
 }

package/src/module/listmaster/service/list-master.service.ts

@@ -296,16 +296,13 @@ export class ListMasterService {
   async createEntity(entityData: any, loggedInUser: UserData): Promise<any> {
     // Trim and validate name and code
     const name = entityData.name?.trim();
-    const code = entityData.code?.trim();
+    // const code = entityData.code?.trim();
 
-    if (!name || !code) {
-      throw new BadRequestException(
-        'Name and Code are required and cannot be empty',
-      );
+    if (!name) {
+      throw new BadRequestException('Name is required and cannot be empty');
     }
 
     entityData.name = name;
-    entityData.code = code;
     entityData.is_factory = entityData.is_factory || 0;
     entityData.source = entityData.source || 'master';
     entityData.status = entityData.status || 'ACTIVE';

package/src/module/notification/controller/notification.controller.ts

@@ -1,4 +1,12 @@
-import { Body, Controller, Get, Post, Req, UseGuards } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Post,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { NotificationsService } from '../service/notification.service';
 
@@ -26,8 +34,18 @@ export class NotificationsController {
 
   @Get('all')
   @UseGuards(JwtAuthGuard)
-  async getNotifications(@Req() req: any) {
+  async getNotifications(@Req() req: any, @Query() filterQuery: any) {
     const loggedInUser = req.user.userData;
-    return this.notificationsService.getAllNotifications(loggedInUser);
+    return this.notificationsService.getAllNotifications(
+      loggedInUser,
+      filterQuery,
+    );
+  }
+
+  @Post('mark-all-read')
+  @UseGuards(JwtAuthGuard)
+  async markAllAsRead(@Req() req: any) {
+    const loggedInUser = req.user.userData;
+    return this.notificationsService.markAllAsRead(loggedInUser);
   }
 }

package/src/module/notification/controller/otp.controller.ts

@@ -62,8 +62,8 @@ export class OtpController {
     @Body()
     body: {
       to: string;
-      cc: string;
-      bcc: string;
+      cc?: string;
+      bcc?: string;
       subject: string;
       message: string;
       templateCode: string;

package/src/module/notification/service/email.service.ts

@@ -66,8 +66,8 @@ export class EmailService {
     email: string,
     subject: string,
     templateCode: string,
-    cc: string[] = [],
-    bcc: string[] = [],
+    cc?: string[],
+    bcc?: string[],
     message?: string,
     context?: any,
     icsPayload?: any,
@@ -104,15 +104,23 @@ export class EmailService {
       }
     }
 
-    // Send the email
-    await this.mailerService.sendMail({
+    const mailOptions: any = {
       to: email,
-      cc: cc.length > 0 ? cc : undefined,
-      bcc: bcc.length > 0 ? bcc : undefined,
       subject,
       html: htmlContent,
       attachments,
-    });
+    };
+
+    if (cc && cc.length > 0) {
+      mailOptions.cc = cc;
+    }
+
+    if (bcc && bcc.length > 0) {
+      mailOptions.bcc = bcc;
+    }
+
+    // Send the email
+    await this.mailerService.sendMail(mailOptions);
 
     return { success: true, message: 'Email sent successfully' };
   }

package/src/module/notification/service/notification.service.ts

@@ -37,11 +37,24 @@ export class NotificationsService {
     return this.sendToDevice(token, title, body);
   }
 
-  async getAllNotifications(loggedInUser: any) {
+  async getAllNotifications(
+    loggedInUser: any,
+    filterQuery?: {
+      is_read?: string;
+    },
+  ) {
+    // if no filterQuery provided, return all notifications
     const { id, level_id, level_type } = loggedInUser;
 
-    const notifications = await this.dataSource.query(
-      `
+    // Convert query param ("true"/"false") → SQL-friendly value (1/0)
+    let isReadFilter: number | undefined = undefined;
+    if (filterQuery && filterQuery.is_read !== undefined) {
+      const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
+      isReadFilter = isReadBool ? 1 : 0;
+    }
+
+    // Build query dynamically
+    let query = `
     SELECT
       n.*,
       u.name AS user_name,
@@ -49,15 +62,24 @@ export class NotificationsService {
     FROM cr_notification n
     LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
     WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
-    ORDER BY n.created_date DESC
-    `,
-      [id, level_id, 'SCH'],
-    );
+  `;
+
+    const params: any[] = [id, level_id, level_type];
+
+    if (isReadFilter !== undefined) {
+      query += ` AND n.is_read = ?`;
+      params.push(isReadFilter);
+    }
+
+    query += ` ORDER BY n.created_date DESC`;
+
+    const notifications = await this.dataSource.query(query, params);
 
     // Profile media enrichment
     const mediaCache = new Map();
     for (const notification of notifications) {
-      notification.is_read = true;
+      // Ensure is_read is returned as boolean
+      notification.is_read = !!notification.is_read;
 
       if (notification.user_profile) {
         if (!mediaCache.has(notification.user_profile)) {
@@ -73,18 +95,21 @@ export class NotificationsService {
       }
     }
 
-    // Batch update all fetched notifications
-    if (notifications.length > 0) {
-      await this.dataSource.query(
-        `
-      UPDATE cr_notification
-      SET is_read = 1
-      WHERE user_id = ? AND level_id = ? AND level_type = ?
-      `,
-        [id, level_id, level_type],
-      );
-    }
-
     return notifications;
   }
+
+  async markAllAsRead(loggedInUser: any) {
+    const { id, level_id, level_type } = loggedInUser;
+
+    const query = `
+    UPDATE cr_notification
+    SET is_read = 1
+    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+  `;
+
+    const params = [id, level_id, level_type];
+
+    const result = await this.dataSource.query(query, params);
+    return { success: true, affectedRows: result.affectedRows || 0 };
+  }
 }