@blackcode_sa/metaestetics-api 1.14.57 → 1.14.59

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

@@ -707,4 +707,61 @@ export class NotificationsAdmin {
       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.createNotification(
+        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;
+    }
+  }
 }

package/src/services/procedure/procedure.service.ts

@@ -1505,10 +1505,98 @@ export class ProcedureService extends BaseService {
     }
   }
 
+  /**
+   * Creates a serializable cursor from a DocumentSnapshot or returns the cursor values.
+   * This format can be passed through React Native state/Redux without losing data.
+   *
+   * @param doc - The Firestore DocumentSnapshot
+   * @param orderByField - The field used in orderBy clause
+   * @returns Serializable cursor object with values needed for startAfter
+   */
+  private createSerializableCursor(
+    doc: any,
+    orderByField: string = 'createdAt',
+  ): { __cursor: true; values: any[]; id: string; orderByField: string } | null {
+    if (!doc) return null;
+
+    const data = typeof doc.data === 'function' ? doc.data() : doc;
+    const docId = doc.id || data?.id;
+
+    if (!docId) return null;
+
+    // Get the value of the orderBy field
+    let orderByValue = data?.[orderByField];
+
+    // Handle Firestore Timestamp
+    if (orderByValue && typeof orderByValue.toDate === 'function') {
+      orderByValue = orderByValue.toMillis();
+    } else if (orderByValue && orderByValue.seconds) {
+      // Serialized Timestamp
+      orderByValue = orderByValue.seconds * 1000 + (orderByValue.nanoseconds || 0) / 1000000;
+    }
+
+    return {
+      __cursor: true,
+      values: [orderByValue],
+      id: docId,
+      orderByField,
+    };
+  }
+
+  /**
+   * Converts a serializable cursor back to values for startAfter.
+   * Handles both native DocumentSnapshots and serialized cursor objects.
+   *
+   * @param lastDoc - Either a DocumentSnapshot or a serializable cursor object
+   * @param orderByField - The field used in orderBy clause (for validation)
+   * @returns Values to spread into startAfter, or null if invalid
+   */
+  private getCursorValuesForStartAfter(
+    lastDoc: any,
+    orderByField: string = 'createdAt',
+  ): any[] | null {
+    if (!lastDoc) return null;
+
+    // If it's a native DocumentSnapshot with data() method
+    if (typeof lastDoc.data === 'function') {
+      return [lastDoc];
+    }
+
+    // If it's our serializable cursor format
+    if (lastDoc.__cursor && Array.isArray(lastDoc.values)) {
+      // Reconstruct Timestamp if needed for createdAt
+      if (orderByField === 'createdAt' && typeof lastDoc.values[0] === 'number') {
+        const timestamp = Timestamp.fromMillis(lastDoc.values[0]);
+        return [timestamp];
+      }
+      return lastDoc.values;
+    }
+
+    // If it's an array of values directly
+    if (Array.isArray(lastDoc)) {
+      return lastDoc;
+    }
+
+    // Fallback: try to use the object's orderByField value
+    if (lastDoc[orderByField]) {
+      let value = lastDoc[orderByField];
+      if (typeof value === 'number' && orderByField === 'createdAt') {
+        value = Timestamp.fromMillis(value);
+      } else if (value.seconds && orderByField === 'createdAt') {
+        value = new Timestamp(value.seconds, value.nanoseconds || 0);
+      }
+      return [value];
+    }
+
+    console.warn('[PROCEDURE_SERVICE] Could not parse lastDoc cursor:', typeof lastDoc);
+    return null;
+  }
+
   /**
    * Searches and filters procedures based on multiple criteria
    *
-   * @note Frontend MORA da šalje ceo snapshot (ili barem sva polja po kojima sortiraš, npr. nameLower) kao lastDoc za paginaciju, a ne samo id!
+   * @note Frontend can now send either a DocumentSnapshot or a serializable cursor object.
+   * The serializable cursor format is: { __cursor: true, values: [...], id: string, orderByField: string }
    *
    * @param filters - Various filters to apply
    * @param filters.nameSearch - Optional search text for procedure name
@@ -1645,13 +1733,12 @@ export class ProcedureService extends BaseService {
           constraints.push(where('nameLower', '<=', searchTerm + '\uf8ff'));
           constraints.push(orderBy('nameLower'));
 
+          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === 'function') {
-              constraints.push(startAfter(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push(startAfter(...filters.lastDoc));
-            } else {
-              constraints.push(startAfter(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'nameLower');
+            if (cursorValues) {
+              constraints.push(startAfter(...cursorValues));
+              console.log('[PROCEDURE_SERVICE] Strategy 1: Using cursor for pagination');
             }
           }
           constraints.push(limit(filters.pagination || 10));
@@ -1679,14 +1766,13 @@ export class ProcedureService extends BaseService {
             return { procedures, lastDoc: null };
           }
           
-          // If we filtered out some procedures but got full query results, use last doc for pagination
-          // This allows fetching more pages to get enough filtered results
-          const lastDoc =
-            querySnapshot.docs.length > 0
-              ? querySnapshot.docs[querySnapshot.docs.length - 1]
-              : null;
+          // Return serializable cursor for pagination
+          const lastDocSnapshot = querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'nameLower');
           
-          return { procedures, lastDoc };
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log('[PROCEDURE_SERVICE] Strategy 1 failed:', error);
         }
@@ -1710,13 +1796,12 @@ export class ProcedureService extends BaseService {
           constraints.push(where('name', '<=', searchTerm + '\uf8ff'));
           constraints.push(orderBy('name'));
 
+          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === 'function') {
-              constraints.push(startAfter(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push(startAfter(...filters.lastDoc));
-            } else {
-              constraints.push(startAfter(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'name');
+            if (cursorValues) {
+              constraints.push(startAfter(...cursorValues));
+              console.log('[PROCEDURE_SERVICE] Strategy 2: Using cursor for pagination');
             }
           }
           constraints.push(limit(filters.pagination || 10));
@@ -1744,13 +1829,13 @@ export class ProcedureService extends BaseService {
             return { procedures, lastDoc: null };
           }
           
-          // If we filtered out some procedures but got full query results, use last doc for pagination
-          const lastDoc =
-            querySnapshot.docs.length > 0
-              ? querySnapshot.docs[querySnapshot.docs.length - 1]
-              : null;
+          // Return serializable cursor for pagination
+          const lastDocSnapshot = querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'name');
           
-          return { procedures, lastDoc };
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log('[PROCEDURE_SERVICE] Strategy 2 failed:', error);
         }
@@ -1819,13 +1904,12 @@ export class ProcedureService extends BaseService {
         );
         constraints.push(orderBy('createdAt', 'desc'));
 
+        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
         if (filters.lastDoc) {
-          if (typeof filters.lastDoc.data === 'function') {
-            constraints.push(startAfter(filters.lastDoc));
-          } else if (Array.isArray(filters.lastDoc)) {
-            constraints.push(startAfter(...filters.lastDoc));
-          } else {
-            constraints.push(startAfter(filters.lastDoc));
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
+          if (cursorValues) {
+            constraints.push(startAfter(...cursorValues));
+            console.log('[PROCEDURE_SERVICE] Strategy 3: Using cursor for pagination');
           }
         }
         constraints.push(limit(filters.pagination || 10));
@@ -1866,11 +1950,13 @@ export class ProcedureService extends BaseService {
           return { procedures, lastDoc: null };
         }
         
-        // If we filtered out some procedures but got full query results, use last doc for pagination
-        const lastDoc =
-          querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        // Return serializable cursor for pagination
+        const lastDocSnapshot = querySnapshot.docs.length > 0 
+          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
+          : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
         
-        return { procedures, lastDoc };
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log('[PROCEDURE_SERVICE] Strategy 3 failed:', error);
       }
@@ -1888,6 +1974,15 @@ export class ProcedureService extends BaseService {
         if (filters.clinicId) {
           constraints.push(where('clinicBranchId', '==', filters.clinicId));
         }
+
+        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
+        if (filters.lastDoc) {
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
+          if (cursorValues) {
+            constraints.push(startAfter(...cursorValues));
+            console.log('[PROCEDURE_SERVICE] Strategy 4: Using cursor for pagination');
+          }
+        }
         constraints.push(limit(filters.pagination || 10));
 
         const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
@@ -1911,11 +2006,13 @@ export class ProcedureService extends BaseService {
           return { procedures, lastDoc: null };
         }
         
-        // If we filtered out some procedures but got full query results, use last doc for pagination
-        const lastDoc =
-          querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        // Return serializable cursor for pagination
+        const lastDocSnapshot = querySnapshot.docs.length > 0 
+          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
+          : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
         
-        return { procedures, lastDoc };
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log('[PROCEDURE_SERVICE] Strategy 4 failed:', error);
       }

package/src/types/appointment/index.ts

@@ -319,6 +319,9 @@ export interface Appointment {
   confirmationTime?: Timestamp | null;
   cancellationTime?: Timestamp | null;
   rescheduleTime?: Timestamp | null;
+  /** Reschedule reminder tracking */
+  rescheduleReminderSentAt?: Timestamp | null;
+  rescheduleReminderCount?: number;
   appointmentStartTime: Timestamp;
   appointmentEndTime: Timestamp;
   procedureActualStartTime?: Timestamp | null; // NEW: Actual start time of the procedure
