diff --git a/package.json b/package.json index 765b989..c08d04c 100755 --- a/package.json +++ b/package.json @@ -128,5 +128,5 @@ "git add ." ] }, - "packageManager": "pnpm@9.15.3+sha512.1f79bc245a66eb0b07c5d4d83131240774642caaa86ef7d0434ab47c0d16f66b04e21e0c086eb61e62c77efc4d7f7ec071afad3796af64892fae66509173893a" + "packageManager": "pnpm@9.15.9+sha512.68046141893c66fad01c079231128e9afb89ef87e2691d69e4d40eee228988295fd4682181bae55b58418c3a253bde65a505ec7c5f9403ece5cc3cd37dcf2531" } diff --git a/src/modules/notifications/notifications.module.ts b/src/modules/notifications/notifications.module.ts index 83a4c28..1981288 100755 --- a/src/modules/notifications/notifications.module.ts +++ b/src/modules/notifications/notifications.module.ts @@ -14,8 +14,6 @@ import { NotificationProcessor } from "./queue/notification.processor"; import { NotificationQueue } from "./queue/notification.queue"; import { NotificationRepository } from "./repositories/notifications.repository"; import { NotificationSetting } from "../settings/entities/notification-setting.entity"; -import { EmailService } from "../utils/providers/email.service"; -import { SmsService } from "../utils/providers/sms.service"; @Module({ imports: [ @@ -38,7 +36,7 @@ import { SmsService } from "../utils/providers/sms.service"; UtilsModule, SettingModule, ], - providers: [NotificationRepository, NotificationsService, NotificationQueue, NotificationProcessor, SmsService, EmailService], + providers: [NotificationRepository, NotificationsService, NotificationQueue, NotificationProcessor], controllers: [NotificationController], exports: [NotificationRepository, NotificationsService, NotificationQueue], }) diff --git a/src/modules/utils/providers/international.utils.ts b/src/modules/utils/providers/international.utils.ts index cb2026e..00fe4b2 100755 --- a/src/modules/utils/providers/international.utils.ts +++ b/src/modules/utils/providers/international.utils.ts @@ -2,6 +2,20 @@ export function numberFormat(number: number, locale: string = "fa-IR") { return Intl.NumberFormat(locale).format(number); } -export function dateFormat(date: Date, locale: string = "fa-IR") { - return new Intl.DateTimeFormat(locale).format(date); +export function dateFormat(date: Date | string | number, locale: string = "fa-IR") { + try { + // Convert to Date object if it's a string or number + const dateObj = date instanceof Date ? date : new Date(date); + + // Check if the date is valid + if (isNaN(dateObj.getTime())) { + console.warn("Invalid date provided to dateFormat:", date); + return "Invalid Date"; + } + + return new Intl.DateTimeFormat(locale).format(dateObj); + } catch (error) { + console.error("Error formatting date:", error); + return "Invalid Date"; + } }