rez_core 3.1.193 → 3.1.195

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

@@ -1,27 +1,27 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Otp } from '../entity/otp.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class OtpRepository {
-  constructor(
-    @InjectRepository(Otp) private readonly otpRepository: Repository<Otp>,
-  ) {}
-
-  async save(otp: Otp) {
-    return await this.otpRepository.save(otp);
-  }
-
-  async findByOtpId(otpId: string) {
-    return await this.otpRepository.findOne({
-      where: {
-        otp_id: otpId,
-      },
-    });
-  }
-
-  async update(id: number, otp: Otp) {
-    return await this.otpRepository.update(id, otp);
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Otp } from '../entity/otp.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class OtpRepository {
+  constructor(
+    @InjectRepository(Otp) private readonly otpRepository: Repository<Otp>,
+  ) {}
+
+  async save(otp: Otp) {
+    return await this.otpRepository.save(otp);
+  }
+
+  async findByOtpId(otpId: string) {
+    return await this.otpRepository.findOne({
+      where: {
+        otp_id: otpId,
+      },
+    });
+  }
+
+  async update(id: number, otp: Otp) {
+    return await this.otpRepository.update(id, otp);
+  }
+}

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

@@ -1,127 +1,127 @@
-import { Injectable } from '@nestjs/common';
-import { MailerService } from '@nestjs-modules/mailer';
-import * as Handlebars from 'handlebars';
-import { DataSource } from 'typeorm';
-import { IcsMeetingService } from 'src/module/ics/service/ics.service';
-
-@Injectable()
-export class EmailService {
-  constructor(
-    private readonly mailerService: MailerService,
-    private readonly datasource: DataSource,
-    private readonly icsService: IcsMeetingService,
-  ) {}
-
-  async sendEmail(
-    email: string,
-    subject: string,
-    context?: any,
-    icsPayload?: any,
-  ) {
-    const template = await this.datasource
-      .getRepository('cr_wf_comm_template')
-      .findOne({ where: { code: 'OTP_TEMPLATE' } });
-
-    if (!template) return;
-
-    const compiled = Handlebars.compile(template.rich_text || '');
-    const htmlContent = compiled(context);
-
-    const attachments: any[] = [];
-
-    if (icsPayload) {
-      const icsBase64 = await this.icsService.generateIcs(icsPayload);
-      if (icsBase64) {
-        attachments.push({
-          filename: 'invite.ics',
-          content: icsBase64,
-          encoding: 'base64',
-          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
-        });
-      }
-    }
-
-    // fire-and-forget // removed await
-    const result = this.mailerService
-      .sendMail({
-        to: email,
-        subject,
-        html: htmlContent,
-        attachments,
-      })
-      .then(() => {
-        console.log(`Email sent to ${email}`);
-        return;
-      })
-      .catch((err) => {
-        console.error(`Failed to send email to ${email}`, err);
-        // Optionally: push to a retry queue, Sentry, DB log, etc.
-      });
-
-    console.log(result); // Return immediately (parent doesn’t block)
-    return;
-  }
-
-  async sendEmailWithDynamicTemplate(
-    email: string,
-    subject: string,
-    templateCode: string,
-    cc?: string[],
-    bcc?: string[],
-    message?: string,
-    context?: any,
-    icsPayload?: any,
-  ) {
-    // retrieve the rich_text from the database table cr_wf_comm_template for the given templateCode
-    const template = await this.datasource
-      .getRepository('cr_wf_comm_template')
-      .findOne({ where: { code: templateCode } });
-
-    if (!template) {
-      console.log(`Template with code ${templateCode} not found`);
-      return {
-        success: false,
-        message: `Template with code ${templateCode} not found`,
-      };
-    }
-
-    // Compile the template string with Handlebars
-    const templateString = template.rich_text || '';
-    const compiled = Handlebars.compile(message || templateString);
-    const htmlContent = compiled(context);
-
-    // Attachments (ICS optional)
-    const attachments: any[] = [];
-    if (icsPayload) {
-      const icsBase64 = await this.icsService.generateIcs(icsPayload);
-      if (icsBase64) {
-        attachments.push({
-          filename: 'invite.ics',
-          content: icsBase64,
-          encoding: 'base64',
-          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
-        });
-      }
-    }
-
-    const mailOptions: any = {
-      to: email,
-      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' };
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { MailerService } from '@nestjs-modules/mailer';
+import * as Handlebars from 'handlebars';
+import { DataSource } from 'typeorm';
+import { IcsMeetingService } from 'src/module/ics/service/ics.service';
+
+@Injectable()
+export class EmailService {
+  constructor(
+    private readonly mailerService: MailerService,
+    private readonly datasource: DataSource,
+    private readonly icsService: IcsMeetingService,
+  ) {}
+
+  async sendEmail(
+    email: string,
+    subject: string,
+    context?: any,
+    icsPayload?: any,
+  ) {
+    const template = await this.datasource
+      .getRepository('cr_wf_comm_template')
+      .findOne({ where: { code: 'OTP_TEMPLATE' } });
+
+    if (!template) return;
+
+    const compiled = Handlebars.compile(template.rich_text || '');
+    const htmlContent = compiled(context);
+
+    const attachments: any[] = [];
+
+    if (icsPayload) {
+      const icsBase64 = await this.icsService.generateIcs(icsPayload);
+      if (icsBase64) {
+        attachments.push({
+          filename: 'invite.ics',
+          content: icsBase64,
+          encoding: 'base64',
+          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
+        });
+      }
+    }
+
+    // fire-and-forget // removed await
+    const result = this.mailerService
+      .sendMail({
+        to: email,
+        subject,
+        html: htmlContent,
+        attachments,
+      })
+      .then(() => {
+        console.log(`Email sent to ${email}`);
+        return;
+      })
+      .catch((err) => {
+        console.error(`Failed to send email to ${email}`, err);
+        // Optionally: push to a retry queue, Sentry, DB log, etc.
+      });
+
+    console.log(result); // Return immediately (parent doesn’t block)
+    return;
+  }
+
+  async sendEmailWithDynamicTemplate(
+    email: string,
+    subject: string,
+    templateCode: string,
+    cc?: string[],
+    bcc?: string[],
+    message?: string,
+    context?: any,
+    icsPayload?: any,
+  ) {
+    // retrieve the rich_text from the database table cr_wf_comm_template for the given templateCode
+    const template = await this.datasource
+      .getRepository('cr_wf_comm_template')
+      .findOne({ where: { code: templateCode } });
+
+    if (!template) {
+      console.log(`Template with code ${templateCode} not found`);
+      return {
+        success: false,
+        message: `Template with code ${templateCode} not found`,
+      };
+    }
+
+    // Compile the template string with Handlebars
+    const templateString = template.rich_text || '';
+    const compiled = Handlebars.compile(message || templateString);
+    const htmlContent = compiled(context);
+
+    // Attachments (ICS optional)
+    const attachments: any[] = [];
+    if (icsPayload) {
+      const icsBase64 = await this.icsService.generateIcs(icsPayload);
+      if (icsBase64) {
+        attachments.push({
+          filename: 'invite.ics',
+          content: icsBase64,
+          encoding: 'base64',
+          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
+        });
+      }
+    }
+
+    const mailOptions: any = {
+      to: email,
+      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

@@ -1,138 +1,164 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-import { MediaDataService } from 'src/module/meta/service/media-data.service';
-import * as admin from 'firebase-admin';
-
-@Injectable()
-export class NotificationsService {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly mediaDataService: MediaDataService,
-    @Inject('FIREBASE_ADMIN') private readonly firebaseAdmin: typeof admin,
-  ) {}
-
-  private tokens: Map<string, string> = new Map(); // store in memory for now
-
-  async saveToken(userId: string | undefined, token: string) {
-    if (userId) {
-      this.tokens.set(userId, token);
-    }
-    return { success: true, token };
-  }
-
-  async sendToDevice(
-    token: string,
-    title: string,
-    body: string,
-    data?: Record<string, any>,
-  ) {
-    // Utility to sanitize FCM data payload
-    const sanitizeFCMData = (
-      payload: Record<string, any>,
-    ): Record<string, string> =>
-      Object.fromEntries(
-        Object.entries(payload).map(([k, v]) => {
-          if (v === null || v === undefined) return [k, '']; // fallback for null/undefined
-          if (typeof v === 'object') return [k, JSON.stringify(v)]; // preserve structure
-          return [k, String(v)]; // numbers, booleans, strings
-        }),
-      );
-
-    const message: admin.messaging.Message = {
-      token,
-      notification: { title, body }, // system notification
-      data: data ? sanitizeFCMData(data) : undefined,
-    };
-
-    try {
-      return await this.firebaseAdmin.messaging().send(message);
-    } catch (error) {
-      console.error('Error sending FCM message:', error);
-      throw error;
-    }
-  }
-
-  // Helper: send to a registered user by userId
-  async sendToUser(userId: string, title: string, body: string) {
-    const token = this.tokens.get(userId);
-    if (!token) return { error: 'No token found for user' };
-
-    return this.sendToDevice(token, title, body);
-  }
-
-  async getAllNotifications(
-    loggedInUser: any,
-    filterQuery?: {
-      is_read?: string;
-    },
-  ) {
-    // if no filterQuery provided, return all notifications
-    const { id, level_id, level_type } = loggedInUser;
-
-    // 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,
-      u.profile_image AS user_profile
-    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 = ?
-  `;
-
-    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) {
-      // Ensure is_read is returned as boolean
-      notification.is_read = !!notification.is_read;
-
-      if (notification.user_profile) {
-        if (!mediaCache.has(notification.user_profile)) {
-          const url = await this.mediaDataService.getMediaDownloadUrl(
-            notification.user_profile,
-            loggedInUser,
-          );
-          mediaCache.set(notification.user_profile, url);
-        }
-        notification.user_profile = mediaCache.get(notification.user_profile);
-      } else {
-        notification.user_profile = null;
-      }
-    }
-
-    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 };
-  }
-}
+import { Inject, Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import * as admin from 'firebase-admin';
+import axios from 'axios';
+import { ConfigService } from '@nestjs/config';
+
+@Injectable()
+export class NotificationsService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly mediaDataService: MediaDataService,
+    private readonly configService: ConfigService,
+    @Inject('FIREBASE_ADMIN') private readonly firebaseAdmin: typeof admin,
+  ) {}
+
+  private tokens: Map<string, string> = new Map(); // store in memory for now
+
+  async saveToken(userId: string | undefined, token: string) {
+    if (userId) {
+      this.tokens.set(userId, token);
+    }
+    return { success: true, token };
+  }
+
+  async sendToDevice(
+    token: string,
+    title: string,
+    body: string,
+    data?: Record<string, any>,
+  ) {
+    // Utility to sanitize FCM data payload
+    const sanitizeFCMData = (
+      payload: Record<string, any>,
+    ): Record<string, string> =>
+      Object.fromEntries(
+        Object.entries(payload).map(([k, v]) => {
+          if (v === null || v === undefined) return [k, '']; // fallback for null/undefined
+          if (typeof v === 'object') return [k, JSON.stringify(v)]; // preserve structure
+          return [k, String(v)]; // numbers, booleans, strings
+        }),
+      );
+
+    const message: admin.messaging.Message = {
+      token,
+      notification: { title, body }, // system notification
+      data: data ? sanitizeFCMData(data) : undefined,
+    };
+
+    try {
+      return await this.firebaseAdmin.messaging().send(message);
+    } catch (error) {
+      console.error('Error sending FCM message:', error);
+      throw error;
+    }
+  }
+
+  // Helper: send to a registered user by userId
+  async sendToUser(userId: string, title: string, body: string) {
+    const token = this.tokens.get(userId);
+    if (!token) return { error: 'No token found for user' };
+
+    return this.sendToDevice(token, title, body);
+  }
+
+  async getAllNotifications(
+    loggedInUser: any,
+    filterQuery?: {
+      is_read?: string;
+    },
+  ) {
+    // if no filterQuery provided, return all notifications
+    const { id, level_id, level_type } = loggedInUser;
+
+    // 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.*
+    FROM cr_notification n
+    WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
+  `;
+
+    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) {
+      // Ensure is_read is returned as boolean
+      notification.is_read = !!notification.is_read;
+
+      // if (notification.user_profile) {
+      //   if (!mediaCache.has(notification.user_profile)) {
+      //     const url = await this.mediaDataService.getMediaDownloadUrl(
+      //       notification.user_profile,
+      //       loggedInUser,
+      //     );
+      //     mediaCache.set(notification.user_profile, url);
+      //   }
+      //   notification.user_profile = mediaCache.get(notification.user_profile);
+      // } else {
+      //   notification.user_profile = null;
+      // }
+
+      try {
+        const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+        // Prepare the query string
+        const queryParams = new URLSearchParams({
+          loggedInUser: JSON.stringify(loggedInUser),
+        }).toString();
+
+        // Make the GET request with query parameters
+        const response = await axios.get(
+          `${baseUrl}/users/profile-image-url/${notification?.user_id}?entity_type=UPR&${queryParams}`,
+          {
+            headers: {
+              'Content-Type': 'application/json',
+            },
+          },
+        );
+
+        console.log('✅ Internal Entity API response:', response.data);
+        notification.user_name = response.data.name;
+        notification.user_profile = response.data.profile_image;
+      } catch (error) {
+        console.error('⚠️ Internal Entity API call failed:', error.message);
+      }
+    }
+
+    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 };
+  }
+}