danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix the send email problem

Browse Source
This commit is contained in:
Mahyargdz
2025-05-14 14:59:58 +03:30
parent 9bd662f872
commit 22ba9e52dc
6 changed files with 169 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/notifications/constants/index.ts
+1
View File
@@ -1,6 +1,7 @@
export const NOTIFICATION = Object.freeze({
QUEUE_NAME: "notification",
SEND_NOTIFICATION_JOB_NAME: "sendNotification",
SEND_LOGIN_OTP_JOB_NAME: "sendLoginOtp",
SEND_NOTIFICATION_JOB_DELAY: 1000, // delay after 1 second
SEND_NOTIFICATION_JOB_PRIORITY: 1, // high priority
src/modules/notifications/interfaces/INotification-job-data.ts
+38
View File
@@ -0,0 +1,38 @@
import {
IAnnouncementNotificationData,
IBlogCommentNotificationData,
IInvoiceNotificationData,
INewCriticismNotificationData,
INewCustomerNotificationData,
INewSubscriptionNotificationData,
INewTicketNotificationData,
IPaymentNotificationData,
IServiceReviewNotificationData,
ISubscriptionNotificationData,
ITicketNotificationData,
IWalletNotificationData,
} from "./ISendNotificationData";
import { NotifType } from "../../settings/enums/notif-settings.enum";
export type NotificationJobData = {
type: NotifType;
recipientId: string;
data:
| IBlogCommentNotificationData
| IServiceReviewNotificationData
| INewCustomerNotificationData
| INewSubscriptionNotificationData
| ITicketNotificationData
| INewCriticismNotificationData
| IInvoiceNotificationData
| IAnnouncementNotificationData
| IWalletNotificationData
| ISubscriptionNotificationData
| IPaymentNotificationData
| INewTicketNotificationData;
};
export type OtpJobData = {
phone: string;
code: string;
};
src/modules/notifications/queue/notification.processor.ts
+113 -104
View File
@@ -6,7 +6,9 @@ import { DataSource } from "typeorm";
import { WorkerProcessor } from "../../../common/queues/worker.processor";
import { LoggerService } from "../../logger/logger.service";
import { NotifType } from "../../settings/enums/notif-settings.enum";
import { SmsService } from "../../utils/providers/sms.service";
import { NOTIFICATION } from "../constants";
import { NotificationJobData, OtpJobData } from "../interfaces/INotification-job-data";
import {
IAnnouncementNotificationData,
IBlogCommentNotificationData,
@@ -23,24 +25,6 @@ import {
} from "../interfaces/ISendNotificationData";
import { NotificationsService } from "../providers/notifications.service";
type NotificationJobData = {
type: NotifType;
recipientId: string;
data:
| IBlogCommentNotificationData
| IServiceReviewNotificationData
| INewCustomerNotificationData
| INewSubscriptionNotificationData
| ITicketNotificationData
| INewCriticismNotificationData
| IInvoiceNotificationData
| IAnnouncementNotificationData
| IWalletNotificationData
| ISubscriptionNotificationData
| IPaymentNotificationData
| INewTicketNotificationData;
};
@Processor(NOTIFICATION.QUEUE_NAME, {
concurrency: NOTIFICATION.SEND_NOTIFICATION_JOB_CONCURRENCY,
lockDuration: NOTIFICATION.SEND_NOTIFICATION_JOB_LOCK_DURATION,
@@ -54,11 +38,12 @@ export class NotificationProcessor extends WorkerProcessor {
private readonly notificationsService: NotificationsService,
private readonly dataSource: DataSource,
protected readonly loggerService: LoggerService,
private readonly smsService: SmsService,
) {
super();
}
async process(job: Job<NotificationJobData>, token?: string) {
async process(job: Job<NotificationJobData | OtpJobData>, token?: string) {
this.logger.log(`Processing notification job: ${job.id} ${token ? `with token: ${token}` : ""}`);
const queryRunner = this.dataSource.createQueryRunner();
let heartbeat: NodeJS.Timeout | undefined;
@@ -71,91 +56,115 @@ export class NotificationProcessor extends WorkerProcessor {
heartbeat = setInterval(() => job.updateProgress(50), 10000);
//
const { type, recipientId, data } = job.data;
switch (type) {
// Admin Notifications
case NotifType.NEW_BLOG_COMMENT:
await this.notificationsService.createNewBlogCommentNotification(recipientId, data as IBlogCommentNotificationData, queryRunner);
break;
case NotifType.NEW_SERVICE_REVIEW:
await this.notificationsService.createNewServiceReviewNotification(
recipientId,
data as IServiceReviewNotificationData,
queryRunner,
);
break;
case NotifType.NEW_CUSTOMER:
await this.notificationsService.createNewCustomerNotification(recipientId, data as INewCustomerNotificationData, queryRunner);
break;
case NotifType.NEW_SUBSCRIPTION:
await this.notificationsService.createNewSubscriptionNotification(
recipientId,
data as INewSubscriptionNotificationData,
queryRunner,
);
break;
case NotifType.NEW_CRITICISM:
await this.notificationsService.createNewCriticismNotification(recipientId, data as INewCriticismNotificationData, queryRunner);
break;
case NotifType.NEW_TICKET:
await this.notificationsService.createNewTicketGlobalNotification(recipientId, data as INewTicketNotificationData, queryRunner);
break;
// User Notifications
case NotifType.USER_LOGIN:
await this.notificationsService.createLoginNotification(recipientId, data);
break;
case NotifType.ANNOUNCEMENT:
await this.notificationsService.createAnnouncementNotification(recipientId, data as IAnnouncementNotificationData, queryRunner);
break;
// Wallet Notifications
case NotifType.WALLET_CHARGE:
await this.notificationsService.createWalletChargeNotification(recipientId, data as IWalletNotificationData, queryRunner);
break;
case NotifType.WALLET_DEDUCTION:
await this.notificationsService.createWalletDeductionNotification(recipientId, data as IWalletNotificationData, queryRunner);
break;
// Ticket Notifications
case NotifType.ANSWER_TICKET:
await this.notificationsService.createAnswerTicketNotification(recipientId, data as ITicketNotificationData, queryRunner);
break;
case NotifType.CREATE_TICKET:
await this.notificationsService.createTicketNotification(recipientId, data as ITicketNotificationData, queryRunner);
break;
case NotifType.ASSIGN_TICKET:
await this.notificationsService.createAssignTicketNotificationForAdmin(recipientId, data as ITicketNotificationData, queryRunner);
break;
// Invoice Notifications
case NotifType.CREATE_INVOICE:
await this.notificationsService.createInvoiceCreationNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.BILL_INVOICE_REMINDER:
await this.notificationsService.createBillInvoiceReminderNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.BILL_INVOICE:
await this.notificationsService.createBillInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.APPROVE_INVOICE:
await this.notificationsService.createApprovedInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.INVOICE_OVERDUE:
await this.notificationsService.createInvoiceOverdueNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.RECURRING_INVOICE:
await this.notificationsService.createRecurringInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
// Service Notifications
case NotifType.BLOCK_SERVICE:
await this.notificationsService.createBlockServiceNotification(recipientId, data as ISubscriptionNotificationData, queryRunner);
break;
// Payment Notifications
case NotifType.PAYMENT_REMINDER:
await this.notificationsService.createPaymentReminderNotification(recipientId, data as IPaymentNotificationData, queryRunner);
break;
case NotifType.PAYMENT_CANCELLATION:
await this.notificationsService.createPaymentCancellationNotification(recipientId, data as IPaymentNotificationData, queryRunner);
break;
default:
this.logger.warn(`Unknown notification type: ${type}`);
if (job.name === NOTIFICATION.SEND_LOGIN_OTP_JOB_NAME) {
const { phone, code } = job.data as OtpJobData;
await this.smsService.sendSmsVerifyCode(phone, code);
//
} else if (job.name === NOTIFICATION.SEND_NOTIFICATION_JOB_NAME) {
const { type, recipientId, data } = job.data as NotificationJobData;
switch (type) {
// Admin Notifications
case NotifType.NEW_BLOG_COMMENT:
await this.notificationsService.createNewBlogCommentNotification(
recipientId,
data as IBlogCommentNotificationData,
queryRunner,
);
break;
case NotifType.NEW_SERVICE_REVIEW:
await this.notificationsService.createNewServiceReviewNotification(
recipientId,
data as IServiceReviewNotificationData,
queryRunner,
);
break;
case NotifType.NEW_CUSTOMER:
await this.notificationsService.createNewCustomerNotification(recipientId, data as INewCustomerNotificationData, queryRunner);
break;
case NotifType.NEW_SUBSCRIPTION:
await this.notificationsService.createNewSubscriptionNotification(
recipientId,
data as INewSubscriptionNotificationData,
queryRunner,
);
break;
case NotifType.NEW_CRITICISM:
await this.notificationsService.createNewCriticismNotification(recipientId, data as INewCriticismNotificationData, queryRunner);
break;
case NotifType.NEW_TICKET:
await this.notificationsService.createNewTicketGlobalNotification(recipientId, data as INewTicketNotificationData, queryRunner);
break;
// User Notifications
case NotifType.USER_LOGIN:
await this.notificationsService.createLoginNotification(recipientId, data);
break;
case NotifType.ANNOUNCEMENT:
await this.notificationsService.createAnnouncementNotification(recipientId, data as IAnnouncementNotificationData, queryRunner);
break;
// Wallet Notifications
case NotifType.WALLET_CHARGE:
await this.notificationsService.createWalletChargeNotification(recipientId, data as IWalletNotificationData, queryRunner);
break;
case NotifType.WALLET_DEDUCTION:
await this.notificationsService.createWalletDeductionNotification(recipientId, data as IWalletNotificationData, queryRunner);
break;
// Ticket Notifications
case NotifType.ANSWER_TICKET:
await this.notificationsService.createAnswerTicketNotification(recipientId, data as ITicketNotificationData, queryRunner);
break;
case NotifType.CREATE_TICKET:
await this.notificationsService.createTicketNotification(recipientId, data as ITicketNotificationData, queryRunner);
break;
case NotifType.ASSIGN_TICKET:
await this.notificationsService.createAssignTicketNotificationForAdmin(
recipientId,
data as ITicketNotificationData,
queryRunner,
);
break;
// Invoice Notifications
case NotifType.CREATE_INVOICE:
await this.notificationsService.createInvoiceCreationNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.BILL_INVOICE_REMINDER:
await this.notificationsService.createBillInvoiceReminderNotification(
recipientId,
data as IInvoiceNotificationData,
queryRunner,
);
break;
case NotifType.BILL_INVOICE:
await this.notificationsService.createBillInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.APPROVE_INVOICE:
await this.notificationsService.createApprovedInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.INVOICE_OVERDUE:
await this.notificationsService.createInvoiceOverdueNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
case NotifType.RECURRING_INVOICE:
await this.notificationsService.createRecurringInvoiceNotification(recipientId, data as IInvoiceNotificationData, queryRunner);
break;
// Service Notifications
case NotifType.BLOCK_SERVICE:
await this.notificationsService.createBlockServiceNotification(recipientId, data as ISubscriptionNotificationData, queryRunner);
break;
// Payment Notifications
case NotifType.PAYMENT_REMINDER:
await this.notificationsService.createPaymentReminderNotification(recipientId, data as IPaymentNotificationData, queryRunner);
break;
case NotifType.PAYMENT_CANCELLATION:
await this.notificationsService.createPaymentCancellationNotification(
recipientId,
data as IPaymentNotificationData,
queryRunner,
);
break;
default:
this.logger.warn(`Unknown notification type: ${type}`);
}
} else {
this.logger.warn(`Unknown job name: ${job.name}`);
}
await queryRunner.commitTransaction();
return true;
src/modules/notifications/queue/notification.queue.ts
+12 -2
View File
@@ -44,6 +44,18 @@ export class NotificationQueue {
);
}
//*********************************** */
async addLoginOtpNotification(data: { phone: string; code: string }) {
await this.notificationsQueue.add(NOTIFICATION.SEND_LOGIN_OTP_JOB_NAME, data, {
delay: NOTIFICATION.SEND_NOTIFICATION_JOB_DELAY,
attempts: NOTIFICATION.SEND_NOTIFICATION_JOB_ATTEMPTS,
backoff: {
type: "exponential",
delay: NOTIFICATION.SEND_NOTIFICATION_JOB_BACKOFF,
},
priority: NOTIFICATION.SEND_NOTIFICATION_JOB_PRIORITY,
});
}
// Admin notification methods
async addNewBlogCommentNotification(recipientId: string, data: IBlogCommentNotificationData) {
await this.addNotificationJob(NotifType.NEW_BLOG_COMMENT, recipientId, data);
@@ -78,8 +90,6 @@ export class NotificationQueue {
await this.addNotificationJob(NotifType.CREATE_INVOICE, recipientId, data);
}
//TODO:USE THIS
async addAnnouncementNotification(recipientId: string, data: IAnnouncementNotificationData) {
await this.addNotificationJob(NotifType.ANNOUNCEMENT, recipientId, data);
}