@blackcode_sa/metaestetics-api 1.15.14 → 1.15.17-staging.0

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

@@ -1,818 +1,818 @@
-import {
-  Notification,
-  NotificationStatus,
-  NotificationType,
-} from "../../types/notifications";
-import * as admin from "firebase-admin";
-import { Expo, ExpoPushMessage, ExpoPushTicket } from "expo-server-sdk";
-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;
-  private db: admin.firestore.Firestore;
-
-  constructor(firestore?: admin.firestore.Firestore) {
-    this.expo = new Expo();
-    this.db = firestore || admin.firestore();
-  }
-
-  /**
-   * Dohvata notifikaciju po ID-u
-   */
-  async getNotification(id: string): Promise<Notification | null> {
-    const doc = await this.db.collection("notifications").doc(id).get();
-    return doc.exists ? ({ id: doc.id, ...doc.data() } as Notification) : null;
-  }
-
-  /**
-   * Kreira novu notifikaciju
-   */
-  async createNotification(
-    notification: Omit<Notification, "id">
-  ): Promise<string> {
-    const docRef = await this.db.collection("notifications").add({
-      ...notification,
-      status: NotificationStatus.PENDING,
-      createdAt: admin.firestore.FieldValue.serverTimestamp(),
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    });
-    return docRef.id;
-  }
-
-  /**
-   * Creates a notification and immediately attempts to send it.
-   * If immediate send fails, the notification remains PENDING for cron pickup.
-   * Returns the notification ID regardless of send success.
-   */
-  async createAndSendNotificationImmediately(
-    notification: Omit<Notification, "id">
-  ): Promise<string> {
-    // Create the notification first
-    const notificationId = await this.createNotification(notification);
-
-    // Immediately try to send it
-    try {
-      const fullNotification: Notification = {
-        ...notification,
-        id: notificationId,
-        status: NotificationStatus.PENDING,
-      } as Notification;
-
-      const sent = await this.sendPushNotification(fullNotification);
-
-      if (sent) {
-        Logger.info(
-          `[NotificationsAdmin] Notification ${notificationId} sent immediately`
-        );
-      } else {
-        Logger.info(
-          `[NotificationsAdmin] Notification ${notificationId} immediate send failed, will be retried by cron`
-        );
-      }
-    } catch (error) {
-      // Don't throw - notification is created, cron will pick it up
-      Logger.error(
-        `[NotificationsAdmin] Error sending notification ${notificationId} immediately, will be retried by cron:`,
-        error
-      );
-    }
-
-    return notificationId;
-  }
-
-  /**
-   * Priprema Expo poruku za slanje
-   */
-  private prepareExpoMessage(notification: Notification): ExpoPushMessage[] {
-    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,
-        // Deep linking data
-        type: notification.appointmentId ? 'appointment' : 'system',
-        appointmentId: notification.appointmentId,
-        // Explicit deep link for navigation
-        deepLink: notification.appointmentId
-          ? {
-              screen: 'AppointmentDetail',
-              params: { appointmentId: notification.appointmentId },
-            }
-          : undefined,
-      },
-    }));
-  }
-
-  /**
-   * Ažurira status notifikacije
-   */
-  public async updateNotificationStatus(
-    notificationId: string,
-    status: NotificationStatus,
-    error?: string
-  ): Promise<void> {
-    const update: any = {
-      status,
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    };
-
-    if (status === NotificationStatus.SENT) {
-      update.sentAt = admin.firestore.FieldValue.serverTimestamp();
-    }
-
-    if (error) {
-      update.error = error;
-    }
-
-    await this.db
-      .collection("notifications")
-      .doc(notificationId)
-      .update(update);
-  }
-
-  /**
-   * Šalje notifikaciju kroz Expo servis sa boljim error handlingom
-   */
-  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,
-          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 (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) {
-          Logger.error(
-            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
-            error
-          );
-          throw error;
-        }
-      }
-
-      // Proveravamo rezultate
-      let hasErrors = false;
-      const errors: string[] = [];
-      const ticketsFlat = tickets.flat();
-
-      // 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;
-          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!,
-          ticketResults.success > 0
-            ? NotificationStatus.PARTIAL_SUCCESS
-            : NotificationStatus.FAILED,
-          errorSummary
-        );
-        return ticketResults.success > 0;
-      }
-
-      Logger.info(
-        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
-      );
-      await this.updateNotificationStatus(
-        notification.id!,
-        NotificationStatus.SENT
-      );
-      return true;
-    } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : "Unknown error";
-      Logger.error(
-        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
-        error
-      );
-      await this.updateNotificationStatus(
-        notification.id!,
-        NotificationStatus.FAILED,
-        errorMessage
-      );
-      return false;
-    }
-  }
-
-  /**
-   * Procesira notifikacije koje čekaju na slanje sa batch limitom
-   */
-  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)
-      .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(),
-        } as Notification;
-
-        Logger.info(
-          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
-        );
-        return this.sendPushNotification(notification);
-      })
-    );
-
-    // Logujemo statistiku
-    const successful = results.filter(
-      (r) => r.status === "fulfilled" && r.value
-    ).length;
-    const failed = results.filter(
-      (r) => r.status === "rejected" || (r.status === "fulfilled" && !r.value)
-    ).length;
-
-    Logger.info(
-      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
-    );
-  }
-
-  /**
-   * Briše stare notifikacije sa batch procesiranjem
-   */
-  async cleanupOldNotifications(
-    daysOld: number = 30,
-    batchSize: number = 500
-  ): Promise<void> {
-    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")
-        .where(
-          "createdAt",
-          "<=",
-          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();
-      oldNotifications.docs.forEach((doc) => {
-        batch.delete(doc.ref);
-      });
-
-      await batch.commit();
-      totalDeleted += oldNotifications.size;
-      Logger.info(
-        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
-      );
-    }
-  }
-
-  // --- Business Specific Notification Methods (Revised) ---
-
-  /**
-   * Creates and potentially sends a push notification for a confirmed appointment.
-   * @param appointment The confirmed appointment object.
-   * @param recipientUserId The ID of the user receiving the notification.
-   * @param recipientExpoTokens Array of Expo push tokens for the recipient.
-   * @param recipientRole The role of the recipient (e.g., PATIENT, PRACTITIONER).
-   */
-  async sendAppointmentConfirmedPush(
-    appointment: Appointment,
-    recipientUserId: string,
-    recipientExpoTokens: string[],
-    recipientRole: UserRole
-  ): Promise<string | null> {
-    if (recipientRole === UserRole.CLINIC_ADMIN) {
-      console.log(
-        `[NotificationsAdmin] Clinic admin roles do not receive push notifications for appointment ${appointment.id} confirmation. Skipping.`
-      );
-      return null;
-    }
-    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for ${recipientRole} ${recipientUserId} for appointment ${appointment.id} confirmation. Skipping push.`
-      );
-      return null;
-    }
-
-    let title = "Appointment Confirmed!";
-    let body = `Your appointment for ${
-      appointment.procedureInfo.name
-    } on ${appointment.appointmentStartTime
-      .toDate()
-      .toLocaleDateString()} at ${appointment.appointmentStartTime
-      .toDate()
-      .toLocaleTimeString()} has been confirmed.`;
-
-    if (recipientRole === UserRole.PRACTITIONER) {
-      title = "New Appointment Confirmed";
-      body = `Appointment for ${appointment.procedureInfo.name} with ${
-        appointment.patientInfo.fullName
-      } on ${appointment.appointmentStartTime
-        .toDate()
-        .toLocaleDateString()} is confirmed.`;
-    }
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: recipientUserId,
-      userRole: recipientRole,
-      notificationType: NotificationType.APPOINTMENT_STATUS_CHANGE,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: recipientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created APPOINTMENT_STATUS_CHANGE (Confirmed) notification ${notificationId} for ${recipientRole} ${recipientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating APPOINTMENT_STATUS_CHANGE (Confirmed) notification for ${recipientRole} ${recipientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  async sendAppointmentCancelledPush(
-    appointment: Appointment,
-    recipientUserId: string,
-    recipientExpoTokens: string[],
-    recipientRole: UserRole
-  ): Promise<string | null> {
-    if (recipientRole === UserRole.CLINIC_ADMIN) {
-      console.log(
-        `[NotificationsAdmin] Clinic admin roles do not receive push notifications for appointment ${appointment.id} cancellation. Skipping.`
-      );
-      return null;
-    }
-    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for ${recipientRole} ${recipientUserId} for appointment ${appointment.id} cancellation. Skipping push.`
-      );
-      return null;
-    }
-
-    let title = "Appointment Cancelled";
-    let body = `Your appointment for ${
-      appointment.procedureInfo.name
-    } on ${appointment.appointmentStartTime
-      .toDate()
-      .toLocaleDateString()} has been cancelled.`;
-    if (appointment.cancellationReason) {
-      body += ` Reason: ${appointment.cancellationReason}`;
-    }
-
-    if (recipientRole === UserRole.PRACTITIONER) {
-      body = `The appointment for ${appointment.procedureInfo.name} with ${
-        appointment.patientInfo.fullName
-      } on ${appointment.appointmentStartTime
-        .toDate()
-        .toLocaleDateString()} has been cancelled.`;
-      if (appointment.cancellationReason) {
-        body += ` Reason: ${appointment.cancellationReason}`;
-      }
-    }
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: recipientUserId,
-      userRole: recipientRole,
-      notificationType: NotificationType.APPOINTMENT_CANCELLED,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: recipientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created APPOINTMENT_CANCELLED notification ${notificationId} for ${recipientRole} ${recipientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating APPOINTMENT_CANCELLED notification for ${recipientRole} ${recipientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  async sendAppointmentRescheduledProposalPush(
-    appointment: Appointment,
-    patientUserId: string,
-    patientExpoTokens: string[]
-  ): Promise<string | null> {
-    if (!patientExpoTokens || patientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} reschedule proposal. Skipping push.`
-      );
-      return null;
-    }
-
-    const title = "Appointment Reschedule Proposed";
-    const body = `Action Required: A new time has been proposed for your appointment for ${appointment.procedureInfo.name}. Please review in the app.`;
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: patientUserId,
-      userRole: UserRole.PATIENT,
-      notificationType: NotificationType.APPOINTMENT_RESCHEDULED_PROPOSAL,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: patientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created APPOINTMENT_RESCHEDULED_PROPOSAL notification ${notificationId} for patient ${patientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating APPOINTMENT_RESCHEDULED_PROPOSAL notification for patient ${patientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  async sendPaymentUpdatePush(
-    appointment: Appointment,
-    patientUserId: string,
-    patientExpoTokens: string[]
-  ): Promise<string | null> {
-    if (!patientExpoTokens || patientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} payment update. Skipping push.`
-      );
-      return null;
-    }
-    const title = "Payment Updated";
-    const body = `Your payment status for the appointment (${
-      appointment.procedureInfo.name
-    }) on ${appointment.appointmentStartTime
-      .toDate()
-      .toLocaleDateString()} is now ${appointment.paymentStatus}.`;
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationType =
-      appointment.paymentStatus === PaymentStatus.PAID
-        ? NotificationType.PAYMENT_CONFIRMATION
-        : NotificationType.GENERAL_MESSAGE;
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: patientUserId,
-      userRole: UserRole.PATIENT,
-      notificationType: notificationType,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: patientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created PAYMENT_UPDATE notification ${notificationId} for patient ${patientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating PAYMENT_UPDATE notification for patient ${patientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  async sendReviewRequestPush(
-    appointment: Appointment,
-    patientUserId: string,
-    patientExpoTokens: string[]
-  ): Promise<string | null> {
-    if (!patientExpoTokens || patientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} review request. Skipping push.`
-      );
-      return null;
-    }
-
-    const title = "Leave a Review";
-    const body = `How was your recent appointment for ${appointment.procedureInfo.name}? We'd love to hear your feedback!`;
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: patientUserId,
-      userRole: UserRole.PATIENT,
-      notificationType: NotificationType.REVIEW_REQUEST,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: patientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created REVIEW_REQUEST notification ${notificationId} for patient ${patientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating REVIEW_REQUEST notification for patient ${patientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  async sendReviewAddedPush(
-    appointment: Appointment,
-    recipientUserId: string,
-    recipientExpoTokens: string[],
-    recipientRole: UserRole
-  ): Promise<string | null> {
-    if (recipientRole !== UserRole.PRACTITIONER) {
-      console.log(
-        `[NotificationsAdmin] Only Practitioners receive review added push notifications (Role: ${recipientRole}). Skipping for appointment ${appointment.id}.`
-      );
-      return null;
-    }
-    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for practitioner ${recipientUserId} for appointment ${appointment.id} review added. Skipping push.`
-      );
-      return null;
-    }
-
-    const title = "New Review Received";
-    const body = `A new review has been added by ${
-      appointment.patientInfo.fullName
-    } for your appointment on ${appointment.appointmentStartTime
-      .toDate()
-      .toLocaleDateString()}.`;
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const tempNotificationType = NotificationType.GENERAL_MESSAGE;
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: recipientUserId,
-      userRole: UserRole.PRACTITIONER,
-      notificationType: tempNotificationType,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: recipientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created REVIEW_ADDED (using temp type ${tempNotificationType}) notification ${notificationId} for practitioner ${recipientUserId}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating REVIEW_ADDED (using temp type ${tempNotificationType}) notification for practitioner ${recipientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-
-  /**
-   * Sends a reminder push notification for a pending reschedule request.
-   * Used when a clinic has proposed a reschedule and the patient hasn't responded.
-   * @param appointment The appointment with pending reschedule.
-   * @param patientUserId The ID of the patient.
-   * @param patientExpoTokens Array of Expo push tokens for the patient.
-   * @param reminderCount Optional count of reminders already sent (for tracking).
-   */
-  async sendRescheduleReminderPush(
-    appointment: Appointment,
-    patientUserId: string,
-    patientExpoTokens: string[],
-    reminderCount?: number
-  ): Promise<string | null> {
-    if (!patientExpoTokens || patientExpoTokens.length === 0) {
-      console.log(
-        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} reschedule reminder. Skipping push.`
-      );
-      return null;
-    }
-
-    const title = "Reminder: Reschedule Request Pending";
-    const body = `You have a pending reschedule request for your ${appointment.procedureInfo.name} appointment. Please respond in the app.`;
-
-    const notificationTimestampForDb = admin.firestore.Timestamp.now();
-
-    const notificationData: Omit<
-      Notification,
-      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
-    > = {
-      userId: patientUserId,
-      userRole: UserRole.PATIENT,
-      notificationType: NotificationType.APPOINTMENT_RESCHEDULED_REMINDER,
-      notificationTime: notificationTimestampForDb as any,
-      notificationTokens: patientExpoTokens,
-      title,
-      body,
-      appointmentId: appointment.id,
-    };
-
-    try {
-      const notificationId = await this.createAndSendNotificationImmediately(
-        notificationData as Notification
-      );
-      console.log(
-        `[NotificationsAdmin] Created APPOINTMENT_RESCHEDULED_REMINDER notification ${notificationId} for patient ${patientUserId}. Reminder count: ${reminderCount ?? 1}.`
-      );
-      return notificationId;
-    } catch (error) {
-      console.error(
-        `[NotificationsAdmin] Error creating APPOINTMENT_RESCHEDULED_REMINDER notification for patient ${patientUserId}:`,
-        error
-      );
-      return null;
-    }
-  }
-}
+import {
+  Notification,
+  NotificationStatus,
+  NotificationType,
+} from "../../types/notifications";
+import * as admin from "firebase-admin";
+import { Expo, ExpoPushMessage, ExpoPushTicket } from "expo-server-sdk";
+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;
+  private db: admin.firestore.Firestore;
+
+  constructor(firestore?: admin.firestore.Firestore) {
+    this.expo = new Expo();
+    this.db = firestore || admin.firestore();
+  }
+
+  /**
+   * Dohvata notifikaciju po ID-u
+   */
+  async getNotification(id: string): Promise<Notification | null> {
+    const doc = await this.db.collection("notifications").doc(id).get();
+    return doc.exists ? ({ id: doc.id, ...doc.data() } as Notification) : null;
+  }
+
+  /**
+   * Kreira novu notifikaciju
+   */
+  async createNotification(
+    notification: Omit<Notification, "id">
+  ): Promise<string> {
+    const docRef = await this.db.collection("notifications").add({
+      ...notification,
+      status: NotificationStatus.PENDING,
+      createdAt: admin.firestore.FieldValue.serverTimestamp(),
+      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+    });
+    return docRef.id;
+  }
+
+  /**
+   * Creates a notification and immediately attempts to send it.
+   * If immediate send fails, the notification remains PENDING for cron pickup.
+   * Returns the notification ID regardless of send success.
+   */
+  async createAndSendNotificationImmediately(
+    notification: Omit<Notification, "id">
+  ): Promise<string> {
+    // Create the notification first
+    const notificationId = await this.createNotification(notification);
+
+    // Immediately try to send it
+    try {
+      const fullNotification: Notification = {
+        ...notification,
+        id: notificationId,
+        status: NotificationStatus.PENDING,
+      } as Notification;
+
+      const sent = await this.sendPushNotification(fullNotification);
+
+      if (sent) {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} sent immediately`
+        );
+      } else {
+        Logger.info(
+          `[NotificationsAdmin] Notification ${notificationId} immediate send failed, will be retried by cron`
+        );
+      }
+    } catch (error) {
+      // Don't throw - notification is created, cron will pick it up
+      Logger.error(
+        `[NotificationsAdmin] Error sending notification ${notificationId} immediately, will be retried by cron:`,
+        error
+      );
+    }
+
+    return notificationId;
+  }
+
+  /**
+   * Priprema Expo poruku za slanje
+   */
+  private prepareExpoMessage(notification: Notification): ExpoPushMessage[] {
+    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,
+        // Deep linking data
+        type: notification.appointmentId ? 'appointment' : 'system',
+        appointmentId: notification.appointmentId,
+        // Explicit deep link for navigation
+        deepLink: notification.appointmentId
+          ? {
+              screen: 'AppointmentDetail',
+              params: { appointmentId: notification.appointmentId },
+            }
+          : undefined,
+      },
+    }));
+  }
+
+  /**
+   * Ažurira status notifikacije
+   */
+  public async updateNotificationStatus(
+    notificationId: string,
+    status: NotificationStatus,
+    error?: string
+  ): Promise<void> {
+    const update: any = {
+      status,
+      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+    };
+
+    if (status === NotificationStatus.SENT) {
+      update.sentAt = admin.firestore.FieldValue.serverTimestamp();
+    }
+
+    if (error) {
+      update.error = error;
+    }
+
+    await this.db
+      .collection("notifications")
+      .doc(notificationId)
+      .update(update);
+  }
+
+  /**
+   * Šalje notifikaciju kroz Expo servis sa boljim error handlingom
+   */
+  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,
+          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 (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) {
+          Logger.error(
+            `[NotificationsAdmin] Chunk ${i + 1} sending error:`,
+            error
+          );
+          throw error;
+        }
+      }
+
+      // Proveravamo rezultate
+      let hasErrors = false;
+      const errors: string[] = [];
+      const ticketsFlat = tickets.flat();
+
+      // 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;
+          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!,
+          ticketResults.success > 0
+            ? NotificationStatus.PARTIAL_SUCCESS
+            : NotificationStatus.FAILED,
+          errorSummary
+        );
+        return ticketResults.success > 0;
+      }
+
+      Logger.info(
+        `[NotificationsAdmin] Successfully sent notification ${notification.id} to all recipients`
+      );
+      await this.updateNotificationStatus(
+        notification.id!,
+        NotificationStatus.SENT
+      );
+      return true;
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : "Unknown error";
+      Logger.error(
+        `[NotificationsAdmin] Critical error sending notification ${notification.id}:`,
+        error
+      );
+      await this.updateNotificationStatus(
+        notification.id!,
+        NotificationStatus.FAILED,
+        errorMessage
+      );
+      return false;
+    }
+  }
+
+  /**
+   * Procesira notifikacije koje čekaju na slanje sa batch limitom
+   */
+  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)
+      .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(),
+        } as Notification;
+
+        Logger.info(
+          `[NotificationsAdmin] Processing notification ${notification.id} of type ${notification.notificationType}`
+        );
+        return this.sendPushNotification(notification);
+      })
+    );
+
+    // Logujemo statistiku
+    const successful = results.filter(
+      (r) => r.status === "fulfilled" && r.value
+    ).length;
+    const failed = results.filter(
+      (r) => r.status === "rejected" || (r.status === "fulfilled" && !r.value)
+    ).length;
+
+    Logger.info(
+      `[NotificationsAdmin] Processed ${results.length} notifications: ${successful} successful, ${failed} failed`
+    );
+  }
+
+  /**
+   * Briše stare notifikacije sa batch procesiranjem
+   */
+  async cleanupOldNotifications(
+    daysOld: number = 30,
+    batchSize: number = 500
+  ): Promise<void> {
+    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")
+        .where(
+          "createdAt",
+          "<=",
+          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();
+      oldNotifications.docs.forEach((doc) => {
+        batch.delete(doc.ref);
+      });
+
+      await batch.commit();
+      totalDeleted += oldNotifications.size;
+      Logger.info(
+        `[NotificationsAdmin] Deleted batch of ${oldNotifications.size} old notifications. Running total: ${totalDeleted}`
+      );
+    }
+  }
+
+  // --- Business Specific Notification Methods (Revised) ---
+
+  /**
+   * Creates and potentially sends a push notification for a confirmed appointment.
+   * @param appointment The confirmed appointment object.
+   * @param recipientUserId The ID of the user receiving the notification.
+   * @param recipientExpoTokens Array of Expo push tokens for the recipient.
+   * @param recipientRole The role of the recipient (e.g., PATIENT, PRACTITIONER).
+   */
+  async sendAppointmentConfirmedPush(
+    appointment: Appointment,
+    recipientUserId: string,
+    recipientExpoTokens: string[],
+    recipientRole: UserRole
+  ): Promise<string | null> {
+    if (recipientRole === UserRole.CLINIC_ADMIN) {
+      console.log(
+        `[NotificationsAdmin] Clinic admin roles do not receive push notifications for appointment ${appointment.id} confirmation. Skipping.`
+      );
+      return null;
+    }
+    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for ${recipientRole} ${recipientUserId} for appointment ${appointment.id} confirmation. Skipping push.`
+      );
+      return null;
+    }
+
+    let title = "Appointment Confirmed!";
+    let body = `Your appointment for ${
+      appointment.procedureInfo.name
+    } on ${appointment.appointmentStartTime
+      .toDate()
+      .toLocaleDateString()} at ${appointment.appointmentStartTime
+      .toDate()
+      .toLocaleTimeString()} has been confirmed.`;
+
+    if (recipientRole === UserRole.PRACTITIONER) {
+      title = "New Appointment Confirmed";
+      body = `Appointment for ${appointment.procedureInfo.name} with ${
+        appointment.patientInfo.fullName
+      } on ${appointment.appointmentStartTime
+        .toDate()
+        .toLocaleDateString()} is confirmed.`;
+    }
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: recipientUserId,
+      userRole: recipientRole,
+      notificationType: NotificationType.APPOINTMENT_STATUS_CHANGE,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: recipientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created APPOINTMENT_STATUS_CHANGE (Confirmed) notification ${notificationId} for ${recipientRole} ${recipientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating APPOINTMENT_STATUS_CHANGE (Confirmed) notification for ${recipientRole} ${recipientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  async sendAppointmentCancelledPush(
+    appointment: Appointment,
+    recipientUserId: string,
+    recipientExpoTokens: string[],
+    recipientRole: UserRole
+  ): Promise<string | null> {
+    if (recipientRole === UserRole.CLINIC_ADMIN) {
+      console.log(
+        `[NotificationsAdmin] Clinic admin roles do not receive push notifications for appointment ${appointment.id} cancellation. Skipping.`
+      );
+      return null;
+    }
+    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for ${recipientRole} ${recipientUserId} for appointment ${appointment.id} cancellation. Skipping push.`
+      );
+      return null;
+    }
+
+    let title = "Appointment Cancelled";
+    let body = `Your appointment for ${
+      appointment.procedureInfo.name
+    } on ${appointment.appointmentStartTime
+      .toDate()
+      .toLocaleDateString()} has been cancelled.`;
+    if (appointment.cancellationReason) {
+      body += ` Reason: ${appointment.cancellationReason}`;
+    }
+
+    if (recipientRole === UserRole.PRACTITIONER) {
+      body = `The appointment for ${appointment.procedureInfo.name} with ${
+        appointment.patientInfo.fullName
+      } on ${appointment.appointmentStartTime
+        .toDate()
+        .toLocaleDateString()} has been cancelled.`;
+      if (appointment.cancellationReason) {
+        body += ` Reason: ${appointment.cancellationReason}`;
+      }
+    }
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: recipientUserId,
+      userRole: recipientRole,
+      notificationType: NotificationType.APPOINTMENT_CANCELLED,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: recipientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created APPOINTMENT_CANCELLED notification ${notificationId} for ${recipientRole} ${recipientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating APPOINTMENT_CANCELLED notification for ${recipientRole} ${recipientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  async sendAppointmentRescheduledProposalPush(
+    appointment: Appointment,
+    patientUserId: string,
+    patientExpoTokens: string[]
+  ): Promise<string | null> {
+    if (!patientExpoTokens || patientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} reschedule proposal. Skipping push.`
+      );
+      return null;
+    }
+
+    const title = "Appointment Reschedule Proposed";
+    const body = `Action Required: A new time has been proposed for your appointment for ${appointment.procedureInfo.name}. Please review in the app.`;
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: patientUserId,
+      userRole: UserRole.PATIENT,
+      notificationType: NotificationType.APPOINTMENT_RESCHEDULED_PROPOSAL,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: patientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created APPOINTMENT_RESCHEDULED_PROPOSAL notification ${notificationId} for patient ${patientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating APPOINTMENT_RESCHEDULED_PROPOSAL notification for patient ${patientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  async sendPaymentUpdatePush(
+    appointment: Appointment,
+    patientUserId: string,
+    patientExpoTokens: string[]
+  ): Promise<string | null> {
+    if (!patientExpoTokens || patientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} payment update. Skipping push.`
+      );
+      return null;
+    }
+    const title = "Payment Updated";
+    const body = `Your payment status for the appointment (${
+      appointment.procedureInfo.name
+    }) on ${appointment.appointmentStartTime
+      .toDate()
+      .toLocaleDateString()} is now ${appointment.paymentStatus}.`;
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationType =
+      appointment.paymentStatus === PaymentStatus.PAID
+        ? NotificationType.PAYMENT_CONFIRMATION
+        : NotificationType.GENERAL_MESSAGE;
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: patientUserId,
+      userRole: UserRole.PATIENT,
+      notificationType: notificationType,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: patientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created PAYMENT_UPDATE notification ${notificationId} for patient ${patientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating PAYMENT_UPDATE notification for patient ${patientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  async sendReviewRequestPush(
+    appointment: Appointment,
+    patientUserId: string,
+    patientExpoTokens: string[]
+  ): Promise<string | null> {
+    if (!patientExpoTokens || patientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} review request. Skipping push.`
+      );
+      return null;
+    }
+
+    const title = "Leave a Review";
+    const body = `How was your recent appointment for ${appointment.procedureInfo.name}? We'd love to hear your feedback!`;
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: patientUserId,
+      userRole: UserRole.PATIENT,
+      notificationType: NotificationType.REVIEW_REQUEST,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: patientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created REVIEW_REQUEST notification ${notificationId} for patient ${patientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating REVIEW_REQUEST notification for patient ${patientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  async sendReviewAddedPush(
+    appointment: Appointment,
+    recipientUserId: string,
+    recipientExpoTokens: string[],
+    recipientRole: UserRole
+  ): Promise<string | null> {
+    if (recipientRole !== UserRole.PRACTITIONER) {
+      console.log(
+        `[NotificationsAdmin] Only Practitioners receive review added push notifications (Role: ${recipientRole}). Skipping for appointment ${appointment.id}.`
+      );
+      return null;
+    }
+    if (!recipientExpoTokens || recipientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for practitioner ${recipientUserId} for appointment ${appointment.id} review added. Skipping push.`
+      );
+      return null;
+    }
+
+    const title = "New Review Received";
+    const body = `A new review has been added by ${
+      appointment.patientInfo.fullName
+    } for your appointment on ${appointment.appointmentStartTime
+      .toDate()
+      .toLocaleDateString()}.`;
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const tempNotificationType = NotificationType.GENERAL_MESSAGE;
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: recipientUserId,
+      userRole: UserRole.PRACTITIONER,
+      notificationType: tempNotificationType,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: recipientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created REVIEW_ADDED (using temp type ${tempNotificationType}) notification ${notificationId} for practitioner ${recipientUserId}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating REVIEW_ADDED (using temp type ${tempNotificationType}) notification for practitioner ${recipientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Sends a reminder push notification for a pending reschedule request.
+   * Used when a clinic has proposed a reschedule and the patient hasn't responded.
+   * @param appointment The appointment with pending reschedule.
+   * @param patientUserId The ID of the patient.
+   * @param patientExpoTokens Array of Expo push tokens for the patient.
+   * @param reminderCount Optional count of reminders already sent (for tracking).
+   */
+  async sendRescheduleReminderPush(
+    appointment: Appointment,
+    patientUserId: string,
+    patientExpoTokens: string[],
+    reminderCount?: number
+  ): Promise<string | null> {
+    if (!patientExpoTokens || patientExpoTokens.length === 0) {
+      console.log(
+        `[NotificationsAdmin] No expo tokens for patient ${patientUserId} for appointment ${appointment.id} reschedule reminder. Skipping push.`
+      );
+      return null;
+    }
+
+    const title = "Reminder: Reschedule Request Pending";
+    const body = `You have a pending reschedule request for your ${appointment.procedureInfo.name} appointment. Please respond in the app.`;
+
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
+
+    const notificationData: Omit<
+      Notification,
+      "id" | "createdAt" | "updatedAt" | "status" | "isRead"
+    > = {
+      userId: patientUserId,
+      userRole: UserRole.PATIENT,
+      notificationType: NotificationType.APPOINTMENT_RESCHEDULED_REMINDER,
+      notificationTime: notificationTimestampForDb as any,
+      notificationTokens: patientExpoTokens,
+      title,
+      body,
+      appointmentId: appointment.id,
+    };
+
+    try {
+      const notificationId = await this.createAndSendNotificationImmediately(
+        notificationData as Notification
+      );
+      console.log(
+        `[NotificationsAdmin] Created APPOINTMENT_RESCHEDULED_REMINDER notification ${notificationId} for patient ${patientUserId}. Reminder count: ${reminderCount ?? 1}.`
+      );
+      return notificationId;
+    } catch (error) {
+      console.error(
+        `[NotificationsAdmin] Error creating APPOINTMENT_RESCHEDULED_REMINDER notification for patient ${patientUserId}:`,
+        error
+      );
+      return null;
+    }
+  }
+}