@blackcode_sa/metaestetics-api 1.7.14 → 1.7.16

package/dist/admin/index.d.mts

@@ -2417,6 +2417,12 @@ declare class BookingAdmin {
      * @returns Promise resolving to an array of calendar events
      */
     private getPractitionerCalendarEvents;
+    /**
+     * Summarizes event types for logging purposes
+     * @param events Array of calendar events
+     * @returns Object with counts of each event type
+     */
+    private summarizeEventTypes;
     private _generateCalendarProcedureInfo;
     /**
      * Orchestrates the creation of a new appointment, including data aggregation.
@@ -2430,9 +2436,7 @@ declare class BookingAdmin {
         success: boolean;
         appointmentId?: string;
         appointmentData?: Appointment;
-        practitionerCalendarEventId?: string;
-        patientCalendarEventId?: string;
-        clinicCalendarEventId?: string;
+        calendarEventId?: string;
         error?: string;
     }>;
     private _generateProcedureSummaryInfo;

package/dist/admin/index.d.ts

@@ -2417,6 +2417,12 @@ declare class BookingAdmin {
      * @returns Promise resolving to an array of calendar events
      */
     private getPractitionerCalendarEvents;
+    /**
+     * Summarizes event types for logging purposes
+     * @param events Array of calendar events
+     * @returns Object with counts of each event type
+     */
+    private summarizeEventTypes;
     private _generateCalendarProcedureInfo;
     /**
      * Orchestrates the creation of a new appointment, including data aggregation.
@@ -2430,9 +2436,7 @@ declare class BookingAdmin {
         success: boolean;
         appointmentId?: string;
         appointmentData?: Appointment;
-        practitionerCalendarEventId?: string;
-        patientCalendarEventId?: string;
-        clinicCalendarEventId?: string;
+        calendarEventId?: string;
         error?: string;
     }>;
     private _generateProcedureSummaryInfo;

package/dist/admin/index.js

@@ -6032,33 +6032,76 @@ var BookingAdmin = class {
    * @returns Promise resolving to an array of available booking slots
    */
   async getAvailableBookingSlots(clinicId, practitionerId, procedureId, timeframe) {
+    var _a;
     try {
-      console.log(
-        `[BookingAdmin] Getting available slots for clinic ${clinicId}, practitioner ${practitionerId}, procedure ${procedureId}`
-      );
+      Logger.info("[BookingAdmin] Starting availability calculation", {
+        clinicId,
+        practitionerId,
+        procedureId,
+        timeframeStart: timeframe.start instanceof Date ? timeframe.start.toISOString() : timeframe.start.toDate().toISOString(),
+        timeframeEnd: timeframe.end instanceof Date ? timeframe.end.toISOString() : timeframe.end.toDate().toISOString()
+      });
       const start = timeframe.start instanceof Date ? admin14.firestore.Timestamp.fromDate(timeframe.start) : timeframe.start;
       const end = timeframe.end instanceof Date ? admin14.firestore.Timestamp.fromDate(timeframe.end) : timeframe.end;
+      Logger.debug("[BookingAdmin] Fetching clinic data", { clinicId });
       const clinicDoc = await this.db.collection("clinics").doc(clinicId).get();
       if (!clinicDoc.exists) {
+        Logger.error("[BookingAdmin] Clinic not found", { clinicId });
         throw new Error(`Clinic ${clinicId} not found`);
       }
       const clinic = clinicDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved clinic data", {
+        clinicName: clinic.name,
+        clinicHasWorkingHours: !!clinic.workingHours
+      });
+      Logger.debug("[BookingAdmin] Fetching practitioner data", {
+        practitionerId
+      });
       const practitionerDoc = await this.db.collection("practitioners").doc(practitionerId).get();
       if (!practitionerDoc.exists) {
+        Logger.error("[BookingAdmin] Practitioner not found", {
+          practitionerId
+        });
         throw new Error(`Practitioner ${practitionerId} not found`);
       }
       const practitioner = practitionerDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved practitioner data", {
+        practitionerName: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+        pracWorkingHoursCount: ((_a = practitioner.clinicWorkingHours) == null ? void 0 : _a.length) || 0
+      });
+      Logger.debug("[BookingAdmin] Fetching procedure data", { procedureId });
       const procedureDoc = await this.db.collection("procedures").doc(procedureId).get();
       if (!procedureDoc.exists) {
+        Logger.error("[BookingAdmin] Procedure not found", { procedureId });
         throw new Error(`Procedure ${procedureId} not found`);
       }
       const procedure = procedureDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved procedure data", {
