@blackcode_sa/metaestetics-api 1.14.57 → 1.14.58

package/dist/index.mjs

@@ -21583,6 +21583,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 +22839,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 +23000,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 +23022,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 +23042,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 +23064,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 +23116,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 +23150,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 +23168,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 +23189,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.58",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

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

@@ -411,6 +411,285 @@ const clinicAppointmentRequestedTemplate = `
 </html>
 `;
 
+const appointmentRescheduledProposalTemplate = `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Appointment Reschedule Proposal</title>
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: linear-gradient(135deg, #a48a76 0%, #67574A 100%);
+            min-height: 100vh;
+        }
+        .email-container {
+            max-width: 600px;
+            margin: 0 auto;
+            background: #ffffff;
+            border-radius: 20px;
+            overflow: hidden;
+            box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+            margin-top: 40px;
+            margin-bottom: 40px;
+        }
+        .header {
+            background: linear-gradient(135deg, #ff9800 0%, #f57c00 100%);
+            padding: 40px 30px;
+            text-align: center;
+            color: white;
+        }
+        .header h1 {
+            margin: 0;
+            font-size: 28px;
+            font-weight: 300;
+            letter-spacing: 1px;
+        }
+        .header .subtitle {
+            margin: 10px 0 0 0;
+            font-size: 16px;
+            opacity: 0.9;
+            font-weight: 300;
+        }
+        .content {
+            padding: 40px 30px;
+        }
+        .greeting {
+            font-size: 18px;
+            color: #333;
+            margin-bottom: 25px;
+            font-weight: 400;
+        }
+        .info-box {
+            background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
+            border-radius: 15px;
+            padding: 25px;
+            margin: 25px 0;
+            border-left: 5px solid #ff9800;
+        }
+        .info-box p {
+            margin: 0;
+            color: #e65100;
+            font-size: 15px;
+            font-weight: 500;
+            line-height: 1.6;
+        }
+        .time-comparison {
+            display: grid;
+            gap: 20px;
+            margin: 25px 0;
+        }
+        .time-card {
+            background: linear-gradient(135deg, #f8f6f5 0%, #f5f3f2 100%);
+            border-radius: 15px;
+            padding: 25px;
+            border-left: 5px solid #a48a76;
+        }
+        .time-card.old-time {
+            border-left-color: #9e9e9e;
+            opacity: 0.8;
+        }
+        .time-card.new-time {
+            border-left-color: #ff9800;
+            background: linear-gradient(135deg, #fff8e1 0%, #ffe0b2 100%);
+        }
+        .time-label {
+            font-size: 14px;
+            font-weight: 600;
+            color: #666;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            margin-bottom: 10px;
+        }
+        .time-label.old {
+            color: #757575;
+        }
+        .time-label.new {
+            color: #f57c00;
+        }
+        .appointment-card {
+            background: linear-gradient(135deg, #f8f6f5 0%, #f5f3f2 100%);
+            border-radius: 15px;
+            padding: 30px;
+            margin: 25px 0;
+            border-left: 5px solid #a48a76;
+        }
+        .appointment-title {
+            font-size: 20px;
+            color: #a48a76;
+            margin-bottom: 20px;
+            font-weight: 600;
+        }
+        .appointment-details {
+            display: grid;
+            gap: 15px;
+        }
+        .detail-row {
+            display: flex;
+            align-items: center;
+            padding: 8px 0;
+        }
+        .detail-label {
+            font-weight: 600;
+            color: #555;
+            min-width: 120px;
+            font-size: 14px;
+        }
+        .detail-value {
+            color: #333;
+            font-size: 16px;
+            font-weight: 500;
+        }
+        .procedure-name {
+            color: #67574A;
+            font-weight: 600;
+        }
+        .clinic-name {
+            color: #a48a76;
+            font-weight: 600;
+        }
+        .action-section {
+            background: linear-gradient(135deg, #e8f5e9 0%, #c8e6c9 100%);
+            border-radius: 15px;
+            padding: 30px;
+            margin: 30px 0;
+            text-align: center;
+            border-left: 5px solid #4caf50;
+        }
+        .action-section h3 {
+            margin: 0 0 15px 0;
+            color: #2e7d32;
+            font-weight: 600;
+            font-size: 18px;
+        }
+        .action-section p {
+            margin: 0 0 20px 0;
+            color: #555;
+            font-size: 15px;
+            line-height: 1.6;
+        }
+        .footer {
+            background: #f8f9fa;
+            padding: 25px 30px;
+            text-align: center;
+            color: #666;
+            font-size: 14px;
+            border-top: 1px solid #eee;
+        }
+        .logo {
+            font-size: 24px;
+            font-weight: 700;
+            color: white;
+            margin-bottom: 5px;
+        }
+        .divider {
+            height: 2px;
+            background: linear-gradient(90deg, #a48a76, #67574A);
+            margin: 25px 0;
+            border-radius: 1px;
+        }
+        .icon {
+            text-align: center;
+            margin: 20px 0;
+            font-size: 48px;
+        }
+        .arrow {
+            text-align: center;
+            font-size: 32px;
+            color: #ff9800;
+            margin: 10px 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="email-container">
+        <div class="header">
+            <div class="logo">MetaEstetics</div>
+            <h1>Appointment Reschedule Proposal</h1>
+            <div class="subtitle">Action Required</div>
+        </div>
+        
+        <div class="content">
+            <div class="icon">📅</div>
+            
+            <div class="greeting">
+                Dear <strong>{{patientName}}</strong>,
+            </div>
+            
+            <p style="color: #555; font-size: 16px; line-height: 1.6; margin-bottom: 25px;">
+                We hope this message finds you well. We need to propose a new time for your upcoming appointment. Please review the details below and confirm if the new time works for you.
+            </p>
+            
+            <div class="info-box">
+                <p><strong>⚠️ Important:</strong> Please respond to this reschedule proposal as soon as possible. Your appointment will remain pending until you confirm or reject the new time.</p>
+            </div>
+            
+            <div class="appointment-card">
+                <div class="appointment-title">📋 Appointment Details</div>
+                <div class="appointment-details">
+                    <div class="detail-row">
+                        <div class="detail-label">Procedure:</div>
+                        <div class="detail-value procedure-name">{{procedureName}}</div>
+                    </div>
+                    <div class="detail-row">
+                        <div class="detail-label">Practitioner:</div>
+                        <div class="detail-value">{{practitionerName}}</div>
+                    </div>
+                    <div class="detail-row">
+                        <div class="detail-label">Location:</div>
+                        <div class="detail-value clinic-name">{{clinicName}}</div>
+                    </div>
+                </div>
+            </div>
+            
+            <div class="time-comparison">
+                <div class="time-card old-time">
+                    <div class="time-label old">Previous Time</div>
+                    <div style="font-size: 18px; font-weight: 600; color: #424242; margin-bottom: 8px;">{{previousDate}}</div>
+                    <div style="font-size: 16px; color: #616161;">{{previousTime}}</div>
+                </div>
+                
+                <div class="arrow">↓</div>
+                
+                <div class="time-card new-time">
+                    <div class="time-label new">Proposed New Time</div>
+                    <div style="font-size: 18px; font-weight: 600; color: #e65100; margin-bottom: 8px;">{{newDate}}</div>
+                    <div style="font-size: 16px; color: #f57c00; font-weight: 500;">{{newTime}}</div>
+                </div>
+            </div>
+            
+            <div class="divider"></div>
+            
+            <div class="action-section">
+                <h3>What's Next?</h3>
+                <p>
+                    Please open the MetaEstetics app to accept or reject this reschedule proposal. 
+                    If the new time works for you, simply tap "Accept Reschedule". 
+                    If not, you can reject it and we'll work with you to find an alternative time.
+                </p>
+            </div>
+            
+            <p style="color: #555; font-size: 14px; line-height: 1.6; margin-top: 25px;">
+                <strong>Need Help?</strong> If you have any questions or concerns about this reschedule, please contact us directly through the app or reach out to {{clinicName}}.
+            </p>
+        </div>
+        
+        <div class="footer">
+            <p style="margin: 0 0 10px 0;">
+                <strong>MetaEstetics</strong> - Premium Aesthetic Services
+            </p>
+            <p style="margin: 0; font-size: 12px; color: #999;">
+                This is an automated message. Please do not reply to this email.
+            </p>
+        </div>
+    </div>
+</body>
+</html>
+`;
+
 // --- Interface Definitions for Email Data ---
 
 export interface AppointmentEmailDataBase {
@@ -707,13 +986,115 @@ export class AppointmentMailingService extends BaseMailingService {
     return Promise.resolve();
   }
 
+  /**
+   * Sends a reschedule proposal email to the patient
+   * @param data - Appointment reschedule proposal email data
+   * @returns Promise with the sending result
+   */
   async sendAppointmentRescheduledProposalEmail(
     data: AppointmentRescheduledProposalEmailData,
   ): Promise<any> {
     Logger.info(
-      `[AppointmentMailingService] Placeholder for sendAppointmentRescheduledProposalEmail to patient: ${data.patientProfile.id}`,
+      `[AppointmentMailingService] Preparing to send reschedule proposal email to patient: ${data.patientProfile.id}`,
     );
-    return Promise.resolve();
+
+    const recipientEmail = data.patientProfile.email;
+
+    if (!recipientEmail) {
+      Logger.error('[AppointmentMailingService] Patient email not found for reschedule proposal.', {
+        patientId: data.patientProfile.id,
+      });
+      throw new Error('Patient email address is missing.');
+    }
+
+    // Get clinic timezone from appointment data, default to UTC if not available
+    const clinicTimezone = data.appointment.clinic_tz || 'UTC';
+
+    Logger.debug('[AppointmentMailingService] Formatting appointment times for reschedule', {
+      clinicTimezone,
+      previousTime: data.previousStartTime.toDate().toISOString(),
+      newTime: data.appointment.appointmentStartTime.toDate().toISOString(),
+    });
+
+    // Format previous time
+    const previousFormattedTime = this.formatTimestampInClinicTimezone(
+      data.previousStartTime,
+      clinicTimezone,
+      'time',
+    );
+    const previousFormattedDate = this.formatTimestampInClinicTimezone(
+      data.previousStartTime,
+      clinicTimezone,
+      'date',
+    );
+    const previousTimezoneName = this.getTimezoneDisplayName(clinicTimezone);
+
+    // Format new proposed time
+    const newFormattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      'time',
+    );
+    const newFormattedDate = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      'date',
+    );
+    const newTimezoneName = this.getTimezoneDisplayName(clinicTimezone);
+
+    const templateVariables = {
+      patientName: data.appointment.patientInfo.fullName,
+      procedureName: data.appointment.procedureInfo.name,
+      practitionerName: data.appointment.practitionerInfo.name,
+      clinicName: data.appointment.clinicInfo.name,
+      previousDate: previousFormattedDate,
+      previousTime: `${previousFormattedTime} (${previousTimezoneName})`,
+      newDate: newFormattedDate,
+      newTime: `${newFormattedTime} (${newTimezoneName})`,
+    };
+
+    const html = this.renderTemplate(appointmentRescheduledProposalTemplate, templateVariables);
+    const subject =
+      data.options?.customSubject ||
+      `Action Required: Reschedule Proposal for Your ${data.appointment.procedureInfo.name} Appointment`;
+    const fromAddress =
+      data.options?.fromAddress ||
+      `MetaEstetics <no-reply@${data.options?.mailgunDomain || this.DEFAULT_MAILGUN_DOMAIN}>`;
+    const domainToSendFrom = data.options?.mailgunDomain || this.DEFAULT_MAILGUN_DOMAIN;
+
+    const mailgunSendData = {
+      to: recipientEmail,
+      from: fromAddress,
+      subject,
+      html,
+    };
+
+    try {
+      const result = await this.sendEmail(domainToSendFrom, mailgunSendData);
+      await this.logEmailAttempt(
+        { to: recipientEmail, subject, templateName: 'appointment_rescheduled_proposal' },
+        true,
+      );
+      Logger.info(
+        `[AppointmentMailingService] Successfully sent reschedule proposal email to ${recipientEmail}`,
+      );
+      return result;
+    } catch (error) {
+      await this.logEmailAttempt(
+        {
+          to: recipientEmail,
+          subject,
+          templateName: 'appointment_rescheduled_proposal',
+        },
+        false,
+        error,
+      );
+      Logger.error(
+        `[AppointmentMailingService] Error sending reschedule proposal email to ${recipientEmail}:`,
+        error,
+      );
+      throw error;
+    }
   }
 
   async sendReviewRequestEmail(data: ReviewRequestEmailData): Promise<any> {