@blackcode_sa/metaestetics-api 1.14.57 → 1.14.59

package/dist/index.mjs

@@ -7678,6 +7678,7 @@ var NotificationType = /* @__PURE__ */ ((NotificationType3) => {
   NotificationType3["APPOINTMENT_REMINDER"] = "appointmentReminder";
   NotificationType3["APPOINTMENT_STATUS_CHANGE"] = "appointmentStatusChange";
   NotificationType3["APPOINTMENT_RESCHEDULED_PROPOSAL"] = "appointmentRescheduledProposal";
+  NotificationType3["APPOINTMENT_RESCHEDULED_REMINDER"] = "appointmentRescheduledReminder";
   NotificationType3["APPOINTMENT_CANCELLED"] = "appointmentCancelled";
   NotificationType3["PRE_REQUIREMENT_INSTRUCTION_DUE"] = "preRequirementInstructionDue";
   NotificationType3["POST_REQUIREMENT_INSTRUCTION_DUE"] = "postRequirementInstructionDue";
@@ -21583,6 +21584,7 @@ import {
   updateDoc as updateDoc36,
   setDoc as setDoc27,
   deleteDoc as deleteDoc19,
+  Timestamp as Timestamp36,
   serverTimestamp as serverTimestamp31,
   writeBatch as writeBatch6,
   orderBy as orderBy18,
@@ -22838,10 +22840,72 @@ var ProcedureService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * 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
+   */
+  createSerializableCursor(doc47, orderByField = "createdAt") {
+    if (!doc47) return null;
+    const data = typeof doc47.data === "function" ? doc47.data() : doc47;
+    const docId = doc47.id || (data == null ? void 0 : data.id);
+    if (!docId) return null;
+    let orderByValue = data == null ? void 0 : data[orderByField];
+    if (orderByValue && typeof orderByValue.toDate === "function") {
+      orderByValue = orderByValue.toMillis();
+    } else if (orderByValue && orderByValue.seconds) {
+      orderByValue = orderByValue.seconds * 1e3 + (orderByValue.nanoseconds || 0) / 1e6;
+    }
+    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
+   */
+  getCursorValuesForStartAfter(lastDoc, orderByField = "createdAt") {
+    if (!lastDoc) return null;
+    if (typeof lastDoc.data === "function") {
+      return [lastDoc];
+    }
+    if (lastDoc.__cursor && Array.isArray(lastDoc.values)) {
+      if (orderByField === "createdAt" && typeof lastDoc.values[0] === "number") {
+        const timestamp = Timestamp36.fromMillis(lastDoc.values[0]);
+        return [timestamp];
+      }
+      return lastDoc.values;
+    }
+    if (Array.isArray(lastDoc)) {
+      return lastDoc;
+    }
+    if (lastDoc[orderByField]) {
+      let value = lastDoc[orderByField];
+      if (typeof value === "number" && orderByField === "createdAt") {
+        value = Timestamp36.fromMillis(value);
+      } else if (value.seconds && orderByField === "createdAt") {
+        value = new Timestamp36(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
@@ -22937,12 +23001,10 @@ var ProcedureService = class extends BaseService {
           constraints.push(where33("nameLower", "<=", searchTerm + "\uF8FF"));
           constraints.push(orderBy18("nameLower"));
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push(startAfter14(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push(startAfter14(...filters.lastDoc));
-            } else {
-              constraints.push(startAfter14(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "nameLower");
+            if (cursorValues) {
+              constraints.push(startAfter14(...cursorValues));
+              console.log("[PROCEDURE_SERVICE] Strategy 1: Using cursor for pagination");
             }
           }
           constraints.push(limit16(filters.pagination || 10));
@@ -22961,8 +23023,9 @@ var ProcedureService = class extends BaseService {
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
-          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-          return { procedures, lastDoc };
+          const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "nameLower");
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 1 failed:", error);
         }
@@ -22980,12 +23043,10 @@ var ProcedureService = class extends BaseService {
           constraints.push(where33("name", "<=", searchTerm + "\uF8FF"));
           constraints.push(orderBy18("name"));
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push(startAfter14(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push(startAfter14(...filters.lastDoc));
-            } else {
-              constraints.push(startAfter14(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "name");
+            if (cursorValues) {
+              constraints.push(startAfter14(...cursorValues));
+              console.log("[PROCEDURE_SERVICE] Strategy 2: Using cursor for pagination");
             }
           }
           constraints.push(limit16(filters.pagination || 10));
@@ -23004,8 +23065,9 @@ var ProcedureService = class extends BaseService {
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
-          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-          return { procedures, lastDoc };
+          const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "name");
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 2 failed:", error);
         }
@@ -23055,12 +23117,10 @@ var ProcedureService = class extends BaseService {
         );
         constraints.push(orderBy18("createdAt", "desc"));
         if (filters.lastDoc) {
-          if (typeof filters.lastDoc.data === "function") {
-            constraints.push(startAfter14(filters.lastDoc));
-          } else if (Array.isArray(filters.lastDoc)) {
-            constraints.push(startAfter14(...filters.lastDoc));
-          } else {
-            constraints.push(startAfter14(filters.lastDoc));
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "createdAt");
+          if (cursorValues) {
+            constraints.push(startAfter14(...cursorValues));
+            console.log("[PROCEDURE_SERVICE] Strategy 3: Using cursor for pagination");
           }
         }
         constraints.push(limit16(filters.pagination || 10));
@@ -23091,8 +23151,9 @@ var ProcedureService = class extends BaseService {
         if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        return { procedures, lastDoc };
+        const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "createdAt");
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 3 failed:", error);
       }
@@ -23108,6 +23169,13 @@ var ProcedureService = class extends BaseService {
         if (filters.clinicId) {
           constraints.push(where33("clinicBranchId", "==", filters.clinicId));
         }
+        if (filters.lastDoc) {
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "createdAt");
+          if (cursorValues) {
+            constraints.push(startAfter14(...cursorValues));
+            console.log("[PROCEDURE_SERVICE] Strategy 4: Using cursor for pagination");
+          }
+        }
         constraints.push(limit16(filters.pagination || 10));
         const q = query33(collection33(this.db, PROCEDURES_COLLECTION), ...constraints);
         const querySnapshot = await getDocs33(q);
@@ -23122,8 +23190,9 @@ var ProcedureService = class extends BaseService {
         if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        return { procedures, lastDoc };
+        const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "createdAt");
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 4 failed:", error);
       }

package/package.json

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

package/src/admin/aggregation/appointment/appointment.aggregation.service.ts

@@ -497,6 +497,18 @@ export class AppointmentAggregationService {
             );
           }
 
+          // Send reschedule proposal push notification to patient
+          if (patientProfile?.expoTokens && patientProfile.expoTokens.length > 0) {
+            Logger.info(
+              `[AggService] Sending reschedule proposal push notification to patient ${after.patientId}`,
+            );
+            await this.notificationsAdmin.sendAppointmentRescheduledProposalPush(
+              after,
+              after.patientId,
+              patientProfile.expoTokens,
+            );
+          }
+
           Logger.info(
             `[AggService] TODO: Send reschedule proposal notifications to practitioner as well.`,
           );