+        procedureName: procedure.name,
+        procedureDuration: procedure.duration
+      });
+      Logger.debug("[BookingAdmin] Fetching clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const clinicCalendarEvents = await this.getClinicCalendarEvents(
         clinicId,
         start,
         end
       );
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        count: clinicCalendarEvents.length
+      });
+      Logger.debug("[BookingAdmin] Fetching practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const practitionerCalendarEvents = await this.getPractitionerCalendarEvents(practitionerId, start, end);
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        count: practitionerCalendarEvents.length
+      });
       const convertedTimeframe = {
         start: this.adminTimestampToClientTimestamp(start),
         end: this.adminTimestampToClientTimestamp(end)
@@ -6073,14 +6116,38 @@ var BookingAdmin = class {
           practitionerCalendarEvents
         )
       };
+      Logger.info("[BookingAdmin] Calling availability calculator", {
+        calculatorInputReady: true,
+        timeframeDurationHours: Math.round(
+          (end.toMillis() - start.toMillis()) / (1e3 * 60 * 60)
+        ),
+        clinicEventsCount: clinicCalendarEvents.length,
+        practitionerEventsCount: practitionerCalendarEvents.length
+      });
       const result = BookingAvailabilityCalculator.calculateSlots(request);
-      return {
+      const availableSlotsResult = {
         availableSlots: result.availableSlots.map((slot) => ({
           start: admin14.firestore.Timestamp.fromMillis(slot.start.toMillis())
         }))
       };
+      Logger.info(
+        "[BookingAdmin] Availability calculation completed successfully",
+        {
+          availableSlotsCount: availableSlotsResult.availableSlots.length,
+          firstSlotTime: availableSlotsResult.availableSlots.length > 0 ? availableSlotsResult.availableSlots[0].start.toDate().toISOString() : "none",
+          lastSlotTime: availableSlotsResult.availableSlots.length > 0 ? availableSlotsResult.availableSlots[availableSlotsResult.availableSlots.length - 1].start.toDate().toISOString() : "none"
+        }
+      );
+      return availableSlotsResult;
     } catch (error) {
-      console.error("[BookingAdmin] Error getting available slots:", error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error getting available slots", {
+        errorMessage,
+        clinicId,
+        practitionerId,
+        procedureId,
+        stack: error instanceof Error ? error.stack : void 0
+      });
       throw error;
     }
   }
@@ -6117,17 +6184,32 @@ var BookingAdmin = class {
    */
   async getClinicCalendarEvents(clinicId, start, end) {
     try {
+      Logger.debug("[BookingAdmin] Querying clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
       const snapshot = await eventsRef.get();
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
       }));
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        clinicId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events)
+      });
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching clinic calendar events:`,
-        error
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error fetching clinic calendar events", {
+        errorMessage,
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+        stack: error instanceof Error ? error.stack : void 0
+      });
       return [];
     }
   }
@@ -6141,20 +6223,51 @@ var BookingAdmin = class {
    */
   async getPractitionerCalendarEvents(practitionerId, start, end) {
     try {
+      Logger.debug("[BookingAdmin] Querying practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
       const snapshot = await eventsRef.get();
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
       }));
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        practitionerId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events)
+      });
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching practitioner calendar events:`,
-        error
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error(
+        "[BookingAdmin] Error fetching practitioner calendar events",
+        {
+          errorMessage,
+          practitionerId,
+          startTime: start.toDate().toISOString(),
+          endTime: end.toDate().toISOString(),
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       return [];
     }
   }
