@blackcode_sa/metaestetics-api 1.6.15 → 1.6.16

package/dist/admin/index.js

@@ -142,6 +142,64 @@ var UserRole = /* @__PURE__ */ ((UserRole2) => {
   return UserRole2;
 })(UserRole || {});
 
+// src/admin/logger/index.ts
+var firebaseFunctionsLogger;
+try {
+  firebaseFunctionsLogger = require("firebase-functions/logger");
+  require("firebase-functions/logger/compat");
+} catch (e) {
+}
+var Logger = class {
+  /**
+   * Log an error message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static error(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.error(message, data);
+    } else {
+      console.error(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a warning message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static warn(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.warn(message, data);
+    } else {
+      console.warn(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log an info message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static info(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.info(message, data);
+    } else {
+      console.info(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a debug message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static debug(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.debug(message, data);
+    } else {
+      console.debug(message, data !== void 0 ? data : "");
+    }
+  }
+};
+
 // src/admin/notifications/notifications.admin.ts
 var NotificationsAdmin = class {
   constructor(firestore12) {
@@ -171,7 +229,18 @@ var NotificationsAdmin = class {
    * Priprema Expo poruku za slanje
    */
   prepareExpoMessage(notification) {
-    return notification.notificationTokens.filter((token) => import_expo_server_sdk.Expo.isExpoPushToken(token)).map((token) => ({
+    const validTokens = notification.notificationTokens.filter(
+      (token) => import_expo_server_sdk.Expo.isExpoPushToken(token)
+    );
+    Logger.info(
+      `[NotificationsAdmin] Preparing Expo messages for notification ${notification.id}`,
+      {
+        totalTokens: notification.notificationTokens.length,
+        validTokens: validTokens.length,
+        invalidTokensCount: notification.notificationTokens.length - validTokens.length
+      }
+    );
+    return validTokens.map((token) => ({
       to: token,
       sound: "default",
       title: notification.title,
@@ -203,45 +272,94 @@ var NotificationsAdmin = class {
    * Šalje notifikaciju kroz Expo servis sa boljim error handlingom
    */
   async sendPushNotification(notification) {
+    var _a;
     try {
+      Logger.info(
+        `[NotificationsAdmin] Processing notification ${notification.id} for sending`,
+        {
+          userId: notification.userId,
+          tokenCount: ((_a = notification.notificationTokens) == null ? void 0 : _a.length) || 0,
+          type: notification.notificationType
+        }
+      );
       const messages = this.prepareExpoMessage(notification);
       if (messages.length === 0) {
+        const errorMsg = "No valid notification tokens found";
+        Logger.error(
+          `[NotificationsAdmin] ${errorMsg} for notification ${notification.id}`
+        );
         await this.updateNotificationStatus(
           notification.id,
           "failed" /* FAILED */,
-          "No valid notification tokens found"
+          errorMsg
         );
         return false;
       }
       const chunks = this.expo.chunkPushNotifications(messages);
+      Logger.info(
+        `[NotificationsAdmin] Sending ${messages.length} messages in ${chunks.length} chunks for notification ${notification.id}`
+      );
       const tickets = [];
-      for (const chunk of chunks) {
+      for (let i = 0; i < chunks.length; i++) {
+        const chunk = chunks[i];
         try {
+          Logger.info(
+            `[NotificationsAdmin] Sending chunk ${i + 1}/${chunks.length} with ${chunk.length} messages`
+          );
           const ticketChunk = await this.expo.sendPushNotificationsAsync(chunk);
+          Logger.info(
+            `[NotificationsAdmin] Received ${ticketChunk.length} tickets for chunk ${i + 1}`
+          );
           tickets.push(ticketChunk);
         } catch (error) {
-          console.error(`Chunk sending error:`, error);
+          Logger.error(
+            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
+            error
+          );
           throw error;
         }
       }
       let hasErrors = false;
       const errors = [];
-      tickets.flat().forEach((ticket, index) => {
+      const ticketsFlat = tickets.flat();
+      const ticketResults = {
+        total: ticketsFlat.length,
+        success: 0,
+        error: 0,
+        errorDetails: {}
+      };
+      ticketsFlat.forEach((ticket, index) => {
         if (ticket.status === "error") {
           hasErrors = true;
-          errors.push(
-            `Token ${notification.notificationTokens[index]}: ${ticket.message}`
-          );
+          ticketResults.error++;
+          const errorMessage = ticket.message || "Unknown error";
+          ticketResults.errorDetails[errorMessage] = (ticketResults.errorDetails[errorMessage] || 0) + 1;
+          const tokenInfo = index < notification.notificationTokens.length ? `Token ${notification.notificationTokens[index]}` : `Token at index ${index}`;
+          errors.push(`${tokenInfo}: ${errorMessage}`);
+        } else {
+          ticketResults.success++;
         }
       });
+      Logger.info(
+        `[NotificationsAdmin] Ticket results for notification ${notification.id}`,
+        ticketResults
+      );
       if (hasErrors) {
+        const errorSummary = errors.join("; ");
+        Logger.warn(
+          `[NotificationsAdmin] Partial success or errors in notification ${notification.id}`,
+          { errorCount: errors.length, errorSummary }
+        );
         await this.updateNotificationStatus(
           notification.id,
-          "partialSuccess" /* PARTIAL_SUCCESS */,
-          errors.join("; ")
+          ticketResults.success > 0 ? "partialSuccess" /* PARTIAL_SUCCESS */ : "failed" /* FAILED */,
+          errorSummary
         );
-        return false;
+        return ticketResults.success > 0;
       }
+      Logger.info(
+        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
+      );
       await this.updateNotificationStatus(
         notification.id,
         "sent" /* SENT */
@@ -249,7 +367,10 @@ var NotificationsAdmin = class {
       return true;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      console.error("Gre\u0161ka pri slanju notifikacije:", error);
+      Logger.error(
+        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
+        error
+      );
       await this.updateNotificationStatus(
         notification.id,
         "failed" /* FAILED */,
@@ -263,13 +384,28 @@ var NotificationsAdmin = class {
    */
   async processPendingNotifications(batchSize = 100) {
     const now = admin.firestore.Timestamp.now();
+    Logger.info(
+      `[NotificationsAdmin] Starting to process pending notifications with batch size ${batchSize}`
+    );
     const pendingNotifications = await this.db.collection("notifications").where("status", "==", "pending" /* PENDING */).where("notificationTime", "<=", now).limit(batchSize).get();
+    Logger.info(
+      `[NotificationsAdmin] Found ${pendingNotifications.size} pending notifications to process`
+    );
+    if (pendingNotifications.empty) {
+      Logger.info(
+        "[NotificationsAdmin] No pending notifications found to process"
+      );
+      return;
+    }
     const results = await Promise.allSettled(
       pendingNotifications.docs.map(async (doc) => {
         const notification = {
           id: doc.id,
           ...doc.data()
         };
+        Logger.info(
+          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
+        );
         return this.sendPushNotification(notification);
       })
     );
@@ -279,8 +415,8 @@ var NotificationsAdmin = class {
     const failed = results.filter(
       (r) => r.status === "rejected" || r.status === "fulfilled" && !r.value
     ).length;
-    console.log(
-      `Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
+    Logger.info(
+      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
     );
   }
   /**
@@ -289,6 +425,10 @@ var NotificationsAdmin = class {
   async cleanupOldNotifications(daysOld = 30, batchSize = 500) {
     const cutoffDate = /* @__PURE__ */ new Date();
     cutoffDate.setDate(cutoffDate.getDate() - daysOld);
+    Logger.info(
+      `[NotificationsAdmin] Starting cleanup of notifications older than ${daysOld} days`
+    );
+    let totalDeleted = 0;
     while (true) {
       const oldNotifications = await this.db.collection("notifications").where(
         "createdAt",
@@ -296,6 +436,9 @@ var NotificationsAdmin = class {
         admin.firestore.Timestamp.fromDate(cutoffDate)
       ).limit(batchSize).get();
       if (oldNotifications.empty) {
+        Logger.info(
+          `[NotificationsAdmin] No more old notifications to delete. Total deleted: ${totalDeleted}`
+        );
         break;
       }
       const batch = this.db.batch();
@@ -303,8 +446,9 @@ var NotificationsAdmin = class {
         batch.delete(doc.ref);
       });
       await batch.commit();
-      console.log(
-        `Deleted batch of ${oldNotifications.size} old notifications`
+      totalDeleted += oldNotifications.size;
+      Logger.info(
+        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
       );
     }
   }
@@ -2436,66 +2580,6 @@ var PatientRequirementsAdminService = class {
 
 // src/admin/calendar/calendar.admin.service.ts
 var admin8 = __toESM(require("firebase-admin"));
-
-// src/admin/logger/index.ts
-var firebaseFunctionsLogger;
-try {
-  firebaseFunctionsLogger = require("firebase-functions/logger");
-  require("firebase-functions/logger/compat");
-} catch (e) {
-}
-var Logger = class {
-  /**
-   * Log an error message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static error(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.error(message, data);
-    } else {
-      console.error(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log a warning message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static warn(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.warn(message, data);
-    } else {
-      console.warn(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log an info message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static info(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.info(message, data);
-    } else {
-      console.info(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log a debug message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static debug(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.debug(message, data);
-    } else {
-      console.debug(message, data !== void 0 ? data : "");
-    }
-  }
-};
-
-// src/admin/calendar/calendar.admin.service.ts
 var CalendarAdminService = class {
   constructor(firestore12) {
     this.db = firestore12 || admin8.firestore();

package/dist/admin/index.mjs

@@ -87,6 +87,64 @@ var UserRole = /* @__PURE__ */ ((UserRole2) => {
   return UserRole2;
 })(UserRole || {});
 
+// src/admin/logger/index.ts
+var firebaseFunctionsLogger;
+try {
+  firebaseFunctionsLogger = __require("firebase-functions/logger");
+  __require("firebase-functions/logger/compat");
+} catch (e) {
+}
+var Logger = class {
+  /**
+   * Log an error message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static error(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.error(message, data);
+    } else {
+      console.error(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a warning message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static warn(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.warn(message, data);
+    } else {
+      console.warn(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log an info message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static info(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.info(message, data);
+    } else {
+      console.info(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a debug message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static debug(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.debug(message, data);
+    } else {
+      console.debug(message, data !== void 0 ? data : "");
+    }
+  }
+};
+
 // src/admin/notifications/notifications.admin.ts
 var NotificationsAdmin = class {
   constructor(firestore12) {
@@ -116,7 +174,18 @@ var NotificationsAdmin = class {
    * Priprema Expo poruku za slanje
    */
   prepareExpoMessage(notification) {
-    return notification.notificationTokens.filter((token) => Expo.isExpoPushToken(token)).map((token) => ({
+    const validTokens = notification.notificationTokens.filter(
+      (token) => Expo.isExpoPushToken(token)
+    );
+    Logger.info(
+      `[NotificationsAdmin] Preparing Expo messages for notification ${notification.id}`,
+      {
+        totalTokens: notification.notificationTokens.length,
+        validTokens: validTokens.length,
+        invalidTokensCount: notification.notificationTokens.length - validTokens.length
+      }
+    );
+    return validTokens.map((token) => ({
       to: token,
       sound: "default",
       title: notification.title,
@@ -148,45 +217,94 @@ var NotificationsAdmin = class {
    * Šalje notifikaciju kroz Expo servis sa boljim error handlingom
    */
   async sendPushNotification(notification) {
+    var _a;
     try {
+      Logger.info(
+        `[NotificationsAdmin] Processing notification ${notification.id} for sending`,
+        {
+          userId: notification.userId,
+          tokenCount: ((_a = notification.notificationTokens) == null ? void 0 : _a.length) || 0,
+          type: notification.notificationType
+        }
+      );
       const messages = this.prepareExpoMessage(notification);
       if (messages.length === 0) {
+        const errorMsg = "No valid notification tokens found";
+        Logger.error(
+          `[NotificationsAdmin] ${errorMsg} for notification ${notification.id}`
+        );
         await this.updateNotificationStatus(
           notification.id,
           "failed" /* FAILED */,
-          "No valid notification tokens found"
+          errorMsg
         );
         return false;
       }
       const chunks = this.expo.chunkPushNotifications(messages);
+      Logger.info(
+        `[NotificationsAdmin] Sending ${messages.length} messages in ${chunks.length} chunks for notification ${notification.id}`
+      );
       const tickets = [];
-      for (const chunk of chunks) {
+      for (let i = 0; i < chunks.length; i++) {
+        const chunk = chunks[i];
         try {
+          Logger.info(
+            `[NotificationsAdmin] Sending chunk ${i + 1}/${chunks.length} with ${chunk.length} messages`
+          );
           const ticketChunk = await this.expo.sendPushNotificationsAsync(chunk);
+          Logger.info(
+            `[NotificationsAdmin] Received ${ticketChunk.length} tickets for chunk ${i + 1}`
+          );
           tickets.push(ticketChunk);
         } catch (error) {
-          console.error(`Chunk sending error:`, error);
+          Logger.error(
+            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
+            error
+          );
           throw error;
         }
       }
       let hasErrors = false;
       const errors = [];
-      tickets.flat().forEach((ticket, index) => {
+      const ticketsFlat = tickets.flat();
+      const ticketResults = {
+        total: ticketsFlat.length,
+        success: 0,
+        error: 0,
+        errorDetails: {}
+      };
+      ticketsFlat.forEach((ticket, index) => {
         if (ticket.status === "error") {
           hasErrors = true;
-          errors.push(
-            `Token ${notification.notificationTokens[index]}: ${ticket.message}`
-          );
+          ticketResults.error++;
+          const errorMessage = ticket.message || "Unknown error";
+          ticketResults.errorDetails[errorMessage] = (ticketResults.errorDetails[errorMessage] || 0) + 1;
+          const tokenInfo = index < notification.notificationTokens.length ? `Token ${notification.notificationTokens[index]}` : `Token at index ${index}`;
+          errors.push(`${tokenInfo}: ${errorMessage}`);
+        } else {
+          ticketResults.success++;
         }
       });
+      Logger.info(
+        `[NotificationsAdmin] Ticket results for notification ${notification.id}`,
+        ticketResults
+      );
       if (hasErrors) {
+        const errorSummary = errors.join("; ");
+        Logger.warn(
+          `[NotificationsAdmin] Partial success or errors in notification ${notification.id}`,
+          { errorCount: errors.length, errorSummary }
+        );
         await this.updateNotificationStatus(
           notification.id,
-          "partialSuccess" /* PARTIAL_SUCCESS */,
-          errors.join("; ")
+          ticketResults.success > 0 ? "partialSuccess" /* PARTIAL_SUCCESS */ : "failed" /* FAILED */,
+          errorSummary
         );
-        return false;
+        return ticketResults.success > 0;
       }
+      Logger.info(
+        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
+      );
       await this.updateNotificationStatus(
         notification.id,
         "sent" /* SENT */
@@ -194,7 +312,10 @@ var NotificationsAdmin = class {
       return true;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      console.error("Gre\u0161ka pri slanju notifikacije:", error);
+      Logger.error(
+        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
+        error
+      );
       await this.updateNotificationStatus(
         notification.id,
         "failed" /* FAILED */,
@@ -208,13 +329,28 @@ var NotificationsAdmin = class {
    */
   async processPendingNotifications(batchSize = 100) {
     const now = admin.firestore.Timestamp.now();
+    Logger.info(
+      `[NotificationsAdmin] Starting to process pending notifications with batch size ${batchSize}`
+    );
     const pendingNotifications = await this.db.collection("notifications").where("status", "==", "pending" /* PENDING */).where("notificationTime", "<=", now).limit(batchSize).get();
+    Logger.info(
+      `[NotificationsAdmin] Found ${pendingNotifications.size} pending notifications to process`
+    );
+    if (pendingNotifications.empty) {
+      Logger.info(
+        "[NotificationsAdmin] No pending notifications found to process"
+      );
+      return;
+    }
     const results = await Promise.allSettled(
       pendingNotifications.docs.map(async (doc) => {
         const notification = {
           id: doc.id,
           ...doc.data()
         };
+        Logger.info(
+          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
+        );
         return this.sendPushNotification(notification);
       })
     );
@@ -224,8 +360,8 @@ var NotificationsAdmin = class {
     const failed = results.filter(
       (r) => r.status === "rejected" || r.status === "fulfilled" && !r.value
     ).length;
-    console.log(
-      `Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
+    Logger.info(
+      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
     );
   }
   /**
@@ -234,6 +370,10 @@ var NotificationsAdmin = class {
   async cleanupOldNotifications(daysOld = 30, batchSize = 500) {
     const cutoffDate = /* @__PURE__ */ new Date();
     cutoffDate.setDate(cutoffDate.getDate() - daysOld);
+    Logger.info(
+      `[NotificationsAdmin] Starting cleanup of notifications older than ${daysOld} days`
+    );
+    let totalDeleted = 0;
     while (true) {
       const oldNotifications = await this.db.collection("notifications").where(
         "createdAt",
@@ -241,6 +381,9 @@ var NotificationsAdmin = class {
         admin.firestore.Timestamp.fromDate(cutoffDate)
       ).limit(batchSize).get();
       if (oldNotifications.empty) {
+        Logger.info(
+          `[NotificationsAdmin] No more old notifications to delete. Total deleted: ${totalDeleted}`
+        );
         break;
       }
       const batch = this.db.batch();
@@ -248,8 +391,9 @@ var NotificationsAdmin = class {
         batch.delete(doc.ref);
       });
       await batch.commit();
-      console.log(
-        `Deleted batch of ${oldNotifications.size} old notifications`
+      totalDeleted += oldNotifications.size;
+      Logger.info(
+        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
       );
     }
   }
@@ -2381,66 +2525,6 @@ var PatientRequirementsAdminService = class {
 
 // src/admin/calendar/calendar.admin.service.ts
 import * as admin8 from "firebase-admin";
-
-// src/admin/logger/index.ts
-var firebaseFunctionsLogger;
-try {
-  firebaseFunctionsLogger = __require("firebase-functions/logger");
-  __require("firebase-functions/logger/compat");
-} catch (e) {
-}
-var Logger = class {
-  /**
-   * Log an error message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static error(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.error(message, data);
-    } else {
-      console.error(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log a warning message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static warn(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.warn(message, data);
-    } else {
-      console.warn(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log an info message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static info(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.info(message, data);
-    } else {
-      console.info(message, data !== void 0 ? data : "");
-    }
-  }
-  /**
-   * Log a debug message
-   * @param message Message to log
-   * @param data Optional data to include
-   */
-  static debug(message, data) {
-    if (firebaseFunctionsLogger) {
-      firebaseFunctionsLogger.debug(message, data);
-    } else {
-      console.debug(message, data !== void 0 ? data : "");
-    }
-  }
-};
-
-// src/admin/calendar/calendar.admin.service.ts
 var CalendarAdminService = class {
   constructor(firestore12) {
     this.db = firestore12 || admin8.firestore();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/admin/notifications/notifications.admin.ts

@@ -9,6 +9,7 @@ import { Appointment, PaymentStatus } from "../../types/appointment";
 import { UserRole } from "../../types";
 import { Timestamp as FirebaseClientTimestamp } from "@firebase/firestore";
 import { TimestampUtils } from "../../utils/TimestampUtils";
+import { Logger } from "../logger";
 
 export class NotificationsAdmin {
   private expo: Expo;
@@ -46,19 +47,31 @@ export class NotificationsAdmin {
    * Priprema Expo poruku za slanje
    */
   private prepareExpoMessage(notification: Notification): ExpoPushMessage[] {
-    return notification.notificationTokens
-      .filter((token) => Expo.isExpoPushToken(token))
-      .map((token) => ({
-        to: token,
-        sound: "default",
-        title: notification.title,
-        body: notification.body,
-        data: {
-          notificationId: notification.id,
-          notificationType: notification.notificationType,
-          userId: notification.userId,
-        },
-      }));
+    const validTokens = notification.notificationTokens.filter((token) =>
+      Expo.isExpoPushToken(token)
+    );
+
+    Logger.info(
+      `[NotificationsAdmin] Preparing Expo messages for notification ${notification.id}`,
+      {
+        totalTokens: notification.notificationTokens.length,
+        validTokens: validTokens.length,
+        invalidTokensCount:
+          notification.notificationTokens.length - validTokens.length,
+      }
+    );
+
+    return validTokens.map((token) => ({
+      to: token,
+      sound: "default",
+      title: notification.title,
+      body: notification.body,
+      data: {
+        notificationId: notification.id,
+        notificationType: notification.notificationType,
+        userId: notification.userId,
+      },
+    }));
   }
 
   /**
@@ -93,27 +106,58 @@ export class NotificationsAdmin {
    */
   async sendPushNotification(notification: Notification): Promise<boolean> {
     try {
+      Logger.info(
+        `[NotificationsAdmin] Processing notification ${notification.id} for sending`,
+        {
+          userId: notification.userId,
+          tokenCount: notification.notificationTokens?.length || 0,
+          type: notification.notificationType,
+        }
+      );
+
       const messages = this.prepareExpoMessage(notification);
 
       if (messages.length === 0) {
+        const errorMsg = "No valid notification tokens found";
+        Logger.error(
+          `[NotificationsAdmin] ${errorMsg} for notification ${notification.id}`
+        );
         await this.updateNotificationStatus(
           notification.id!,
           NotificationStatus.FAILED,
-          "No valid notification tokens found"
+          errorMsg
         );
         return false;
       }
 
       const chunks = this.expo.chunkPushNotifications(messages);
+      Logger.info(
+        `[NotificationsAdmin] Sending ${messages.length} messages in ${chunks.length} chunks for notification ${notification.id}`
+      );
+
       const tickets: ExpoPushTicket[][] = [];
 
       // Šaljemo sve chunks
-      for (const chunk of chunks) {
+      for (let i = 0; i < chunks.length; i++) {
+        const chunk = chunks[i];
         try {
+          Logger.info(
+            `[NotificationsAdmin] Sending chunk ${i + 1}/${
+              chunks.length
+            } with ${chunk.length} messages`
+          );
           const ticketChunk = await this.expo.sendPushNotificationsAsync(chunk);
+          Logger.info(
+            `[NotificationsAdmin] Received ${
+              ticketChunk.length
+            } tickets for chunk ${i + 1}`
+          );
           tickets.push(ticketChunk);
         } catch (error) {
-          console.error(`Chunk sending error:`, error);
+          Logger.error(
+            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
+            error
+          );
           throw error;
         }
       }
@@ -121,25 +165,62 @@ export class NotificationsAdmin {
       // Proveravamo rezultate
       let hasErrors = false;
       const errors: string[] = [];
+      const ticketsFlat = tickets.flat();
 
-      tickets.flat().forEach((ticket, index) => {
+      // Log detailed ticket information
+      const ticketResults = {
+        total: ticketsFlat.length,
+        success: 0,
+        error: 0,
+        errorDetails: {} as Record<string, number>,
+      };
+
+      ticketsFlat.forEach((ticket, index) => {
         if (ticket.status === "error") {
           hasErrors = true;
-          errors.push(
-            `Token ${notification.notificationTokens[index]}: ${ticket.message}`
-          );
+          ticketResults.error++;
+
+          // Count each error type
+          const errorMessage = ticket.message || "Unknown error";
+          ticketResults.errorDetails[errorMessage] =
+            (ticketResults.errorDetails[errorMessage] || 0) + 1;
+
+          const tokenInfo =
+            index < notification.notificationTokens.length
+              ? `Token ${notification.notificationTokens[index]}`
+              : `Token at index ${index}`;
+
+          errors.push(`${tokenInfo}: ${errorMessage}`);
+        } else {
+          ticketResults.success++;
         }
       });
 
+      Logger.info(
+        `[NotificationsAdmin] Ticket results for notification ${notification.id}`,
+        ticketResults
+      );
+
       if (hasErrors) {
+        const errorSummary = errors.join("; ");
+        Logger.warn(
+          `[NotificationsAdmin] Partial success or errors in notification ${notification.id}`,
+          { errorCount: errors.length, errorSummary }
+        );
+
         await this.updateNotificationStatus(
           notification.id!,
-          NotificationStatus.PARTIAL_SUCCESS,
-          errors.join("; ")
+          ticketResults.success > 0
+            ? NotificationStatus.PARTIAL_SUCCESS
+            : NotificationStatus.FAILED,
+          errorSummary
         );
-        return false;
+        return ticketResults.success > 0;
       }
 
+      Logger.info(
+        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
+      );
       await this.updateNotificationStatus(
         notification.id!,
         NotificationStatus.SENT
@@ -148,7 +229,10 @@ export class NotificationsAdmin {
     } catch (error) {
       const errorMessage =
         error instanceof Error ? error.message : "Unknown error";
-      console.error("Greška pri slanju notifikacije:", error);
+      Logger.error(
+        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
+        error
+      );
       await this.updateNotificationStatus(
         notification.id!,
         NotificationStatus.FAILED,
@@ -164,6 +248,10 @@ export class NotificationsAdmin {
   async processPendingNotifications(batchSize: number = 100): Promise<void> {
     const now = admin.firestore.Timestamp.now();
 
+    Logger.info(
+      `[NotificationsAdmin] Starting to process pending notifications with batch size ${batchSize}`
+    );
+
     const pendingNotifications = await this.db
       .collection("notifications")
       .where("status", "==", NotificationStatus.PENDING)
@@ -171,12 +259,27 @@ export class NotificationsAdmin {
       .limit(batchSize)
       .get();
 
+    Logger.info(
+      `[NotificationsAdmin] Found ${pendingNotifications.size} pending notifications to process`
+    );
+
+    if (pendingNotifications.empty) {
+      Logger.info(
+        "[NotificationsAdmin] No pending notifications found to process"
+      );
+      return;
+    }
+
     const results = await Promise.allSettled(
       pendingNotifications.docs.map(async (doc) => {
         const notification = {
           id: doc.id,
           ...doc.data(),
         } as Notification;
+
+        Logger.info(
+          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
+        );
         return this.sendPushNotification(notification);
       })
     );
@@ -189,8 +292,8 @@ export class NotificationsAdmin {
       (r) => r.status === "rejected" || (r.status === "fulfilled" && !r.value)
     ).length;
 
-    console.log(
-      `Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
+    Logger.info(
+      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
     );
   }
 
@@ -204,6 +307,11 @@ export class NotificationsAdmin {
     const cutoffDate = new Date();
     cutoffDate.setDate(cutoffDate.getDate() - daysOld);
 
+    Logger.info(
+      `[NotificationsAdmin] Starting cleanup of notifications older than ${daysOld} days`
+    );
+
+    let totalDeleted = 0;
     while (true) {
       const oldNotifications = await this.db
         .collection("notifications")
@@ -216,6 +324,9 @@ export class NotificationsAdmin {
         .get();
 
       if (oldNotifications.empty) {
+        Logger.info(
+          `[NotificationsAdmin] No more old notifications to delete. Total deleted: ${totalDeleted}`
+        );
         break;
       }
 
@@ -225,8 +336,9 @@ export class NotificationsAdmin {
       });
 
       await batch.commit();
-      console.log(
-        `Deleted batch of ${oldNotifications.size} old notifications`
+      totalDeleted += oldNotifications.size;
+      Logger.info(
+        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
       );
     }
   }