@@ -418,6 +421,9 @@ export interface UpdateAppointmentData {
   confirmationTime?: Timestamp | FieldValue | null;
   cancellationTime?: Timestamp | FieldValue | null;
   rescheduleTime?: Timestamp | FieldValue | null;
+  /** Reschedule reminder tracking */
+  rescheduleReminderSentAt?: Timestamp | FieldValue | null;
+  rescheduleReminderCount?: number | FieldValue;
   procedureActualStartTime?: Timestamp | FieldValue | null; // NEW
   actualDurationMinutes?: number;
   cancellationReason?: string | null;

package/src/types/notifications/index.ts

@@ -8,6 +8,7 @@ export enum NotificationType {
   APPOINTMENT_REMINDER = "appointmentReminder", // For upcoming appointments
   APPOINTMENT_STATUS_CHANGE = "appointmentStatusChange", // Generic for status changes like confirmed, checked-in etc.
   APPOINTMENT_RESCHEDULED_PROPOSAL = "appointmentRescheduledProposal", // When clinic proposes a new time
+  APPOINTMENT_RESCHEDULED_REMINDER = "appointmentRescheduledReminder", // Reminder for pending reschedule request
   APPOINTMENT_CANCELLED = "appointmentCancelled", // When an appointment is cancelled
 
   // --- Requirement-Driven Instructions ---
@@ -185,6 +186,18 @@ export interface AppointmentRescheduledProposalNotification
   // May include a deep link to confirm/reject reschedule.
 }
 
+/**
+ * Notification reminding the patient about a pending reschedule request they haven't responded to.
+ * Example: "Reminder: You have a pending reschedule request for your [Procedure Name] appointment."
+ */
+export interface AppointmentRescheduledReminderNotification
+  extends BaseNotification {
+  notificationType: NotificationType.APPOINTMENT_RESCHEDULED_REMINDER;
+  appointmentId: string; // Mandatory
+  procedureName?: string;
+  reminderCount?: number; // Number of reminders sent so far
+}
+
 /**
  * Notification informing about a cancelled appointment.
  * Example: "Your appointment for [Procedure Name] on [Date] has been cancelled."
@@ -277,6 +290,7 @@ export type Notification =
   | AppointmentReminderNotification
   | AppointmentStatusChangeNotification
   | AppointmentRescheduledProposalNotification
+  | AppointmentRescheduledReminderNotification
   | AppointmentCancelledNotification
   | FormReminderNotification
   | FormSubmissionConfirmationNotification