+  /**
+   * Summarizes event types for logging purposes
+   * @param events Array of calendar events
+   * @returns Object with counts of each event type
+   */
+  summarizeEventTypes(events) {
+    const typeCounts = {};
+    events.forEach((event) => {
+      const eventType = event.eventType || "unknown";
+      typeCounts[eventType] = (typeCounts[eventType] || 0) + 1;
+    });
+    return typeCounts;
+  }
   _generateCalendarProcedureInfo(procedure) {
     return {
       name: procedure.name,
@@ -6310,9 +6423,8 @@ var BookingAdmin = class {
         this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         practitionerCalendarEventData
       );
-      const patientCalendarEventId = this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc().id;
       const patientCalendarEventData = {
-        id: patientCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -6331,12 +6443,11 @@ var BookingAdmin = class {
         updatedAt: serverTimestampValue
       };
       batch.set(
-        this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc(patientCalendarEventId),
+        this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         patientCalendarEventData
       );
-      const clinicCalendarEventId = this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc().id;
       const clinicCalendarEventData = {
-        id: clinicCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -6357,7 +6468,7 @@ var BookingAdmin = class {
         updatedAt: serverTimestampValue
       };
       batch.set(
-        this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc(clinicCalendarEventId),
+        this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         clinicCalendarEventData
       );
       let initializedFormsInfo = [];
@@ -6445,9 +6556,7 @@ var BookingAdmin = class {
         success: true,
         appointmentId: newAppointmentId,
         appointmentData: newAppointmentData,
-        practitionerCalendarEventId,
-        patientCalendarEventId,
-        clinicCalendarEventId
+        calendarEventId: practitionerCalendarEventId
       };
     } catch (error) {
       console.error(

package/dist/admin/index.mjs

@@ -5975,33 +5975,76 @@ var BookingAdmin = class {
    * @returns Promise resolving to an array of available booking slots
    */
   async getAvailableBookingSlots(clinicId, practitionerId, procedureId, timeframe) {
+    var _a;
     try {
-      console.log(
-        `[BookingAdmin] Getting available slots for clinic ${clinicId}, practitioner ${practitionerId}, procedure ${procedureId}`
-      );
+      Logger.info("[BookingAdmin] Starting availability calculation", {
+        clinicId,
+        practitionerId,
+        procedureId,
+        timeframeStart: timeframe.start instanceof Date ? timeframe.start.toISOString() : timeframe.start.toDate().toISOString(),
+        timeframeEnd: timeframe.end instanceof Date ? timeframe.end.toISOString() : timeframe.end.toDate().toISOString()
+      });
       const start = timeframe.start instanceof Date ? admin14.firestore.Timestamp.fromDate(timeframe.start) : timeframe.start;
       const end = timeframe.end instanceof Date ? admin14.firestore.Timestamp.fromDate(timeframe.end) : timeframe.end;
+      Logger.debug("[BookingAdmin] Fetching clinic data", { clinicId });
       const clinicDoc = await this.db.collection("clinics").doc(clinicId).get();
       if (!clinicDoc.exists) {
+        Logger.error("[BookingAdmin] Clinic not found", { clinicId });
         throw new Error(`Clinic ${clinicId} not found`);
       }
       const clinic = clinicDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved clinic data", {
+        clinicName: clinic.name,
+        clinicHasWorkingHours: !!clinic.workingHours
+      });
+      Logger.debug("[BookingAdmin] Fetching practitioner data", {
+        practitionerId
+      });
       const practitionerDoc = await this.db.collection("practitioners").doc(practitionerId).get();
       if (!practitionerDoc.exists) {
+        Logger.error("[BookingAdmin] Practitioner not found", {
+          practitionerId
+        });
         throw new Error(`Practitioner ${practitionerId} not found`);
       }
       const practitioner = practitionerDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved practitioner data", {
+        practitionerName: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+        pracWorkingHoursCount: ((_a = practitioner.clinicWorkingHours) == null ? void 0 : _a.length) || 0
+      });
+      Logger.debug("[BookingAdmin] Fetching procedure data", { procedureId });
       const procedureDoc = await this.db.collection("procedures").doc(procedureId).get();
       if (!procedureDoc.exists) {
+        Logger.error("[BookingAdmin] Procedure not found", { procedureId });
         throw new Error(`Procedure ${procedureId} not found`);
       }
       const procedure = procedureDoc.data();
+      Logger.debug("[BookingAdmin] Retrieved procedure data", {
+        procedureName: procedure.name,
+        procedureDuration: procedure.duration
+      });
+      Logger.debug("[BookingAdmin] Fetching clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const clinicCalendarEvents = await this.getClinicCalendarEvents(
         clinicId,
         start,
         end
       );
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        count: clinicCalendarEvents.length
+      });
+      Logger.debug("[BookingAdmin] Fetching practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const practitionerCalendarEvents = await this.getPractitionerCalendarEvents(practitionerId, start, end);
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        count: practitionerCalendarEvents.length
+      });
       const convertedTimeframe = {
         start: this.adminTimestampToClientTimestamp(start),
         end: this.adminTimestampToClientTimestamp(end)
@@ -6016,14 +6059,38 @@ var BookingAdmin = class {
           practitionerCalendarEvents
         )
       };
+      Logger.info("[BookingAdmin] Calling availability calculator", {
+        calculatorInputReady: true,
+        timeframeDurationHours: Math.round(
+          (end.toMillis() - start.toMillis()) / (1e3 * 60 * 60)
+        ),
+        clinicEventsCount: clinicCalendarEvents.length,
+        practitionerEventsCount: practitionerCalendarEvents.length
+      });
       const result = BookingAvailabilityCalculator.calculateSlots(request);
-      return {
+      const availableSlotsResult = {
         availableSlots: result.availableSlots.map((slot) => ({
           start: admin14.firestore.Timestamp.fromMillis(slot.start.toMillis())
         }))
       };
+      Logger.info(
+        "[BookingAdmin] Availability calculation completed successfully",
+        {
+          availableSlotsCount: availableSlotsResult.availableSlots.length,
+          firstSlotTime: availableSlotsResult.availableSlots.length > 0 ? availableSlotsResult.availableSlots[0].start.toDate().toISOString() : "none",
+          lastSlotTime: availableSlotsResult.availableSlots.length > 0 ? availableSlotsResult.availableSlots[availableSlotsResult.availableSlots.length - 1].start.toDate().toISOString() : "none"
+        }
+      );
+      return availableSlotsResult;
     } catch (error) {
-      console.error("[BookingAdmin] Error getting available slots:", error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error getting available slots", {
+        errorMessage,
+        clinicId,
+        practitionerId,
+        procedureId,
+        stack: error instanceof Error ? error.stack : void 0
+      });
       throw error;
     }
   }
