npm - @blackcode_sa/metaestetics-api - Versions diffs - 1.14.58 → 1.14.60 - Mend

@blackcode_sa/metaestetics-api 1.14.58 → 1.14.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/admin/index.d.mts +42 -1
package/dist/admin/index.d.ts +42 -1
package/dist/admin/index.js +572 -19
package/dist/admin/index.mjs +572 -19
package/dist/index.d.mts +19 -2
package/dist/index.d.ts +19 -2
package/dist/index.js +1 -0
package/dist/index.mjs +1 -0
package/package.json +1 -1
package/src/admin/aggregation/appointment/appointment.aggregation.service.ts +28 -6
package/src/admin/mailing/appointment/appointment.mailing.service.ts +498 -7
package/src/admin/notifications/notifications.admin.ts +104 -6
package/src/types/appointment/index.ts +6 -0
package/src/types/notifications/index.ts +14 -0

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

@@ -411,6 +411,306 @@ const clinicAppointmentRequestedTemplate = `
 </html>
 `;
+const appointmentCancelledTemplate = `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Appointment Cancelled</title>
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: linear-gradient(135deg, #d4736c 0%, #b85450 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, #d4736c 0%, #b85450 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;
+        }
+        .cancellation-notice {
+            background: linear-gradient(135deg, #ffebee 0%, #ffcdd2 100%);
+            border-radius: 15px;
+            padding: 25px;
+            margin: 25px 0;
+            border-left: 5px solid #d4736c;
+        }
+        .cancellation-notice p {
+            margin: 0;
+            color: #c62828;
+            font-size: 15px;
+            font-weight: 500;
+            line-height: 1.6;
+        }
+        .cancelled-by-info {
+            background: #fafafa;
+            border-radius: 10px;
+            padding: 15px 20px;
+            margin-top: 15px;
+        }
+        .cancelled-by-info .label {
+            font-size: 12px;
+            color: #757575;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            margin-bottom: 5px;
+        }
+        .cancelled-by-info .value {
+            font-size: 14px;
+            color: #424242;
+            font-weight: 500;
+        }
+        .reason-box {
+            background: linear-gradient(135deg, #fff8e1 0%, #ffecb3 100%);
+            border-radius: 15px;
+            padding: 20px;
+            margin: 20px 0;
+            border-left: 5px solid #ffa000;
+        }
+        .reason-box .label {
+            font-size: 14px;
+            font-weight: 600;
+            color: #e65100;
+            margin-bottom: 8px;
+        }
+        .reason-box .reason-text {
+            font-size: 15px;
+            color: #424242;
+            line-height: 1.6;
+            font-style: italic;
+        }
+        .appointment-card {
+            background: linear-gradient(135deg, #f5f5f5 0%, #eeeeee 100%);
+            border-radius: 15px;
+            padding: 30px;
+            margin: 25px 0;
+            border-left: 5px solid #9e9e9e;
+            opacity: 0.9;
+        }
+        .appointment-title {
+            font-size: 20px;
+            color: #757575;
+            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: #757575;
+            min-width: 120px;
+            font-size: 14px;
+        }
+        .detail-value {
+            color: #616161;
+            font-size: 16px;
+            font-weight: 500;
+            text-decoration: line-through;
+        }
+        .procedure-name {
+            color: #757575;
+            font-weight: 600;
+        }
+        .clinic-name {
+            color: #9e9e9e;
+            font-weight: 600;
+        }
+        .rebook-section {
+            background: linear-gradient(135deg, #e8f5e9 0%, #c8e6c9 100%);
+            border-radius: 15px;
+            padding: 25px;
+            margin: 30px 0;
+            text-align: center;
+            border-left: 5px solid #4caf50;
+        }
+        .rebook-section h3 {
+            margin: 0 0 15px 0;
+            color: #2e7d32;
+            font-weight: 600;
+            font-size: 18px;
+        }
+        .rebook-section p {
+            margin: 0;
+            color: #555;
+            font-size: 15px;
+            line-height: 1.6;
+        }
+        .support-section {
+            background: #f8f9fa;
+            border-radius: 15px;
+            padding: 20px;
+            margin: 25px 0;
+            text-align: center;
+        }
+        .support-section h4 {
+            margin: 0 0 10px 0;
+            color: #555;
+            font-weight: 600;
+            font-size: 16px;
+        }
+        .support-section p {
+            margin: 0;
+            color: #757575;
+            font-size: 14px;
+            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, #d4736c, #b85450);
+            margin: 25px 0;
+            border-radius: 1px;
+        }
+        .icon {
+            text-align: center;
+            margin: 20px 0;
+            font-size: 48px;
+        }
+    </style>
+</head>
+<body>
+    <div class="email-container">
+        <div class="header">
+            <div class="logo">MetaEstetics</div>
+            <h1>Appointment Cancelled</h1>
+            <div class="subtitle">We're Sorry to See This Change</div>
+        </div>
+        <div class="content">
+            <div class="icon">&#10060;</div>
+            <div class="greeting">
+                Dear <strong>{{recipientName}}</strong>,
+            </div>
+            <div class="cancellation-notice">
+                <p><strong>Your appointment has been cancelled.</strong> We wanted to let you know that the following appointment is no longer scheduled.</p>
+                <div class="cancelled-by-info">
+                    <div class="label">Cancelled By</div>
+                    <div class="value">{{cancelledByDisplay}}</div>
+                </div>
+            </div>
+            {{#if cancellationReason}}
+            <div class="reason-box">
+                <div class="label">Reason for Cancellation</div>
+                <div class="reason-text">"{{cancellationReason}}"</div>
+            </div>
+            {{/if}}
+            <div class="appointment-card">
+                <div class="appointment-title">Cancelled 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">Date:</div>
+                        <div class="detail-value">{{appointmentDate}}</div>
+                    </div>
+                    <div class="detail-row">
+                        <div class="detail-label">Time:</div>
+                        <div class="detail-value">{{appointmentTime}}</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="divider"></div>
+            <div class="rebook-section">
+                <h3>Would You Like to Reschedule?</h3>
+                <p>
+                    We'd love to see you! If you'd like to book a new appointment,
+                    simply open the MetaEstetics app and browse available times that work for you.
+                </p>
+            </div>
+            <div class="support-section">
+                <h4>Need Assistance?</h4>
+                <p>
+                    If you have any questions about this cancellation or need help rebooking,
+                    please contact {{clinicName}} directly through the app or reach out to our support team.
+                </p>
+            </div>
+        </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>
+`;
 const appointmentRescheduledProposalTemplate = `
 <!DOCTYPE html>
 <html lang="en">
@@ -571,6 +871,42 @@ const appointmentRescheduledProposalTemplate = `
             font-size: 15px;
             line-height: 1.6;
         }
