@blackcode_sa/metaestetics-api 1.12.57 → 1.12.59

package/dist/admin/index.d.mts

@@ -3558,6 +3558,20 @@ interface ReviewAddedEmailData extends AppointmentEmailDataBase {
 declare class AppointmentMailingService extends BaseMailingService {
     private readonly DEFAULT_MAILGUN_DOMAIN;
     constructor(firestore: admin.firestore.Firestore, mailgunClient: NewMailgunClient$2);
+    /**
+     * Formats a Firestore Timestamp in the clinic's timezone
+     * @param timestamp - Firestore Timestamp (UTC)
+     * @param clinicTimezone - IANA timezone string (e.g., "Europe/Zurich")
+     * @param format - Format type: 'date', 'time', or 'datetime'
+     * @returns Formatted string in clinic's local timezone
+     */
+    private formatTimestampInClinicTimezone;
+    /**
+     * Gets a user-friendly display name for a timezone
+     * @param timezone - IANA timezone string (e.g., "Europe/Zurich")
+     * @returns User-friendly timezone name (e.g., "Clinic Time - Europe/Zurich")
+     */
+    private getTimezoneDisplayName;
     sendAppointmentConfirmedEmail(data: AppointmentConfirmationEmailData): Promise<any>;
     sendAppointmentRequestedEmailToClinic(data: AppointmentRequestedEmailData): Promise<any>;
     sendAppointmentCancelledEmail(data: AppointmentCancellationEmailData): Promise<any>;

package/dist/admin/index.d.ts

@@ -3558,6 +3558,20 @@ interface ReviewAddedEmailData extends AppointmentEmailDataBase {
 declare class AppointmentMailingService extends BaseMailingService {
     private readonly DEFAULT_MAILGUN_DOMAIN;
     constructor(firestore: admin.firestore.Firestore, mailgunClient: NewMailgunClient$2);
+    /**
+     * Formats a Firestore Timestamp in the clinic's timezone
+     * @param timestamp - Firestore Timestamp (UTC)
+     * @param clinicTimezone - IANA timezone string (e.g., "Europe/Zurich")
+     * @param format - Format type: 'date', 'time', or 'datetime'
+     * @returns Formatted string in clinic's local timezone
+     */
+    private formatTimestampInClinicTimezone;
+    /**
+     * Gets a user-friendly display name for a timezone
+     * @param timezone - IANA timezone string (e.g., "Europe/Zurich")
+     * @returns User-friendly timezone name (e.g., "Clinic Time - Europe/Zurich")
+     */
+    private getTimezoneDisplayName;
     sendAppointmentConfirmedEmail(data: AppointmentConfirmationEmailData): Promise<any>;
     sendAppointmentRequestedEmailToClinic(data: AppointmentRequestedEmailData): Promise<any>;
     sendAppointmentCancelledEmail(data: AppointmentCancellationEmailData): Promise<any>;

package/dist/admin/index.js

@@ -1765,6 +1765,9 @@ var CalendarAdminService = class {
   }
 };
 
+// src/admin/mailing/appointment/appointment.mailing.service.ts
+var import_luxon = require("luxon");
+
 // src/admin/mailing/base.mailing.service.ts
 var admin5 = __toESM(require("firebase-admin"));
 var BaseMailingService = class {
@@ -2323,6 +2326,62 @@ var AppointmentMailingService = class extends BaseMailingService {
     this.DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";
     Logger.info("[AppointmentMailingService] Initialized.");
   }
+  /**
+   * Formats a Firestore Timestamp in the clinic's timezone
+   * @param timestamp - Firestore Timestamp (UTC)
+   * @param clinicTimezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @param format - Format type: 'date', 'time', or 'datetime'
+   * @returns Formatted string in clinic's local timezone
+   */
+  formatTimestampInClinicTimezone(timestamp, clinicTimezone, format = "datetime") {
+    try {
+      const dateTimeInClinicTz = import_luxon.DateTime.fromMillis(timestamp.toMillis(), {
+        zone: clinicTimezone
+      });
+      switch (format) {
+        case "date":
+          return dateTimeInClinicTz.toLocaleString(import_luxon.DateTime.DATE_FULL);
+        case "time":
+          return dateTimeInClinicTz.toLocaleString(import_luxon.DateTime.TIME_SIMPLE);
+        case "datetime":
+          return dateTimeInClinicTz.toLocaleString(import_luxon.DateTime.DATETIME_FULL);
+        default:
+          return dateTimeInClinicTz.toLocaleString(import_luxon.DateTime.DATETIME_FULL);
+      }
+    } catch (error) {
+      Logger.error("[AppointmentMailingService] Error formatting timestamp in clinic timezone:", {
+        error: error instanceof Error ? error.message : String(error),
+        clinicTimezone
+      });
+      return timestamp.toDate().toLocaleString();
+    }
+  }
+  /**
+   * Gets a user-friendly display name for a timezone
+   * @param timezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @returns User-friendly timezone name (e.g., "Clinic Time - Europe/Zurich")
+   */
+  getTimezoneDisplayName(timezone) {
+    try {
+      const timezoneMap = {
+        "Europe/Zurich": "Clinic Time - Central European Time",
+        "Europe/London": "Clinic Time - GMT/BST",
+        "America/New_York": "Clinic Time - Eastern Time",
+        "America/Los_Angeles": "Clinic Time - Pacific Time",
+        "Asia/Dubai": "Clinic Time - Gulf Standard Time",
+        "Asia/Karachi": "Clinic Time - Pakistan Standard Time",
+        "Asia/Kolkata": "Clinic Time - India Standard Time",
+        "Australia/Sydney": "Clinic Time - Australian Eastern Time"
+      };
+      return timezoneMap[timezone] || `Clinic Time - ${timezone}`;
+    } catch (error) {
+      Logger.error("[AppointmentMailingService] Error getting timezone display name:", {
+        error: error instanceof Error ? error.message : String(error),
+        timezone
+      });
+      return `Clinic Time - ${timezone}`;
+    }
+  }
   async sendAppointmentConfirmedEmail(data) {
     var _a, _b, _c, _d, _e;
     Logger.info(
@@ -2336,11 +2395,26 @@ var AppointmentMailingService = class extends BaseMailingService {
       });
       throw new Error("Recipient email address is missing.");
     }
+    const clinicTimezone = data.appointment.clinic_tz || "UTC";
+    Logger.debug("[AppointmentMailingService] Formatting appointment time", {
+      clinicTimezone,
+      utcTime: data.appointment.appointmentStartTime.toDate().toISOString()
+    });
+    const formattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      "time"
+    );
+    const timezoneName = this.getTimezoneDisplayName(clinicTimezone);
     const templateVariables = {
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        "date"
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name,
       clinicName: data.appointment.clinicInfo.name
     };
@@ -2387,12 +2461,27 @@ var AppointmentMailingService = class extends BaseMailingService {
       );
       throw new Error("Clinic contact email address is missing.");
     }
+    const clinicTimezone = data.appointment.clinic_tz || "UTC";
+    Logger.debug("[AppointmentMailingService] Formatting appointment time for clinic", {
+      clinicTimezone,
+      utcTime: data.appointment.appointmentStartTime.toDate().toISOString()
+    });
+    const formattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      "time"
+    );
+    const timezoneName = this.getTimezoneDisplayName(clinicTimezone);
     const templateVariables = {
       clinicName: data.clinicProfile.name,
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        "date"
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name
     };
     const html = this.renderTemplate(clinicAppointmentRequestedTemplate, templateVariables);
@@ -6576,7 +6665,7 @@ var ReviewsAggregationService = class {
 
 // src/admin/booking/booking.calculator.ts
 var import_firestore2 = require("firebase/firestore");
-var import_luxon = require("luxon");
+var import_luxon2 = require("luxon");
 var BookingAvailabilityCalculator = class {
   /**
    * Calculate available booking slots based on the provided data
@@ -6667,8 +6756,8 @@ var BookingAvailabilityCalculator = class {
    */
   static createWorkingHoursIntervals(workingHours, startDate, endDate, tz) {
     const workingIntervals = [];
-    let start = import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz });
-    const end = import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz });
+    let start = import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz });
+    const end = import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz });
     while (start <= end) {
       const dayOfWeek = start.weekday;
       const dayName = [
@@ -6698,8 +6787,8 @@ var BookingAvailabilityCalculator = class {
             millisecond: 0
           });
           if (workEnd.toMillis() > startDate.getTime() && workStart.toMillis() < endDate.getTime()) {
-            const intervalStart = workStart < import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
-            const intervalEnd = workEnd > import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
+            const intervalStart = workStart < import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
+            const intervalEnd = workEnd > import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
             workingIntervals.push({
               start: import_firestore2.Timestamp.fromMillis(intervalStart.toMillis()),
               end: import_firestore2.Timestamp.fromMillis(intervalEnd.toMillis())
@@ -6806,8 +6895,8 @@ var BookingAvailabilityCalculator = class {
    */
   static createPractitionerWorkingHoursIntervals(workingHours, startDate, endDate, tz) {
     const workingIntervals = [];
-    let start = import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz });
-    const end = import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz });
+    let start = import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz });
+    const end = import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz });
     while (start <= end) {
       const dayOfWeek = start.weekday;
       const dayName = [
@@ -6830,8 +6919,8 @@ var BookingAvailabilityCalculator = class {
           });
           const workEnd = start.set({ hour: endHours, minute: endMinutes });
           if (workEnd.toMillis() > startDate.getTime() && workStart.toMillis() < endDate.getTime()) {
-            const intervalStart = workStart < import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? import_luxon.DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
-            const intervalEnd = workEnd > import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? import_luxon.DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
+            const intervalStart = workStart < import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? import_luxon2.DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
+            const intervalEnd = workEnd > import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? import_luxon2.DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
             workingIntervals.push({
               start: import_firestore2.Timestamp.fromMillis(intervalStart.toMillis()),
               end: import_firestore2.Timestamp.fromMillis(intervalEnd.toMillis())
@@ -6890,12 +6979,18 @@ var BookingAvailabilityCalculator = class {
     console.log(
       `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
+    const nowInClinicTz = import_luxon2.DateTime.now().setZone(tz);
+    const MINIMUM_BOOKING_WINDOW_MINUTES = 15;
+    const earliestBookableTime = nowInClinicTz.plus({ minutes: MINIMUM_BOOKING_WINDOW_MINUTES });
+    console.log(
+      `Current time in ${tz}: ${nowInClinicTz.toISO()}, earliest bookable: ${earliestBookableTime.toISO()}`
+    );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
       const intervalStart = interval.start.toDate();
       const intervalEnd = interval.end.toDate();
-      let slotStart = import_luxon.DateTime.fromMillis(intervalStart.getTime(), { zone: tz });
+      let slotStart = import_luxon2.DateTime.fromMillis(intervalStart.getTime(), { zone: tz });
       const minutesIntoDay = slotStart.hour * 60 + slotStart.minute;
       const minutesRemainder = minutesIntoDay % intervalMinutes;
       if (minutesRemainder > 0) {
@@ -6905,7 +7000,8 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
+        const isInFuture = slotStart >= earliestBookableTime;
+        if (isInFuture && this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: import_firestore2.Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -6913,7 +7009,7 @@ var BookingAvailabilityCalculator = class {
         slotStart = slotStart.plus({ minutes: intervalMinutes });
       }
     }
-    console.log(`Generated ${slots.length} available slots`);
+    console.log(`Generated ${slots.length} available slots (filtered for future times with ${MINIMUM_BOOKING_WINDOW_MINUTES}min minimum window)`);
     return slots;
   }
   /**
@@ -6927,8 +7023,8 @@ var BookingAvailabilityCalculator = class {
    */
   static isSlotFullyAvailable(slotStart, slotEnd, intervals, tz) {
     return intervals.some((interval) => {
-      const intervalStart = import_luxon.DateTime.fromMillis(interval.start.toMillis(), { zone: tz });
-      const intervalEnd = import_luxon.DateTime.fromMillis(interval.end.toMillis(), { zone: tz });
+      const intervalStart = import_luxon2.DateTime.fromMillis(interval.start.toMillis(), { zone: tz });
+      const intervalEnd = import_luxon2.DateTime.fromMillis(interval.end.toMillis(), { zone: tz });
       return slotStart >= intervalStart && slotEnd <= intervalEnd;
     });
   }

package/dist/admin/index.mjs

@@ -1703,6 +1703,9 @@ var CalendarAdminService = class {
   }
 };
 
+// src/admin/mailing/appointment/appointment.mailing.service.ts
+import { DateTime } from "luxon";
+
 // src/admin/mailing/base.mailing.service.ts
 import * as admin5 from "firebase-admin";
 var BaseMailingService = class {
@@ -2261,6 +2264,62 @@ var AppointmentMailingService = class extends BaseMailingService {
     this.DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";
     Logger.info("[AppointmentMailingService] Initialized.");
   }
+  /**
+   * Formats a Firestore Timestamp in the clinic's timezone
+   * @param timestamp - Firestore Timestamp (UTC)
+   * @param clinicTimezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @param format - Format type: 'date', 'time', or 'datetime'
+   * @returns Formatted string in clinic's local timezone
+   */
+  formatTimestampInClinicTimezone(timestamp, clinicTimezone, format = "datetime") {
+    try {
+      const dateTimeInClinicTz = DateTime.fromMillis(timestamp.toMillis(), {
+        zone: clinicTimezone
+      });
+      switch (format) {
+        case "date":
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATE_FULL);
+        case "time":
+          return dateTimeInClinicTz.toLocaleString(DateTime.TIME_SIMPLE);
+        case "datetime":
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATETIME_FULL);
+        default:
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATETIME_FULL);
+      }
+    } catch (error) {
+      Logger.error("[AppointmentMailingService] Error formatting timestamp in clinic timezone:", {
+        error: error instanceof Error ? error.message : String(error),
+        clinicTimezone
+      });
+      return timestamp.toDate().toLocaleString();
+    }
+  }
+  /**
+   * Gets a user-friendly display name for a timezone
+   * @param timezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @returns User-friendly timezone name (e.g., "Clinic Time - Europe/Zurich")
+   */
+  getTimezoneDisplayName(timezone) {
+    try {
+      const timezoneMap = {
+        "Europe/Zurich": "Clinic Time - Central European Time",
+        "Europe/London": "Clinic Time - GMT/BST",
+        "America/New_York": "Clinic Time - Eastern Time",
+        "America/Los_Angeles": "Clinic Time - Pacific Time",
+        "Asia/Dubai": "Clinic Time - Gulf Standard Time",
+        "Asia/Karachi": "Clinic Time - Pakistan Standard Time",
+        "Asia/Kolkata": "Clinic Time - India Standard Time",
+        "Australia/Sydney": "Clinic Time - Australian Eastern Time"
+      };
+      return timezoneMap[timezone] || `Clinic Time - ${timezone}`;
+    } catch (error) {
+      Logger.error("[AppointmentMailingService] Error getting timezone display name:", {
+        error: error instanceof Error ? error.message : String(error),
+        timezone
+      });
+      return `Clinic Time - ${timezone}`;
+    }
+  }
   async sendAppointmentConfirmedEmail(data) {
     var _a, _b, _c, _d, _e;
     Logger.info(
@@ -2274,11 +2333,26 @@ var AppointmentMailingService = class extends BaseMailingService {
       });
       throw new Error("Recipient email address is missing.");
     }
+    const clinicTimezone = data.appointment.clinic_tz || "UTC";
+    Logger.debug("[AppointmentMailingService] Formatting appointment time", {
+      clinicTimezone,
+      utcTime: data.appointment.appointmentStartTime.toDate().toISOString()
+    });
+    const formattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      "time"
+    );
+    const timezoneName = this.getTimezoneDisplayName(clinicTimezone);
     const templateVariables = {
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        "date"
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name,
       clinicName: data.appointment.clinicInfo.name
     };
@@ -2325,12 +2399,27 @@ var AppointmentMailingService = class extends BaseMailingService {
       );
       throw new Error("Clinic contact email address is missing.");
     }
+    const clinicTimezone = data.appointment.clinic_tz || "UTC";
+    Logger.debug("[AppointmentMailingService] Formatting appointment time for clinic", {
+      clinicTimezone,
+      utcTime: data.appointment.appointmentStartTime.toDate().toISOString()
+    });
+    const formattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      "time"
+    );
+    const timezoneName = this.getTimezoneDisplayName(clinicTimezone);
     const templateVariables = {
       clinicName: data.clinicProfile.name,
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        "date"
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name
     };
     const html = this.renderTemplate(clinicAppointmentRequestedTemplate, templateVariables);
@@ -6514,7 +6603,7 @@ var ReviewsAggregationService = class {
 
 // src/admin/booking/booking.calculator.ts
 import { Timestamp } from "firebase/firestore";
-import { DateTime } from "luxon";
+import { DateTime as DateTime2 } from "luxon";
 var BookingAvailabilityCalculator = class {
   /**
    * Calculate available booking slots based on the provided data
@@ -6605,8 +6694,8 @@ var BookingAvailabilityCalculator = class {
    */
   static createWorkingHoursIntervals(workingHours, startDate, endDate, tz) {
     const workingIntervals = [];
-    let start = DateTime.fromMillis(startDate.getTime(), { zone: tz });
-    const end = DateTime.fromMillis(endDate.getTime(), { zone: tz });
+    let start = DateTime2.fromMillis(startDate.getTime(), { zone: tz });
+    const end = DateTime2.fromMillis(endDate.getTime(), { zone: tz });
     while (start <= end) {
       const dayOfWeek = start.weekday;
       const dayName = [
@@ -6636,8 +6725,8 @@ var BookingAvailabilityCalculator = class {
             millisecond: 0
           });
           if (workEnd.toMillis() > startDate.getTime() && workStart.toMillis() < endDate.getTime()) {
-            const intervalStart = workStart < DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
-            const intervalEnd = workEnd > DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
+            const intervalStart = workStart < DateTime2.fromMillis(startDate.getTime(), { zone: tz }) ? DateTime2.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
+            const intervalEnd = workEnd > DateTime2.fromMillis(endDate.getTime(), { zone: tz }) ? DateTime2.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
             workingIntervals.push({
               start: Timestamp.fromMillis(intervalStart.toMillis()),
               end: Timestamp.fromMillis(intervalEnd.toMillis())
@@ -6744,8 +6833,8 @@ var BookingAvailabilityCalculator = class {
    */
   static createPractitionerWorkingHoursIntervals(workingHours, startDate, endDate, tz) {
     const workingIntervals = [];
-    let start = DateTime.fromMillis(startDate.getTime(), { zone: tz });
-    const end = DateTime.fromMillis(endDate.getTime(), { zone: tz });
+    let start = DateTime2.fromMillis(startDate.getTime(), { zone: tz });
+    const end = DateTime2.fromMillis(endDate.getTime(), { zone: tz });
     while (start <= end) {
       const dayOfWeek = start.weekday;
       const dayName = [
@@ -6768,8 +6857,8 @@ var BookingAvailabilityCalculator = class {
           });
           const workEnd = start.set({ hour: endHours, minute: endMinutes });
           if (workEnd.toMillis() > startDate.getTime() && workStart.toMillis() < endDate.getTime()) {
-            const intervalStart = workStart < DateTime.fromMillis(startDate.getTime(), { zone: tz }) ? DateTime.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
-            const intervalEnd = workEnd > DateTime.fromMillis(endDate.getTime(), { zone: tz }) ? DateTime.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
+            const intervalStart = workStart < DateTime2.fromMillis(startDate.getTime(), { zone: tz }) ? DateTime2.fromMillis(startDate.getTime(), { zone: tz }) : workStart;
+            const intervalEnd = workEnd > DateTime2.fromMillis(endDate.getTime(), { zone: tz }) ? DateTime2.fromMillis(endDate.getTime(), { zone: tz }) : workEnd;
             workingIntervals.push({
               start: Timestamp.fromMillis(intervalStart.toMillis()),
               end: Timestamp.fromMillis(intervalEnd.toMillis())
@@ -6828,12 +6917,18 @@ var BookingAvailabilityCalculator = class {
     console.log(
       `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
+    const nowInClinicTz = DateTime2.now().setZone(tz);
+    const MINIMUM_BOOKING_WINDOW_MINUTES = 15;
+    const earliestBookableTime = nowInClinicTz.plus({ minutes: MINIMUM_BOOKING_WINDOW_MINUTES });
+    console.log(
+      `Current time in ${tz}: ${nowInClinicTz.toISO()}, earliest bookable: ${earliestBookableTime.toISO()}`
+    );
     const durationMs = durationMinutes * 60 * 1e3;
     const intervalMs = intervalMinutes * 60 * 1e3;
     for (const interval of intervals) {
       const intervalStart = interval.start.toDate();
       const intervalEnd = interval.end.toDate();
-      let slotStart = DateTime.fromMillis(intervalStart.getTime(), { zone: tz });
+      let slotStart = DateTime2.fromMillis(intervalStart.getTime(), { zone: tz });
       const minutesIntoDay = slotStart.hour * 60 + slotStart.minute;
       const minutesRemainder = minutesIntoDay % intervalMinutes;
       if (minutesRemainder > 0) {
@@ -6843,7 +6938,8 @@ var BookingAvailabilityCalculator = class {
       }
       while (slotStart.toMillis() + durationMs <= intervalEnd.getTime()) {
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
+        const isInFuture = slotStart >= earliestBookableTime;
+        if (isInFuture && this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: Timestamp.fromMillis(slotStart.toMillis())
           });
@@ -6851,7 +6947,7 @@ var BookingAvailabilityCalculator = class {
         slotStart = slotStart.plus({ minutes: intervalMinutes });
       }
     }
-    console.log(`Generated ${slots.length} available slots`);
+    console.log(`Generated ${slots.length} available slots (filtered for future times with ${MINIMUM_BOOKING_WINDOW_MINUTES}min minimum window)`);
     return slots;
   }
   /**
@@ -6865,8 +6961,8 @@ var BookingAvailabilityCalculator = class {
    */
   static isSlotFullyAvailable(slotStart, slotEnd, intervals, tz) {
     return intervals.some((interval) => {
-      const intervalStart = DateTime.fromMillis(interval.start.toMillis(), { zone: tz });
-      const intervalEnd = DateTime.fromMillis(interval.end.toMillis(), { zone: tz });
+      const intervalStart = DateTime2.fromMillis(interval.start.toMillis(), { zone: tz });
+      const intervalEnd = DateTime2.fromMillis(interval.end.toMillis(), { zone: tz });
       return slotStart >= intervalStart && slotEnd <= intervalEnd;
     });
   }

package/package.json

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

package/src/admin/booking/booking.calculator.ts

@@ -484,6 +484,16 @@ export class BookingAvailabilityCalculator {
       `Generating slots with ${intervalMinutes}min intervals for ${durationMinutes}min procedure in timezone ${tz}`
     );
 
+    // Get current time in clinic timezone
+    const nowInClinicTz = DateTime.now().setZone(tz);
+    // Add minimum booking window (15 minutes from now)
+    const MINIMUM_BOOKING_WINDOW_MINUTES = 15;
+    const earliestBookableTime = nowInClinicTz.plus({ minutes: MINIMUM_BOOKING_WINDOW_MINUTES });
+    
+    console.log(
+      `Current time in ${tz}: ${nowInClinicTz.toISO()}, earliest bookable: ${earliestBookableTime.toISO()}`
+    );
+
     // Convert duration to milliseconds
     const durationMs = durationMinutes * 60 * 1000;
     // Convert interval to milliseconds
@@ -513,8 +523,11 @@ export class BookingAvailabilityCalculator {
         // Calculate potential end time
         const slotEnd = slotStart.plus({ minutes: durationMinutes });
 
-        // Check if this slot fits entirely within one of our available intervals
-        if (this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
+        // ✅ CRITICAL FIX: Filter out past slots and slots too close to now
+        const isInFuture = slotStart >= earliestBookableTime;
+
+        // Check if this slot fits entirely within one of our available intervals AND is in the future
+        if (isInFuture && this.isSlotFullyAvailable(slotStart, slotEnd, intervals, tz)) {
           slots.push({
             start: Timestamp.fromMillis(slotStart.toMillis()),
           });
@@ -525,7 +538,7 @@ export class BookingAvailabilityCalculator {
       }
     }
 
-    console.log(`Generated ${slots.length} available slots`);
+    console.log(`Generated ${slots.length} available slots (filtered for future times with ${MINIMUM_BOOKING_WINDOW_MINUTES}min minimum window)`);
     return slots;
   }
 

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

@@ -1,4 +1,5 @@
 import * as admin from 'firebase-admin';
+import { DateTime } from 'luxon';
 import { BaseMailingService, NewMailgunClient } from '../base.mailing.service';
 import { Logger } from '../../logger';
 import { Appointment } from '../../../types/appointment';
@@ -466,6 +467,78 @@ export class AppointmentMailingService extends BaseMailingService {
     Logger.info('[AppointmentMailingService] Initialized.');
   }
 
+  /**
+   * Formats a Firestore Timestamp in the clinic's timezone
+   * @param timestamp - Firestore Timestamp (UTC)
+   * @param clinicTimezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @param format - Format type: 'date', 'time', or 'datetime'
+   * @returns Formatted string in clinic's local timezone
+   */
+  private formatTimestampInClinicTimezone(
+    timestamp: admin.firestore.Timestamp,
+    clinicTimezone: string,
+    format: 'date' | 'time' | 'datetime' = 'datetime',
+  ): string {
+    try {
+      // Convert UTC timestamp to clinic's timezone
+      const dateTimeInClinicTz = DateTime.fromMillis(timestamp.toMillis(), {
+        zone: clinicTimezone,
+      });
+
+      // Format based on requested type
+      switch (format) {
+        case 'date':
+          // Format: "Monday, November 5, 2025"
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATE_FULL);
+        case 'time':
+          // Format: "2:30 PM"
+          return dateTimeInClinicTz.toLocaleString(DateTime.TIME_SIMPLE);
+        case 'datetime':
+          // Format: "Monday, November 5, 2025 at 2:30 PM"
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATETIME_FULL);
+        default:
+          return dateTimeInClinicTz.toLocaleString(DateTime.DATETIME_FULL);
+      }
+    } catch (error) {
+      Logger.error('[AppointmentMailingService] Error formatting timestamp in clinic timezone:', {
+        error: error instanceof Error ? error.message : String(error),
+        clinicTimezone,
+      });
+      // Fallback to UTC formatting if timezone conversion fails
+      return timestamp.toDate().toLocaleString();
+    }
+  }
+
+  /**
+   * Gets a user-friendly display name for a timezone
+   * @param timezone - IANA timezone string (e.g., "Europe/Zurich")
+   * @returns User-friendly timezone name (e.g., "Clinic Time - Europe/Zurich")
+   */
+  private getTimezoneDisplayName(timezone: string): string {
+    try {
+      // For common timezones, provide a more readable format
+      const timezoneMap: Record<string, string> = {
+        'Europe/Zurich': 'Clinic Time - Central European Time',
+        'Europe/London': 'Clinic Time - GMT/BST',
+        'America/New_York': 'Clinic Time - Eastern Time',
+        'America/Los_Angeles': 'Clinic Time - Pacific Time',
+        'Asia/Dubai': 'Clinic Time - Gulf Standard Time',
+        'Asia/Karachi': 'Clinic Time - Pakistan Standard Time',
+        'Asia/Kolkata': 'Clinic Time - India Standard Time',
+        'Australia/Sydney': 'Clinic Time - Australian Eastern Time',
+      };
+
+      // Return mapped name if available, otherwise use the IANA timezone
+      return timezoneMap[timezone] || `Clinic Time - ${timezone}`;
+    } catch (error) {
+      Logger.error('[AppointmentMailingService] Error getting timezone display name:', {
+        error: error instanceof Error ? error.message : String(error),
+        timezone,
+      });
+      return `Clinic Time - ${timezone}`;
+    }
+  }
+
   async sendAppointmentConfirmedEmail(data: AppointmentConfirmationEmailData): Promise<any> {
     Logger.info(
       `[AppointmentMailingService] Preparing to send appointment confirmation email to ${data.recipientRole}: ${data.recipientProfile.id}`,
@@ -481,11 +554,31 @@ export class AppointmentMailingService extends BaseMailingService {
       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', {
+      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);
+
     const templateVariables = {
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        'date',
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name,
       clinicName: data.appointment.clinicInfo.name,
     };
@@ -539,12 +632,32 @@ export class AppointmentMailingService extends BaseMailingService {
       throw new Error('Clinic contact 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 clinic', {
+      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);
+
     const templateVariables = {
       clinicName: data.clinicProfile.name,
       patientName: data.appointment.patientInfo.fullName,
       procedureName: data.appointment.procedureInfo.name,
-      appointmentDate: data.appointment.appointmentStartTime.toDate().toLocaleDateString(),
-      appointmentTime: data.appointment.appointmentStartTime.toDate().toLocaleTimeString(),
+      appointmentDate: this.formatTimestampInClinicTimezone(
+        data.appointment.appointmentStartTime,
+        clinicTimezone,
+        'date',
+      ),
+      appointmentTime: `${formattedTime} (${timezoneName})`,
       practitionerName: data.appointment.practitionerInfo.name,
     };