@@ -6060,17 +6127,32 @@ var BookingAdmin = class {
    */
   async getClinicCalendarEvents(clinicId, start, end) {
     try {
+      Logger.debug("[BookingAdmin] Querying clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const eventsRef = this.db.collection(`clinics/${clinicId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
       const snapshot = await eventsRef.get();
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
       }));
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        clinicId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events)
+      });
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching clinic calendar events:`,
-        error
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error fetching clinic calendar events", {
+        errorMessage,
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+        stack: error instanceof Error ? error.stack : void 0
+      });
       return [];
     }
   }
@@ -6084,20 +6166,51 @@ var BookingAdmin = class {
    */
   async getPractitionerCalendarEvents(practitionerId, start, end) {
     try {
+      Logger.debug("[BookingAdmin] Querying practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString()
+      });
       const eventsRef = this.db.collection(`practitioners/${practitionerId}/calendar`).where("eventTime.start", ">=", start).where("eventTime.start", "<=", end);
       const snapshot = await eventsRef.get();
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id
       }));
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        practitionerId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events)
+      });
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching practitioner calendar events:`,
-        error
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      Logger.error(
+        "[BookingAdmin] Error fetching practitioner calendar events",
+        {
+          errorMessage,
+          practitionerId,
+          startTime: start.toDate().toISOString(),
+          endTime: end.toDate().toISOString(),
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       return [];
     }
   }
