@blackcode_sa/metaestetics-api 1.12.34 → 1.12.36

package/dist/index.js

@@ -1370,44 +1370,30 @@ async function updateAppointmentUtil(db, appointmentId, data) {
     let completedPreRequirements = currentAppointment.completedPreRequirements || [];
     let completedPostRequirements = currentAppointment.completedPostRequirements || [];
     if (data.completedPreRequirements) {
-      const validPreReqIds = currentAppointment.preProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPreReqIds = currentAppointment.preProcedureRequirements.map((req) => req.id);
       if (Array.isArray(data.completedPreRequirements)) {
         const invalidPreReqIds = data.completedPreRequirements.filter(
           (id) => !validPreReqIds.includes(id)
         );
         if (invalidPreReqIds.length > 0) {
-          throw new Error(
-            `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`);
         }
         completedPreRequirements = [
-          .../* @__PURE__ */ new Set([
-            ...completedPreRequirements,
-            ...data.completedPreRequirements
-          ])
+          .../* @__PURE__ */ new Set([...completedPreRequirements, ...data.completedPreRequirements])
         ];
       }
     }
     if (data.completedPostRequirements) {
-      const validPostReqIds = currentAppointment.postProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPostReqIds = currentAppointment.postProcedureRequirements.map((req) => req.id);
       if (Array.isArray(data.completedPostRequirements)) {
         const invalidPostReqIds = data.completedPostRequirements.filter(
           (id) => !validPostReqIds.includes(id)
         );
         if (invalidPostReqIds.length > 0) {
-          throw new Error(
-            `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`);
         }
         completedPostRequirements = [
-          .../* @__PURE__ */ new Set([
-            ...completedPostRequirements,
-            ...data.completedPostRequirements
-          ])
+          .../* @__PURE__ */ new Set([...completedPostRequirements, ...data.completedPostRequirements])
         ];
       }
     }
@@ -1427,19 +1413,13 @@ async function updateAppointmentUtil(db, appointmentId, data) {
         updateData.confirmationTime = import_firestore3.Timestamp.now();
       }
       if (currentAppointment.calendarEventId) {
-        await updateCalendarEventStatus(
-          db,
-          currentAppointment.calendarEventId,
-          data.status
-        );
+        await updateCalendarEventStatus(db, currentAppointment.calendarEventId, data.status);
       }
     }
     await (0, import_firestore3.updateDoc)(appointmentRef, updateData);
     const updatedAppointmentDoc = await (0, import_firestore3.getDoc)(appointmentRef);
     if (!updatedAppointmentDoc.exists()) {
-      throw new Error(
-        `Failed to retrieve updated appointment ${appointmentId}`
-      );
+      throw new Error(`Failed to retrieve updated appointment ${appointmentId}`);
     }
     return updatedAppointmentDoc.data();
   } catch (error) {
@@ -1483,9 +1463,7 @@ async function updateCalendarEventStatus(db, calendarEventId, appointmentStatus)
 }
 async function getAppointmentByIdUtil(db, appointmentId) {
   try {
-    const appointmentDoc = await (0, import_firestore3.getDoc)(
-      (0, import_firestore3.doc)(db, APPOINTMENTS_COLLECTION, appointmentId)
-    );
+    const appointmentDoc = await (0, import_firestore3.getDoc)((0, import_firestore3.doc)(db, APPOINTMENTS_COLLECTION, appointmentId));
     if (!appointmentDoc.exists()) {
       return null;
     }
@@ -1508,18 +1486,10 @@ async function searchAppointmentsUtil(db, params) {
       constraints.push((0, import_firestore3.where)("clinicBranchId", "==", params.clinicBranchId));
     }
     if (params.startDate) {
-      constraints.push(
-        (0, import_firestore3.where)(
-          "appointmentStartTime",
-          ">=",
-          import_firestore3.Timestamp.fromDate(params.startDate)
-        )
-      );
+      constraints.push((0, import_firestore3.where)("appointmentStartTime", ">=", import_firestore3.Timestamp.fromDate(params.startDate)));
     }
     if (params.endDate) {
-      constraints.push(
-        (0, import_firestore3.where)("appointmentStartTime", "<=", import_firestore3.Timestamp.fromDate(params.endDate))
-      );
+      constraints.push((0, import_firestore3.where)("appointmentStartTime", "<=", import_firestore3.Timestamp.fromDate(params.endDate)));
     }
     if (params.status) {
       if (Array.isArray(params.status)) {
@@ -1537,9 +1507,7 @@ async function searchAppointmentsUtil(db, params) {
     }
     const q = (0, import_firestore3.query)((0, import_firestore3.collection)(db, APPOINTMENTS_COLLECTION), ...constraints);
     const querySnapshot = await (0, import_firestore3.getDocs)(q);
-    const appointments = querySnapshot.docs.map(
-      (doc42) => doc42.data()
-    );
+    const appointments = querySnapshot.docs.map((doc42) => doc42.data());
     const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
     return { appointments, lastDoc };
   } catch (error) {
@@ -2867,7 +2835,10 @@ var AppointmentService = class extends BaseService {
           zonesData: currentMetadata.zonesData || null,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
-          zoneBilling: currentMetadata.zoneBilling,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...currentMetadata.zoneBilling !== void 0 && {
+            zoneBilling: currentMetadata.zoneBilling
+          },
           finalbilling: currentMetadata.finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes
         },
@@ -2972,7 +2943,10 @@ var AppointmentService = class extends BaseService {
           zonesData: ((_c = appointment.metadata) == null ? void 0 : _c.zonesData) || null,
           appointmentProducts: ((_d = appointment.metadata) == null ? void 0 : _d.appointmentProducts) || [],
           extendedProcedures: ((_e = appointment.metadata) == null ? void 0 : _e.extendedProcedures) || [],
-          zoneBilling: ((_f = appointment.metadata) == null ? void 0 : _f.zoneBilling) || null,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...((_f = appointment.metadata) == null ? void 0 : _f.zoneBilling) !== void 0 && {
+            zoneBilling: appointment.metadata.zoneBilling
+          },
           finalbilling: ((_g = appointment.metadata) == null ? void 0 : _g.finalbilling) || null,
           finalizationNotes: ((_h = appointment.metadata) == null ? void 0 : _h.finalizationNotes) || null
         },
@@ -3060,7 +3034,13 @@ var AppointmentService = class extends BaseService {
       console.log(
         `[APPOINTMENT_SERVICE] Overriding price for item ${itemIndex} in zone ${zoneId} to ${newPrice}`
       );
-      return await overridePriceForZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, newPrice);
+      return await overridePriceForZoneItemUtil(
+        this.db,
+        appointmentId,
+        zoneId,
+        itemIndex,
+        newPrice
+      );
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error overriding price:`, error);
       throw error;
@@ -3132,7 +3112,9 @@ var AppointmentService = class extends BaseService {
    */
   async getExtendedProcedures(appointmentId) {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`
+      );
       return await getExtendedProceduresUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting extended procedures:`, error);
@@ -3148,7 +3130,9 @@ var AppointmentService = class extends BaseService {
    */
   async getAppointmentProducts(appointmentId) {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`
+      );
       return await getAppointmentProductsUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting appointment products:`, error);
@@ -3165,7 +3149,9 @@ var AppointmentService = class extends BaseService {
   async recalculateFinalBilling(appointmentId, taxRate) {
     var _a;
     try {
-      console.log(`[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`
+      );
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment with ID ${appointmentId} not found`);
@@ -3191,6 +3177,10 @@ var AppointmentService = class extends BaseService {
           zonesData: currentMetadata.zonesData,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...currentMetadata.zoneBilling !== void 0 && {
+            zoneBilling: currentMetadata.zoneBilling
+          },
           finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes
         },

package/dist/index.mjs

@@ -1269,44 +1269,30 @@ async function updateAppointmentUtil(db, appointmentId, data) {
     let completedPreRequirements = currentAppointment.completedPreRequirements || [];
     let completedPostRequirements = currentAppointment.completedPostRequirements || [];
     if (data.completedPreRequirements) {
-      const validPreReqIds = currentAppointment.preProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPreReqIds = currentAppointment.preProcedureRequirements.map((req) => req.id);
       if (Array.isArray(data.completedPreRequirements)) {
         const invalidPreReqIds = data.completedPreRequirements.filter(
           (id) => !validPreReqIds.includes(id)
         );
         if (invalidPreReqIds.length > 0) {
-          throw new Error(
-            `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`);
         }
         completedPreRequirements = [
-          .../* @__PURE__ */ new Set([
-            ...completedPreRequirements,
-            ...data.completedPreRequirements
-          ])
+          .../* @__PURE__ */ new Set([...completedPreRequirements, ...data.completedPreRequirements])
         ];
       }
     }
     if (data.completedPostRequirements) {
-      const validPostReqIds = currentAppointment.postProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPostReqIds = currentAppointment.postProcedureRequirements.map((req) => req.id);
       if (Array.isArray(data.completedPostRequirements)) {
         const invalidPostReqIds = data.completedPostRequirements.filter(
           (id) => !validPostReqIds.includes(id)
         );
         if (invalidPostReqIds.length > 0) {
-          throw new Error(
-            `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`);
         }
         completedPostRequirements = [
-          .../* @__PURE__ */ new Set([
-            ...completedPostRequirements,
-            ...data.completedPostRequirements
-          ])
+          .../* @__PURE__ */ new Set([...completedPostRequirements, ...data.completedPostRequirements])
         ];
       }
     }
@@ -1326,19 +1312,13 @@ async function updateAppointmentUtil(db, appointmentId, data) {
         updateData.confirmationTime = Timestamp2.now();
       }
       if (currentAppointment.calendarEventId) {
-        await updateCalendarEventStatus(
-          db,
-          currentAppointment.calendarEventId,
-          data.status
-        );
+        await updateCalendarEventStatus(db, currentAppointment.calendarEventId, data.status);
       }
     }
     await updateDoc2(appointmentRef, updateData);
     const updatedAppointmentDoc = await getDoc2(appointmentRef);
     if (!updatedAppointmentDoc.exists()) {
-      throw new Error(
-        `Failed to retrieve updated appointment ${appointmentId}`
-      );
+      throw new Error(`Failed to retrieve updated appointment ${appointmentId}`);
     }
     return updatedAppointmentDoc.data();
   } catch (error) {
@@ -1382,9 +1362,7 @@ async function updateCalendarEventStatus(db, calendarEventId, appointmentStatus)
 }
 async function getAppointmentByIdUtil(db, appointmentId) {
   try {
-    const appointmentDoc = await getDoc2(
-      doc2(db, APPOINTMENTS_COLLECTION, appointmentId)
-    );
+    const appointmentDoc = await getDoc2(doc2(db, APPOINTMENTS_COLLECTION, appointmentId));
     if (!appointmentDoc.exists()) {
       return null;
     }
@@ -1407,18 +1385,10 @@ async function searchAppointmentsUtil(db, params) {
       constraints.push(where2("clinicBranchId", "==", params.clinicBranchId));
     }
     if (params.startDate) {
-      constraints.push(
-        where2(
-          "appointmentStartTime",
-          ">=",
-          Timestamp2.fromDate(params.startDate)
-        )
-      );
+      constraints.push(where2("appointmentStartTime", ">=", Timestamp2.fromDate(params.startDate)));
     }
     if (params.endDate) {
-      constraints.push(
-        where2("appointmentStartTime", "<=", Timestamp2.fromDate(params.endDate))
-      );
+      constraints.push(where2("appointmentStartTime", "<=", Timestamp2.fromDate(params.endDate)));
     }
     if (params.status) {
       if (Array.isArray(params.status)) {
@@ -1436,9 +1406,7 @@ async function searchAppointmentsUtil(db, params) {
     }
     const q = query2(collection2(db, APPOINTMENTS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs2(q);
-    const appointments = querySnapshot.docs.map(
-      (doc42) => doc42.data()
-    );
+    const appointments = querySnapshot.docs.map((doc42) => doc42.data());
     const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
     return { appointments, lastDoc };
   } catch (error) {
@@ -2766,7 +2734,10 @@ var AppointmentService = class extends BaseService {
           zonesData: currentMetadata.zonesData || null,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
-          zoneBilling: currentMetadata.zoneBilling,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...currentMetadata.zoneBilling !== void 0 && {
+            zoneBilling: currentMetadata.zoneBilling
+          },
           finalbilling: currentMetadata.finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes
         },
@@ -2871,7 +2842,10 @@ var AppointmentService = class extends BaseService {
           zonesData: ((_c = appointment.metadata) == null ? void 0 : _c.zonesData) || null,
           appointmentProducts: ((_d = appointment.metadata) == null ? void 0 : _d.appointmentProducts) || [],
           extendedProcedures: ((_e = appointment.metadata) == null ? void 0 : _e.extendedProcedures) || [],
-          zoneBilling: ((_f = appointment.metadata) == null ? void 0 : _f.zoneBilling) || null,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...((_f = appointment.metadata) == null ? void 0 : _f.zoneBilling) !== void 0 && {
+            zoneBilling: appointment.metadata.zoneBilling
+          },
           finalbilling: ((_g = appointment.metadata) == null ? void 0 : _g.finalbilling) || null,
           finalizationNotes: ((_h = appointment.metadata) == null ? void 0 : _h.finalizationNotes) || null
         },
@@ -2959,7 +2933,13 @@ var AppointmentService = class extends BaseService {
       console.log(
         `[APPOINTMENT_SERVICE] Overriding price for item ${itemIndex} in zone ${zoneId} to ${newPrice}`
       );
-      return await overridePriceForZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, newPrice);
+      return await overridePriceForZoneItemUtil(
+        this.db,
+        appointmentId,
+        zoneId,
+        itemIndex,
+        newPrice
+      );
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error overriding price:`, error);
       throw error;
@@ -3031,7 +3011,9 @@ var AppointmentService = class extends BaseService {
    */
   async getExtendedProcedures(appointmentId) {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`
+      );
       return await getExtendedProceduresUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting extended procedures:`, error);
@@ -3047,7 +3029,9 @@ var AppointmentService = class extends BaseService {
    */
   async getAppointmentProducts(appointmentId) {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`
+      );
       return await getAppointmentProductsUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting appointment products:`, error);
@@ -3064,7 +3048,9 @@ var AppointmentService = class extends BaseService {
   async recalculateFinalBilling(appointmentId, taxRate) {
     var _a;
     try {
-      console.log(`[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`
+      );
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment with ID ${appointmentId} not found`);
@@ -3090,6 +3076,10 @@ var AppointmentService = class extends BaseService {
           zonesData: currentMetadata.zonesData,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...currentMetadata.zoneBilling !== void 0 && {
+            zoneBilling: currentMetadata.zoneBilling
+          },
           finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes
         },

package/package.json

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

package/src/services/appointment/appointment.service.ts

@@ -1313,7 +1313,10 @@ export class AppointmentService extends BaseService {
           zonesData: currentMetadata.zonesData || null,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
-          zoneBilling: currentMetadata.zoneBilling,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...(currentMetadata.zoneBilling !== undefined && {
+            zoneBilling: currentMetadata.zoneBilling,
+          }),
           finalbilling: currentMetadata.finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes,
         },
@@ -1448,7 +1451,10 @@ export class AppointmentService extends BaseService {
           zonesData: appointment.metadata?.zonesData || null,
           appointmentProducts: appointment.metadata?.appointmentProducts || [],
           extendedProcedures: appointment.metadata?.extendedProcedures || [],
-          zoneBilling: appointment.metadata?.zoneBilling || null,
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...(appointment.metadata?.zoneBilling !== undefined && {
+            zoneBilling: appointment.metadata.zoneBilling,
+          }),
           finalbilling: appointment.metadata?.finalbilling || null,
           finalizationNotes: appointment.metadata?.finalizationNotes || null,
         },
@@ -1479,7 +1485,7 @@ export class AppointmentService extends BaseService {
   async addItemToZone(
     appointmentId: string,
     zoneId: string,
-    item: Omit<ZoneItemData, 'subtotal' | 'parentZone'>
+    item: Omit<ZoneItemData, 'subtotal' | 'parentZone'>,
   ): Promise<Appointment> {
     try {
       console.log(
@@ -1561,7 +1567,13 @@ export class AppointmentService extends BaseService {
       console.log(
         `[APPOINTMENT_SERVICE] Overriding price for item ${itemIndex} in zone ${zoneId} to ${newPrice}`,
       );
-      return await overridePriceForZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, newPrice);
+      return await overridePriceForZoneItemUtil(
+        this.db,
+        appointmentId,
+        zoneId,
+        itemIndex,
+        newPrice,
+      );
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error overriding price:`, error);
       throw error;
@@ -1642,7 +1654,9 @@ export class AppointmentService extends BaseService {
    */
   async getExtendedProcedures(appointmentId: string): Promise<ExtendedProcedureInfo[]> {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting extended procedures for appointment ${appointmentId}`,
+      );
       return await getExtendedProceduresUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting extended procedures:`, error);
@@ -1659,7 +1673,9 @@ export class AppointmentService extends BaseService {
    */
   async getAppointmentProducts(appointmentId: string): Promise<AppointmentProductMetadata[]> {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`);
+      console.log(
+        `[APPOINTMENT_SERVICE] Getting appointment products for appointment ${appointmentId}`,
+      );
       return await getAppointmentProductsUtil(this.db, appointmentId);
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error getting appointment products:`, error);
@@ -1676,8 +1692,10 @@ export class AppointmentService extends BaseService {
    */
   async recalculateFinalBilling(appointmentId: string, taxRate?: number): Promise<Appointment> {
     try {
-      console.log(`[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`);
-      
+      console.log(
+        `[APPOINTMENT_SERVICE] Recalculating final billing for appointment ${appointmentId}`,
+      );
+
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment with ID ${appointmentId} not found`);
@@ -1707,6 +1725,10 @@ export class AppointmentService extends BaseService {
           zonesData: currentMetadata.zonesData,
           appointmentProducts: currentMetadata.appointmentProducts || [],
           extendedProcedures: currentMetadata.extendedProcedures || [],
+          // Only include zoneBilling if it exists (avoid undefined values in Firestore)
+          ...(currentMetadata.zoneBilling !== undefined && {
+            zoneBilling: currentMetadata.zoneBilling,
+          }),
           finalbilling,
           finalizationNotes: currentMetadata.finalizationNotes,
         },

package/src/services/appointment/utils/appointment.utils.ts

@@ -15,7 +15,7 @@ import {
   startAfter,
   QueryConstraint,
   DocumentSnapshot,
-} from "firebase/firestore";
+} from 'firebase/firestore';
 import {
   Appointment,
   AppointmentStatus,
@@ -24,25 +24,18 @@ import {
   APPOINTMENTS_COLLECTION,
   SearchAppointmentsParams,
   PaymentStatus,
-} from "../../../types/appointment";
-import { CalendarEvent, CALENDAR_COLLECTION } from "../../../types/calendar";
-import { ProcedureSummaryInfo } from "../../../types/procedure";
-import {
-  ClinicInfo,
-  PatientProfileInfo,
-  PractitionerProfileInfo,
-} from "../../../types/profile";
-import { BlockingCondition } from "../../../backoffice/types/static/blocking-condition.types";
-import { Requirement } from "../../../backoffice/types/requirement.types";
-import { PRACTITIONERS_COLLECTION } from "../../../types/practitioner";
-import { CLINICS_COLLECTION } from "../../../types/clinic";
-import { PATIENTS_COLLECTION } from "../../../types/patient";
-import { PROCEDURES_COLLECTION } from "../../../types/procedure";
-import {
-  Technology,
-  TECHNOLOGIES_COLLECTION,
-} from "../../../backoffice/types/technology.types";
-import type { ContraindicationDynamic } from "../../../backoffice";
+} from '../../../types/appointment';
+import { CalendarEvent, CALENDAR_COLLECTION } from '../../../types/calendar';
+import { ProcedureSummaryInfo } from '../../../types/procedure';
+import { ClinicInfo, PatientProfileInfo, PractitionerProfileInfo } from '../../../types/profile';
+import { BlockingCondition } from '../../../backoffice/types/static/blocking-condition.types';
+import { Requirement } from '../../../backoffice/types/requirement.types';
+import { PRACTITIONERS_COLLECTION } from '../../../types/practitioner';
+import { CLINICS_COLLECTION } from '../../../types/clinic';
+import { PATIENTS_COLLECTION } from '../../../types/patient';
+import { PROCEDURES_COLLECTION } from '../../../types/procedure';
+import { Technology, TECHNOLOGIES_COLLECTION } from '../../../backoffice/types/technology.types';
+import type { ContraindicationDynamic } from '../../../backoffice';
 
 /**
  * Fetches all the necessary information for an appointment by IDs.
@@ -59,7 +52,7 @@ export async function fetchAggregatedInfoUtil(
   clinicId: string,
   practitionerId: string,
   patientId: string,
-  procedureId: string
+  procedureId: string,
 ): Promise<{
   clinicInfo: ClinicInfo;
   practitionerInfo: PractitionerProfileInfo;
@@ -72,13 +65,12 @@ export async function fetchAggregatedInfoUtil(
 }> {
   try {
     // Fetch all data in parallel for efficiency
-    const [clinicDoc, practitionerDoc, patientDoc, procedureDoc] =
-      await Promise.all([
-        getDoc(doc(db, CLINICS_COLLECTION, clinicId)),
-        getDoc(doc(db, PRACTITIONERS_COLLECTION, practitionerId)),
-        getDoc(doc(db, PATIENTS_COLLECTION, patientId)),
-        getDoc(doc(db, PROCEDURES_COLLECTION, procedureId)),
-      ]);
+    const [clinicDoc, practitionerDoc, patientDoc, procedureDoc] = await Promise.all([
+      getDoc(doc(db, CLINICS_COLLECTION, clinicId)),
+      getDoc(doc(db, PRACTITIONERS_COLLECTION, practitionerId)),
+      getDoc(doc(db, PATIENTS_COLLECTION, patientId)),
+      getDoc(doc(db, PROCEDURES_COLLECTION, procedureId)),
+    ]);
 
     // Check if all required entities exist
     if (!clinicDoc.exists()) {
@@ -102,7 +94,7 @@ export async function fetchAggregatedInfoUtil(
     // Extract relevant info for ClinicInfo
     const clinicInfo: ClinicInfo = {
       id: clinicId,
-      featuredPhoto: clinicData.featuredPhotos?.[0] || "",
+      featuredPhoto: clinicData.featuredPhotos?.[0] || '',
       name: clinicData.name,
       description: clinicData.description || null,
       location: clinicData.location,
@@ -113,10 +105,10 @@ export async function fetchAggregatedInfoUtil(
     const practitionerInfo: PractitionerProfileInfo = {
       id: practitionerId,
       practitionerPhoto: practitionerData.basicInfo?.profileImageUrl || null,
-      name: `${practitionerData.basicInfo?.firstName || ""} ${
-        practitionerData.basicInfo?.lastName || ""
+      name: `${practitionerData.basicInfo?.firstName || ''} ${
+        practitionerData.basicInfo?.lastName || ''
       }`.trim(),
-      email: practitionerData.basicInfo?.email || "",
+      email: practitionerData.basicInfo?.email || '',
       phone: practitionerData.basicInfo?.phoneNumber || null,
       certification: practitionerData.certification,
     };
@@ -125,11 +117,11 @@ export async function fetchAggregatedInfoUtil(
     // Note: This may need adjustment depending on how patient data is structured
     const patientInfo: PatientProfileInfo = {
       id: patientId,
-      fullName: patientData.displayName || "",
-      email: patientData.email || "",
+      fullName: patientData.displayName || '',
+      email: patientData.email || '',
       phone: patientData.phoneNumber || null,
       dateOfBirth: patientData.dateOfBirth || Timestamp.now(),
-      gender: patientData.gender || "other",
+      gender: patientData.gender || 'other',
     };
 
     // Extract procedureInfo from the procedure document
@@ -138,13 +130,13 @@ export async function fetchAggregatedInfoUtil(
       id: procedureId,
       name: procedureData.name,
       description: procedureData.description,
-      photo: procedureData.photo || "",
+      photo: procedureData.photo || '',
       family: procedureData.family,
-      categoryName: procedureData.category?.name || "",
-      subcategoryName: procedureData.subcategory?.name || "",
-      technologyName: procedureData.technology?.name || "",
-      brandName: procedureData.product?.brand || "",
-      productName: procedureData.product?.name || "",
+      categoryName: procedureData.category?.name || '',
+      subcategoryName: procedureData.subcategory?.name || '',
+      technologyName: procedureData.technology?.name || '',
+      brandName: procedureData.product?.brand || '',
+      productName: procedureData.product?.name || '',
       price: procedureData.price || 0,
       pricingMeasure: procedureData.pricingMeasure,
       currency: procedureData.currency,
@@ -156,7 +148,7 @@ export async function fetchAggregatedInfoUtil(
     };
 
     // Fetch the technology document to get procedure requirements
-    let technologyId = "";
+    let technologyId = '';
     if (procedureData.technology?.id) {
       technologyId = procedureData.technology.id;
     }
@@ -168,9 +160,7 @@ export async function fetchAggregatedInfoUtil(
 
     // If we have a technology ID, fetch its details
     if (technologyId) {
-      const technologyDoc = await getDoc(
-        doc(db, TECHNOLOGIES_COLLECTION, technologyId)
-      );
+      const technologyDoc = await getDoc(doc(db, TECHNOLOGIES_COLLECTION, technologyId));
       if (technologyDoc.exists()) {
         const technologyData = technologyDoc.data() as Technology;
 
@@ -199,7 +189,7 @@ export async function fetchAggregatedInfoUtil(
       postProcedureRequirements,
     };
   } catch (error) {
-    console.error("Error fetching aggregated info:", error);
+    console.error('Error fetching aggregated info:', error);
     throw error;
   }
 }
@@ -304,7 +294,7 @@ export async function fetchAggregatedInfoUtil(
 export async function updateAppointmentUtil(
   db: Firestore,
   appointmentId: string,
-  data: UpdateAppointmentData
+  data: UpdateAppointmentData,
 ): Promise<Appointment> {
   try {
     const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -317,62 +307,46 @@ export async function updateAppointmentUtil(
     const currentAppointment = appointmentDoc.data() as Appointment;
 
     // Handle requirement completion tracking
-    let completedPreRequirements =
-      currentAppointment.completedPreRequirements || [];
-    let completedPostRequirements =
-      currentAppointment.completedPostRequirements || [];
+    let completedPreRequirements = currentAppointment.completedPreRequirements || [];
+    let completedPostRequirements = currentAppointment.completedPostRequirements || [];
 
     if (data.completedPreRequirements) {
       // Validate that all IDs exist in the pre-requirements
-      const validPreReqIds = currentAppointment.preProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPreReqIds = currentAppointment.preProcedureRequirements.map(req => req.id);
 
       // Only perform validation and merging if the input is an array
       if (Array.isArray(data.completedPreRequirements)) {
         const invalidPreReqIds = data.completedPreRequirements.filter(
-          (id) => !validPreReqIds.includes(id)
+          id => !validPreReqIds.includes(id),
         );
 
         if (invalidPreReqIds.length > 0) {
-          throw new Error(
-            `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid pre-requirement IDs: ${invalidPreReqIds.join(', ')}`);
         }
 
         // Update the completed pre-requirements
         completedPreRequirements = [
-          ...new Set([
-            ...completedPreRequirements,
-            ...data.completedPreRequirements,
-          ]),
+          ...new Set([...completedPreRequirements, ...data.completedPreRequirements]),
         ];
       }
     }
 
     if (data.completedPostRequirements) {
       // Validate that all IDs exist in the post-requirements
-      const validPostReqIds = currentAppointment.postProcedureRequirements.map(
-        (req) => req.id
-      );
+      const validPostReqIds = currentAppointment.postProcedureRequirements.map(req => req.id);
 
       if (Array.isArray(data.completedPostRequirements)) {
         const invalidPostReqIds = data.completedPostRequirements.filter(
-          (id) => !validPostReqIds.includes(id)
+          id => !validPostReqIds.includes(id),
         );
 
         if (invalidPostReqIds.length > 0) {
-          throw new Error(
-            `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
-          );
+          throw new Error(`Invalid post-requirement IDs: ${invalidPostReqIds.join(', ')}`);
         }
 
         // Update the completed post-requirements
         completedPostRequirements = [
-          ...new Set([
-            ...completedPostRequirements,
-            ...data.completedPostRequirements,
-          ]),
+          ...new Set([...completedPostRequirements, ...data.completedPostRequirements]),
         ];
       }
     }
@@ -390,7 +364,7 @@ export async function updateAppointmentUtil(
     };
 
     // Remove undefined fields
-    Object.keys(updateData).forEach((key) => {
+    Object.keys(updateData).forEach(key => {
       if (updateData[key] === undefined) {
         delete updateData[key];
       }
@@ -399,20 +373,13 @@ export async function updateAppointmentUtil(
     // Handle status changes
     if (data.status && data.status !== currentAppointment.status) {
       // Handle confirmation
-      if (
-        data.status === AppointmentStatus.CONFIRMED &&
-        !updateData.confirmationTime
-      ) {
+      if (data.status === AppointmentStatus.CONFIRMED && !updateData.confirmationTime) {
         updateData.confirmationTime = Timestamp.now();
       }
 
       // Update the related calendar event status if needed
       if (currentAppointment.calendarEventId) {
-        await updateCalendarEventStatus(
-          db,
-          currentAppointment.calendarEventId,
-          data.status
-        );
+        await updateCalendarEventStatus(db, currentAppointment.calendarEventId, data.status);
       }
     }
 
@@ -422,9 +389,7 @@ export async function updateAppointmentUtil(
     // Fetch the updated appointment
     const updatedAppointmentDoc = await getDoc(appointmentRef);
     if (!updatedAppointmentDoc.exists()) {
-      throw new Error(
-        `Failed to retrieve updated appointment ${appointmentId}`
-      );
+      throw new Error(`Failed to retrieve updated appointment ${appointmentId}`);
     }
 
     return updatedAppointmentDoc.data() as Appointment;
@@ -444,7 +409,7 @@ export async function updateAppointmentUtil(
 async function updateCalendarEventStatus(
   db: Firestore,
   calendarEventId: string,
-  appointmentStatus: AppointmentStatus
+  appointmentStatus: AppointmentStatus,
 ): Promise<void> {
   try {
     const calendarEventRef = doc(db, CALENDAR_COLLECTION, calendarEventId);
@@ -459,17 +424,17 @@ async function updateCalendarEventStatus(
     let calendarStatus;
     switch (appointmentStatus) {
       case AppointmentStatus.CONFIRMED:
-        calendarStatus = "confirmed";
+        calendarStatus = 'confirmed';
         break;
       case AppointmentStatus.CANCELED_PATIENT:
       case AppointmentStatus.CANCELED_CLINIC:
-        calendarStatus = "canceled";
+        calendarStatus = 'canceled';
         break;
       case AppointmentStatus.RESCHEDULED_BY_CLINIC:
-        calendarStatus = "rescheduled";
+        calendarStatus = 'rescheduled';
         break;
       case AppointmentStatus.COMPLETED:
-        calendarStatus = "completed";
+        calendarStatus = 'completed';
         break;
       default:
         // For other states, don't update the calendar status
@@ -495,12 +460,10 @@ async function updateCalendarEventStatus(
  */
 export async function getAppointmentByIdUtil(
   db: Firestore,
-  appointmentId: string
+  appointmentId: string,
 ): Promise<Appointment | null> {
   try {
-    const appointmentDoc = await getDoc(
-      doc(db, APPOINTMENTS_COLLECTION, appointmentId)
-    );
+    const appointmentDoc = await getDoc(doc(db, APPOINTMENTS_COLLECTION, appointmentId));
 
     if (!appointmentDoc.exists()) {
       return null;
@@ -522,52 +485,44 @@ export async function getAppointmentByIdUtil(
  */
 export async function searchAppointmentsUtil(
   db: Firestore,
-  params: SearchAppointmentsParams
+  params: SearchAppointmentsParams,
 ): Promise<{ appointments: Appointment[]; lastDoc: DocumentSnapshot | null }> {
   try {
     const constraints: QueryConstraint[] = [];
 
     // Add filters based on provided params
     if (params.patientId) {
-      constraints.push(where("patientId", "==", params.patientId));
+      constraints.push(where('patientId', '==', params.patientId));
     }
 
     if (params.practitionerId) {
-      constraints.push(where("practitionerId", "==", params.practitionerId));
+      constraints.push(where('practitionerId', '==', params.practitionerId));
     }
 
     if (params.clinicBranchId) {
-      constraints.push(where("clinicBranchId", "==", params.clinicBranchId));
+      constraints.push(where('clinicBranchId', '==', params.clinicBranchId));
     }
 
     if (params.startDate) {
-      constraints.push(
-        where(
-          "appointmentStartTime",
-          ">=",
-          Timestamp.fromDate(params.startDate)
-        )
-      );
+      constraints.push(where('appointmentStartTime', '>=', Timestamp.fromDate(params.startDate)));
     }
 
     if (params.endDate) {
-      constraints.push(
-        where("appointmentStartTime", "<=", Timestamp.fromDate(params.endDate))
-      );
+      constraints.push(where('appointmentStartTime', '<=', Timestamp.fromDate(params.endDate)));
     }
 
     if (params.status) {
       if (Array.isArray(params.status)) {
         // If multiple statuses, use in operator
-        constraints.push(where("status", "in", params.status));
+        constraints.push(where('status', 'in', params.status));
       } else {
         // Single status
-        constraints.push(where("status", "==", params.status));
+        constraints.push(where('status', '==', params.status));
       }
     }
 
     // Add ordering
-    constraints.push(orderBy("appointmentStartTime", "asc"));
+    constraints.push(orderBy('appointmentStartTime', 'asc'));
 
     // Add pagination if specified
     if (params.limit) {
@@ -583,19 +538,15 @@ export async function searchAppointmentsUtil(
     const querySnapshot = await getDocs(q);
 
     // Extract results
-    const appointments = querySnapshot.docs.map(
-      (doc) => doc.data() as Appointment
-    );
+    const appointments = querySnapshot.docs.map(doc => doc.data() as Appointment);
 
     // Get last document for pagination
     const lastDoc =
-      querySnapshot.docs.length > 0
-        ? querySnapshot.docs[querySnapshot.docs.length - 1]
-        : null;
+      querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
 
     return { appointments, lastDoc };
   } catch (error) {
-    console.error("Error searching appointments:", error);
+    console.error('Error searching appointments:', error);
     throw error;
   }
 }