+        .action-required-box {
+            background: linear-gradient(135deg, #fff3e0 0%, #ffecb3 100%);
+            border: 2px solid #ff9800;
+            border-radius: 15px;
+            padding: 25px;
+            margin: 25px 0;
+            text-align: center;
+        }
+        .action-required-box h3 {
+            margin: 0 0 15px 0;
+            color: #e65100;
+            font-weight: 700;
+            font-size: 18px;
+        }
+        .action-required-box p {
+            margin: 0 0 12px 0;
+            color: #bf360c;
+            font-size: 15px;
+            line-height: 1.6;
+        }
+        .action-required-box p:last-child {
+            margin-bottom: 0;
+        }
+        .pending-notice {
+            background: #fff8e1;
+            border-radius: 8px;
+            padding: 12px 15px;
+            margin-top: 15px;
+            display: inline-block;
+        }
+        .pending-notice p {
+            margin: 0;
+            color: #f57c00;
+            font-size: 14px;
+            font-weight: 600;
+        }
         .footer {
             background: #f8f9fa;
             padding: 25px 30px;
@@ -662,16 +998,29 @@ const appointmentRescheduledProposalTemplate = `
             </div>
             <div class="divider"></div>
+            <div class="action-required-box">
+                <h3>Your Response is Required</h3>
+                <p>
+                    <strong>Missed our notification?</strong> Please open the MetaEstetics app to confirm or reject this reschedule request.
+                </p>
+                <p>
+                    Please respond as soon as possible so we can finalize your appointment.
+                </p>
+                <div class="pending-notice">
+                    <p>Your appointment will remain pending until you respond.</p>
+                </div>
+            </div>
             <div class="action-section">
-                <h3>What's Next?</h3>
+                <h3>How to Respond</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".
+                    Open the MetaEstetics app and navigate to your appointments.
+                    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>
@@ -979,11 +1328,153 @@ export class AppointmentMailingService extends BaseMailingService {
     }
   }
+  /**
+   * Gets a user-friendly display text for who cancelled the appointment
+   * @param cancelledBy - The entity that cancelled the appointment
+   * @param clinicName - The clinic name for context
+   * @returns User-friendly cancellation source text
+   */
+  private getCancelledByDisplayText(
+    cancelledBy: 'patient' | 'clinic' | 'practitioner' | 'system',
+    clinicName: string,
+  ): string {
+    switch (cancelledBy) {
+      case 'patient':
+        return 'Patient Request';
+      case 'clinic':
+        return `${clinicName} (Clinic)`;
+      case 'practitioner':
+        return 'Your Practitioner';
+      case 'system':
+        return 'System (Automatic)';
+      default:
+        return 'Unknown';
+    }
+  }
+  /**
+   * Sends an appointment cancellation email to the recipient
+   * @param data - Appointment cancellation email data
+   * @returns Promise with the sending result
+   */
   async sendAppointmentCancelledEmail(data: AppointmentCancellationEmailData): Promise<any> {
     Logger.info(
-      `[AppointmentMailingService] Placeholder for sendAppointmentCancelledEmail for ${data.recipientRole}: ${data.recipientProfile.id}`,
+      `[AppointmentMailingService] Preparing to send appointment cancellation email to ${data.recipientRole}: ${data.recipientProfile.id}`,
     );
-    return Promise.resolve();
+    const recipientEmail = data.recipientProfile.email;
+    if (!recipientEmail) {
+      Logger.error('[AppointmentMailingService] Recipient email not found for cancellation.', {
+        recipientId: data.recipientProfile.id,
+        role: data.recipientRole,
+      });
+      throw new Error('Recipient 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 time for cancellation', {
+      clinicTimezone,
+      utcTime: data.appointment.appointmentStartTime.toDate().toISOString(),
+    });
+    // Format time with timezone label for clarity
+    const formattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      'time',
+    );
+    const timezoneName = this.getTimezoneDisplayName(clinicTimezone);
+    // Determine the cancelled by source from the appointment
+    const cancelledBy = data.appointment.canceledBy || 'system';
+    const cancelledByDisplay = this.getCancelledByDisplayText(
+      cancelledBy,
+      data.appointment.clinicInfo.name,
+    );
+    // Get recipient name based on role
+    const recipientName =
+      data.recipientRole === 'patient'
+        ? data.appointment.patientInfo.fullName
+        : data.appointment.practitionerInfo.name;
+    // Build template variables
+    const templateVariables: Record<string, string> = {
+      recipientName,
+      procedureName: data.appointment.procedureInfo.name,
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        'date',
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
+      practitionerName: data.appointment.practitionerInfo.name,
+      clinicName: data.appointment.clinicInfo.name,
+      cancelledByDisplay,
+    };
+    // Handle cancellation reason - render with or without the reason block
+    const cancellationReason = data.cancellationReason || data.appointment.cancellationReason;
+    let html = appointmentCancelledTemplate;
+    if (cancellationReason) {
+      // Replace the conditional block with the reason content
+      templateVariables.cancellationReason = cancellationReason;
+      html = html.replace(
+        /\{\{#if cancellationReason\}\}([\s\S]*?)\{\{\/if\}\}/g,
+        '$1',
+      );
+    } else {
+      // Remove the conditional block entirely
+      html = html.replace(/\{\{#if cancellationReason\}\}[\s\S]*?\{\{\/if\}\}/g, '');
+    }
+    html = this.renderTemplate(html, templateVariables);
+    const subject =
+      data.options?.customSubject ||
+      `Appointment Cancelled: ${data.appointment.procedureInfo.name}`;
+    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_cancelled' },
+        true,
+      );
+      Logger.info(
+        `[AppointmentMailingService] Successfully sent cancellation email to ${recipientEmail}`,
+      );
+      return result;
+    } catch (error) {
+      await this.logEmailAttempt(
+        {
+          to: recipientEmail,
+          subject,
+          templateName: 'appointment_cancelled',
+        },
+        false,
+        error,
+      );
+      Logger.error(
+        `[AppointmentMailingService] Error sending cancellation email to ${recipientEmail}:`,
+        error,
+      );
+      throw error;
+    }
   }
   /**

package/src/admin/notifications/notifications.admin.ts CHANGED Viewed

@@ -43,6 +43,47 @@ export class NotificationsAdmin {
     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
    */
@@ -406,7 +447,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -479,7 +520,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -527,7 +568,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -583,7 +624,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -631,7 +672,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -692,7 +733,7 @@ export class NotificationsAdmin {
     };
     try {
-      const notificationId = await this.createNotification(
+      const notificationId = await this.createAndSendNotificationImmediately(
         notificationData as Notification
       );
       console.log(
@@ -707,4 +748,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.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;
+    }
+  }
 }