Fixed logger service instantiation.

Author: digitalnomad91

src/notifications/notifications.service.ts

@@ -9,15 +9,17 @@ import { CreateSubscriptionDto } from './dto/create-subscription.dto';
 import { MassNotificationDto } from './dto/mass-notification.dto';
 import webpush, { WebPushError } from 'web-push';
 import admin from 'firebase-admin';
+import { LoggerService } from '../common/logger/logger.service';
 
 @Injectable()
 export class NotificationsService {
-  private readonly logger = new Logger(NotificationsService.name);
+  //private readonly logger = new Logger(NotificationsService.name);
 
   constructor(
     private readonly db: DatabaseService,
     @Inject(WEB_PUSH) private readonly webPush: typeof webpush,
-    @Inject(FIREBASE_ADMIN) private readonly firebase: typeof admin
+    @Inject(FIREBASE_ADMIN) private readonly firebase: typeof admin,
+    private readonly logger: LoggerService
   ) {}
 
   getPublicKey(): string | undefined {
@@ -60,17 +62,17 @@ export class NotificationsService {
   }
 
   async sendNotification(subscription: SubscriptionRecord, notificationPayload: NotificationPayload): Promise<void> {
-  this.logger.info(`Sending notification to subscription ${subscription.id} (type: ${subscription.type})`);
-  this.logger.info(`Subscription endpoint: ${subscription.endpoint}`);
-  this.logger.info(`Notification payload: ${JSON.stringify(notificationPayload)}`);
+    this.logger.info(`Sending notification to subscription ${subscription.id} (type: ${subscription.type})`);
+    this.logger.info(`Subscription endpoint: ${subscription.endpoint}`);
+    this.logger.info(`Notification payload: ${JSON.stringify(notificationPayload)}`);
 
     try {
       if (subscription.type === 'web') {
-  this.logger.info(`Processing web push notification for subscription ${subscription.id}`);
+        this.logger.info(`Processing web push notification for subscription ${subscription.id}`);
         if (!isWebKeys(subscription.keys)) {
           throw new Error(`Invalid keys for web subscription: ${JSON.stringify(subscription.keys)}`);
         }
-  this.logger.info(`Web push keys are valid for subscription ${subscription.id}`);
+        this.logger.info(`Web push keys are valid for subscription ${subscription.id}`);
         await this.webPush.sendNotification(
           {
             endpoint: subscription.endpoint,
@@ -81,9 +83,9 @@ export class NotificationsService {
           },
           JSON.stringify(notificationPayload)
         );
-  this.logger.info(`Web push notification sent successfully for subscription ${subscription.id}`);
+        this.logger.info(`Web push notification sent successfully for subscription ${subscription.id}`);
       } else if (subscription.type === 'fcm') {
-  this.logger.info(`Processing FCM notification for subscription ${subscription.id}`);
+        this.logger.info(`Processing FCM notification for subscription ${subscription.id}`);
         if (!isFcmKeys(subscription.keys)) {
           throw new Error(`Invalid keys for FCM subscription: ${JSON.stringify(subscription.keys)}`);
         }
@@ -113,7 +115,7 @@ export class NotificationsService {
             },
           },
         };
-  this.logger.info(`FCM message payload: ${JSON.stringify(message)}`);
+        this.logger.info(`FCM message payload: ${JSON.stringify(message)}`);
 
         const response = await this.firebase.messaging().send(message);
         this.logger.info(
@@ -134,7 +136,7 @@ export class NotificationsService {
     if (subscription.type === 'web' && error instanceof WebPushError) {
       if (error.statusCode === 410) {
         await this.db.subscription.delete({ where: { id: subscription.id } });
-  this.logger.info(`Removed expired web subscription id=${subscription.id}`);
+        this.logger.info(`Removed expired web subscription id=${subscription.id}`);
       } else {
         this.logger.warn(`Web push send failed (id=${subscription.id}): ${error.statusCode} ${error.body}`);
       }
@@ -146,7 +148,7 @@ export class NotificationsService {
         error?.code === 'messaging/registration-token-not-registered'
       ) {
         await this.db.subscription.delete({ where: { id: subscription.id } });
-  this.logger.info(`Removed invalid FCM subscription id=${subscription.id}`);
+        this.logger.info(`Removed invalid FCM subscription id=${subscription.id}`);
       } else {
         this.logger.warn(`FCM send failed (id=${subscription.id}): ${error?.code || error}`);
       }
@@ -156,11 +158,11 @@ export class NotificationsService {
   }
 
   async sendMassNotification(dto: MassNotificationDto) {
-  this.logger.info(`Starting mass notification process`);
-  this.logger.info(`Mass notification DTO: ${JSON.stringify(dto)}`);
+    this.logger.info(`Starting mass notification process`);
+    this.logger.info(`Mass notification DTO: ${JSON.stringify(dto)}`);
 
     const subscriptions = await this.listSubscriptions();
-  this.logger.info(`Found ${subscriptions.length} subscriptions in database`);
+    this.logger.info(`Found ${subscriptions.length} subscriptions in database`);
     this.logger.info(
       `Subscriptions details:`,
       subscriptions.map((sub) => ({
@@ -179,7 +181,7 @@ export class NotificationsService {
       badge: dto.badge || 'https://new.codebuilder.org/images/logo2.png',
     };
 
-  this.logger.info(`Prepared notification payload: ${JSON.stringify(payload)}`);
+    this.logger.info(`Prepared notification payload: ${JSON.stringify(payload)}`);
 
     try {
       const results = await Promise.allSettled(subscriptions.map((sub) => this.sendNotification(sub, payload)));