+  /**
+   * Summarizes event types for logging purposes
+   * @param events Array of calendar events
+   * @returns Object with counts of each event type
+   */
+  summarizeEventTypes(events) {
+    const typeCounts = {};
+    events.forEach((event) => {
+      const eventType = event.eventType || "unknown";
+      typeCounts[eventType] = (typeCounts[eventType] || 0) + 1;
+    });
+    return typeCounts;
+  }
   _generateCalendarProcedureInfo(procedure) {
     return {
       name: procedure.name,
@@ -6253,9 +6366,8 @@ var BookingAdmin = class {
         this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         practitionerCalendarEventData
       );
-      const patientCalendarEventId = this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc().id;
       const patientCalendarEventData = {
-        id: patientCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -6274,12 +6386,11 @@ var BookingAdmin = class {
         updatedAt: serverTimestampValue
       };
       batch.set(
-        this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc(patientCalendarEventId),
+        this.db.collection(PATIENTS_COLLECTION).doc(patientProfileData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         patientCalendarEventData
       );
-      const clinicCalendarEventId = this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc().id;
       const clinicCalendarEventData = {
-        id: clinicCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -6300,7 +6411,7 @@ var BookingAdmin = class {
         updatedAt: serverTimestampValue
       };
       batch.set(
-        this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc(clinicCalendarEventId),
+        this.db.collection(CLINICS_COLLECTION).doc(clinicData.id).collection(CALENDAR_COLLECTION).doc(practitionerCalendarEventId),
         clinicCalendarEventData
       );
       let initializedFormsInfo = [];
@@ -6388,9 +6499,7 @@ var BookingAdmin = class {
         success: true,
         appointmentId: newAppointmentId,
         appointmentData: newAppointmentData,
-        practitionerCalendarEventId,
-        patientCalendarEventId,
-        clinicCalendarEventId
+        calendarEventId: practitionerCalendarEventId
       };
     } catch (error) {
       console.error(

package/package.json

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

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

@@ -64,6 +64,7 @@ import {
 import { DocumentManagerAdminService } from "../documentation-templates/document-manager.admin";
 import { LinkedFormInfo } from "../../types/appointment";
 import { TimestampUtils } from "../../utils/TimestampUtils";
+import { Logger } from "../logger";
 
 /**
  * Interface for the data required by orchestrateAppointmentCreation
@@ -112,9 +113,19 @@ export class BookingAdmin {
     }
   ): Promise<{ availableSlots: { start: admin.firestore.Timestamp }[] }> {
     try {
-      console.log(
-        `[BookingAdmin] Getting available slots for clinic ${clinicId}, practitioner ${practitionerId}, procedure ${procedureId}`
-      );
+      Logger.info("[BookingAdmin] Starting availability calculation", {
+        clinicId,
+        practitionerId,
+        procedureId,
+        timeframeStart:
+          timeframe.start instanceof Date
+            ? timeframe.start.toISOString()
+            : timeframe.start.toDate().toISOString(),
+        timeframeEnd:
+          timeframe.end instanceof Date
+            ? timeframe.end.toISOString()
+            : timeframe.end.toDate().toISOString(),
+      });
 
       // Convert timeframe dates to Firestore Timestamps if needed
       const start =
@@ -128,42 +139,80 @@ export class BookingAdmin {
           : timeframe.end;
 
       // 1. Fetch clinic data
+      Logger.debug("[BookingAdmin] Fetching clinic data", { clinicId });
       const clinicDoc = await this.db.collection("clinics").doc(clinicId).get();
       if (!clinicDoc.exists) {
+        Logger.error("[BookingAdmin] Clinic not found", { clinicId });
         throw new Error(`Clinic ${clinicId} not found`);
       }
       const clinic = clinicDoc.data() as unknown as Clinic;
+      Logger.debug("[BookingAdmin] Retrieved clinic data", {
+        clinicName: clinic.name,
+        clinicHasWorkingHours: !!clinic.workingHours,
+      });
 
       // 2. Fetch practitioner data
+      Logger.debug("[BookingAdmin] Fetching practitioner data", {
+        practitionerId,
+      });
       const practitionerDoc = await this.db
         .collection("practitioners")
         .doc(practitionerId)
         .get();
       if (!practitionerDoc.exists) {
+        Logger.error("[BookingAdmin] Practitioner not found", {
+          practitionerId,
+        });
         throw new Error(`Practitioner ${practitionerId} not found`);
       }
       const practitioner = practitionerDoc.data() as unknown as Practitioner;
+      Logger.debug("[BookingAdmin] Retrieved practitioner data", {
+        practitionerName: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+        pracWorkingHoursCount: practitioner.clinicWorkingHours?.length || 0,
+      });
 
       // 3. Fetch procedure data
+      Logger.debug("[BookingAdmin] Fetching procedure data", { procedureId });
       const procedureDoc = await this.db
         .collection("procedures")
         .doc(procedureId)
         .get();
       if (!procedureDoc.exists) {
+        Logger.error("[BookingAdmin] Procedure not found", { procedureId });
         throw new Error(`Procedure ${procedureId} not found`);
       }
       const procedure = procedureDoc.data() as unknown as Procedure;
+      Logger.debug("[BookingAdmin] Retrieved procedure data", {
+        procedureName: procedure.name,
+        procedureDuration: procedure.duration,
+      });
 
       // 4. Fetch clinic calendar events
+      Logger.debug("[BookingAdmin] Fetching clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+      });
       const clinicCalendarEvents = await this.getClinicCalendarEvents(
         clinicId,
         start,
         end
       );
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        count: clinicCalendarEvents.length,
+      });
 
       // 5. Fetch practitioner calendar events
+      Logger.debug("[BookingAdmin] Fetching practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+      });
       const practitionerCalendarEvents =
         await this.getPractitionerCalendarEvents(practitionerId, start, end);
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        count: practitionerCalendarEvents.length,
+      });
 
       // Since we're working with two different Timestamp implementations (admin vs client),
       // we need to convert our timestamps to the client-side format expected by the calculator
@@ -186,17 +235,57 @@ export class BookingAdmin {
         ),
       };
 
+      Logger.info("[BookingAdmin] Calling availability calculator", {
+        calculatorInputReady: true,
+        timeframeDurationHours: Math.round(
+          (end.toMillis() - start.toMillis()) / (1000 * 60 * 60)
+        ),
+        clinicEventsCount: clinicCalendarEvents.length,
+        practitionerEventsCount: practitionerCalendarEvents.length,
+      });
+
       // Use the calculator to compute available slots
       const result = BookingAvailabilityCalculator.calculateSlots(request);
 
       // Convert the client Timestamps to admin Timestamps before returning
-      return {
+      const availableSlotsResult = {
         availableSlots: result.availableSlots.map((slot) => ({
           start: admin.firestore.Timestamp.fromMillis(slot.start.toMillis()),
         })),
       };
+
+      Logger.info(
+        "[BookingAdmin] Availability calculation completed successfully",
+        {
+          availableSlotsCount: availableSlotsResult.availableSlots.length,
+          firstSlotTime:
+            availableSlotsResult.availableSlots.length > 0
+              ? availableSlotsResult.availableSlots[0].start
+                  .toDate()
+                  .toISOString()
+              : "none",
+          lastSlotTime:
+            availableSlotsResult.availableSlots.length > 0
+              ? availableSlotsResult.availableSlots[
+                  availableSlotsResult.availableSlots.length - 1
+                ].start
+                  .toDate()
+                  .toISOString()
+              : "none",
+        }
+      );
+
+      return availableSlotsResult;
     } catch (error) {
-      console.error("[BookingAdmin] Error getting available slots:", error);
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error getting available slots", {
+        errorMessage,
+        clinicId,
+        practitionerId,
+        procedureId,
+        stack: error instanceof Error ? error.stack : undefined,
+      });
       throw error;
     }
   }
@@ -243,6 +332,12 @@ export class BookingAdmin {
     end: admin.firestore.Timestamp
   ): Promise<any[]> {
     try {
+      Logger.debug("[BookingAdmin] Querying clinic calendar events", {
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+      });
+
       const eventsRef = this.db
         .collection(`clinics/${clinicId}/calendar`)
         .where("eventTime.start", ">=", start)
@@ -250,15 +345,28 @@ export class BookingAdmin {
 
       const snapshot = await eventsRef.get();
 
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id,
       }));
+
+      Logger.debug("[BookingAdmin] Retrieved clinic calendar events", {
+        clinicId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events),
+      });
+
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching clinic calendar events:`,
-        error
-      );
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      Logger.error("[BookingAdmin] Error fetching clinic calendar events", {
+        errorMessage,
+        clinicId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+        stack: error instanceof Error ? error.stack : undefined,
+      });
       return [];
     }
   }
@@ -277,6 +385,12 @@ export class BookingAdmin {
     end: admin.firestore.Timestamp
   ): Promise<any[]> {
     try {
+      Logger.debug("[BookingAdmin] Querying practitioner calendar events", {
+        practitionerId,
+        startTime: start.toDate().toISOString(),
+        endTime: end.toDate().toISOString(),
+      });
+
       const eventsRef = this.db
         .collection(`practitioners/${practitionerId}/calendar`)
         .where("eventTime.start", ">=", start)
@@ -284,19 +398,51 @@ export class BookingAdmin {
 
       const snapshot = await eventsRef.get();
 
-      return snapshot.docs.map((doc) => ({
+      const events = snapshot.docs.map((doc) => ({
         ...doc.data(),
         id: doc.id,
       }));
+
+      Logger.debug("[BookingAdmin] Retrieved practitioner calendar events", {
+        practitionerId,
+        eventsCount: events.length,
+        eventsTypes: this.summarizeEventTypes(events),
+      });
+
+      return events;
     } catch (error) {
-      console.error(
-        `[BookingAdmin] Error fetching practitioner calendar events:`,
-        error
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      Logger.error(
+        "[BookingAdmin] Error fetching practitioner calendar events",
+        {
+          errorMessage,
+          practitionerId,
+          startTime: start.toDate().toISOString(),
+          endTime: end.toDate().toISOString(),
+          stack: error instanceof Error ? error.stack : undefined,
+        }
       );
       return [];
     }
   }
 
+  /**
+   * Summarizes event types for logging purposes
+   * @param events Array of calendar events
+   * @returns Object with counts of each event type
+   */
+  private summarizeEventTypes(events: any[]): Record<string, number> {
+    const typeCounts: Record<string, number> = {};
+
+    events.forEach((event) => {
+      const eventType = event.eventType || "unknown";
+      typeCounts[eventType] = (typeCounts[eventType] || 0) + 1;
+    });
+
+    return typeCounts;
+  }
+
   private _generateCalendarProcedureInfo(
     procedure: Procedure
   ): CalendarProcedureInfo {
@@ -324,9 +470,7 @@ export class BookingAdmin {
     success: boolean;
     appointmentId?: string;
     appointmentData?: Appointment;
-    practitionerCalendarEventId?: string;
-    patientCalendarEventId?: string;
-    clinicCalendarEventId?: string;
+    calendarEventId?: string;
     error?: string;
   }> {
     console.log(
@@ -583,13 +727,9 @@ export class BookingAdmin {
       );
 
       // Patient Calendar Event
-      const patientCalendarEventId = this.db
-        .collection(PATIENTS_COLLECTION)
-        .doc(patientProfileData.id)
-        .collection(CALENDAR_COLLECTION)
-        .doc().id;
+      // Use same ID as practitionerCalendarEventId
       const patientCalendarEventData: CalendarEvent = {
-        id: patientCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -612,18 +752,14 @@ export class BookingAdmin {
           .collection(PATIENTS_COLLECTION)
           .doc(patientProfileData.id)
           .collection(CALENDAR_COLLECTION)
-          .doc(patientCalendarEventId),
+          .doc(practitionerCalendarEventId),
         patientCalendarEventData
       );
 
       // Clinic Calendar Event
-      const clinicCalendarEventId = this.db
-        .collection(CLINICS_COLLECTION)
-        .doc(clinicData.id)
-        .collection(CALENDAR_COLLECTION)
-        .doc().id;
+      // Use same ID as practitionerCalendarEventId
       const clinicCalendarEventData: CalendarEvent = {
-        id: clinicCalendarEventId,
+        id: practitionerCalendarEventId,
         appointmentId: newAppointmentId,
         clinicBranchId: clinicData.id,
         clinicBranchInfo: clinicInfo,
@@ -648,7 +784,7 @@ export class BookingAdmin {
           .collection(CLINICS_COLLECTION)
           .doc(clinicData.id)
           .collection(CALENDAR_COLLECTION)
-          .doc(clinicCalendarEventId),
+          .doc(practitionerCalendarEventId),
         clinicCalendarEventData
       );
 
@@ -755,9 +891,7 @@ export class BookingAdmin {
         success: true,
         appointmentId: newAppointmentId,
         appointmentData: newAppointmentData,
-        practitionerCalendarEventId,
-        patientCalendarEventId,
-        clinicCalendarEventId,
+        calendarEventId: practitionerCalendarEventId,
       };
     } catch (error) {
       console.error(