@blackcode_sa/metaestetics-api 1.7.3 → 1.7.4

package/src/admin/calendar/calendar.admin.service.ts

@@ -42,47 +42,93 @@ export class CalendarAdminService {
     );
     const batch = this.db.batch();
     const serverTimestamp = admin.firestore.FieldValue.serverTimestamp();
+    let updatesAdded = 0;
 
-    // Note: The Appointment type in booking.admin.ts has `calendarEventId` (practitioner's event)
-    // but not direct IDs for patient and clinic calendar events.
-    // We need a robust way to find these if they aren't directly on the appointment object.
-    // For now, assuming we can query them or they are added to the Appointment type.
+    // Get the shared calendar event ID
+    const calendarEventId = appointment.calendarEventId;
 
-    // Let's assume the main appointment.calendarEventId is the practitioner's calendar event.
-    // The other calendar event IDs might need to be fetched or stored on the Appointment object.
-    // For this placeholder, we'll demonstrate updating one and note the others.
-
-    // TODO: Confirm how patient and clinic calendar event IDs are retrieved.
-    // Assuming they are named predictably or stored in appointment.additionalCalendarEventIds (example)
-
-    const practitionerCalendarEventPath = `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${appointment.calendarEventId}`;
-    // Example paths, these need to be accurate based on your data model:
-    // const patientCalendarEventPath = `${PATIENTS_COLLECTION}/${appointment.patientId}/${CALENDAR_COLLECTION}/${appointment.patientCalendarEventId}`;
-    // const clinicCalendarEventPath = `${CLINICS_COLLECTION}/${appointment.clinicBranchId}/${CALENDAR_COLLECTION}/${appointment.clinicCalendarEventId}`;
+    if (!calendarEventId) {
+      Logger.warn(
+        `[CalendarAdminService] Missing calendar event ID for appointment ${appointment.id}`
+      );
+      return;
+    }
 
-    if (appointment.calendarEventId) {
-      // Practitioner event
-      const practitionerEventRef = this.db.doc(practitionerCalendarEventPath);
+    // Update practitioner calendar event
+    if (appointment.practitionerId) {
+      const practitionerEventRef = this.db.doc(
+        `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
       batch.update(practitionerEventRef, {
         status: newStatus,
         updatedAt: serverTimestamp,
       });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added practitioner calendar event status update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing practitioner ID for appointment ${appointment.id}`
+      );
+    }
+
+    // Update patient calendar event
+    if (appointment.patientId) {
+      const patientEventRef = this.db.doc(
+        `${PATIENTS_COLLECTION}/${appointment.patientId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
+      batch.update(patientEventRef, {
+        status: newStatus,
+        updatedAt: serverTimestamp,
+      });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added patient calendar event status update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing patient ID for appointment ${appointment.id}`
+      );
     }
-    // Add similar updates for patient and clinic calendar events once their refs are confirmed
-    // if (appointment.patientCalendarEventId) { ... }
-    // if (appointment.clinicCalendarEventId) { ... }
 
-    try {
-      await batch.commit();
-      Logger.info(
-        `[CalendarAdminService] Successfully updated calendar event statuses for appointment ${appointment.id}.`
+    // Update clinic calendar event
+    if (appointment.clinicBranchId) {
+      const clinicEventRef = this.db.doc(
+        `${CLINICS_COLLECTION}/${appointment.clinicBranchId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
+      batch.update(clinicEventRef, {
+        status: newStatus,
+        updatedAt: serverTimestamp,
+      });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added clinic calendar event status update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing clinic ID for appointment ${appointment.id}`
       );
-    } catch (error) {
-      Logger.error(
-        `[CalendarAdminService] Error updating calendar event statuses for appointment ${appointment.id}:`,
-        error
+    }
+
+    // Only commit if we have updates to make
+    if (updatesAdded > 0) {
+      try {
+        await batch.commit();
+        Logger.info(
+          `[CalendarAdminService] Successfully updated ${updatesAdded} calendar event statuses for appointment ${appointment.id}.`
+        );
+      } catch (error) {
+        Logger.error(
+          `[CalendarAdminService] Error updating calendar event statuses for appointment ${appointment.id}:`,
+          error
+        );
+        throw error; // Re-throw to allow caller to handle
+      }
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] No calendar event status updates were made for appointment ${appointment.id}`
       );
-      // Decide on error handling: re-throw, or log and continue?
     }
   }
 
@@ -91,51 +137,113 @@ export class CalendarAdminService {
    * associated with a given appointment.
    *
    * @param appointment - The appointment object.
-   * @param newEventTime - The new CalendarEventTime object (using FirebaseClientTimestamp).
+   * @param newEventTime - The new CalendarEventTime object (using admin.firestore.Timestamp).
    * @returns {Promise<void>} A promise that resolves when all updates are attempted.
    */
   async updateAppointmentCalendarEventsTime(
     appointment: Appointment,
-    newEventTime: CalendarEventTime // Expecting { start: FirebaseClientTimestamp, end: FirebaseClientTimestamp }
+    newEventTime: {
+      start: admin.firestore.Timestamp;
+      end: admin.firestore.Timestamp;
+    }
   ): Promise<void> {
     Logger.info(
       `[CalendarAdminService] Updating calendar event times for appointment ${appointment.id}`
     );
     const batch = this.db.batch();
     const serverTimestamp = admin.firestore.FieldValue.serverTimestamp();
+    let updatesAdded = 0;
+
+    // Get the shared calendar event ID
+    const calendarEventId = appointment.calendarEventId;
 
-    // Convert client timestamps to admin timestamps since we're in server mode
+    if (!calendarEventId) {
+      Logger.warn(
+        `[CalendarAdminService] Missing calendar event ID for appointment ${appointment.id}`
+      );
+      return;
+    }
+
+    // Use the timestamps directly since they are already admin.firestore.Timestamp
     const firestoreCompatibleEventTime = {
-      start:
-        TimestampUtils.clientToAdmin(newEventTime.start) ||
-        admin.firestore.Timestamp.now(),
-      end:
-        TimestampUtils.clientToAdmin(newEventTime.end) ||
-        admin.firestore.Timestamp.now(),
+      start: newEventTime.start,
+      end: newEventTime.end,
     };
 
-    // TODO: Confirm paths as in updateAppointmentCalendarEventsStatus
-    if (appointment.calendarEventId) {
-      // Practitioner event
+    // Update practitioner calendar event
+    if (appointment.practitionerId) {
       const practitionerEventRef = this.db.doc(
-        `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${appointment.calendarEventId}`
+        `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${calendarEventId}`
       );
       batch.update(practitionerEventRef, {
         eventTime: firestoreCompatibleEventTime,
         updatedAt: serverTimestamp,
       });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added practitioner calendar event time update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing practitioner ID for appointment ${appointment.id}`
+      );
+    }
+
+    // Update patient calendar event
+    if (appointment.patientId) {
+      const patientEventRef = this.db.doc(
+        `${PATIENTS_COLLECTION}/${appointment.patientId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
+      batch.update(patientEventRef, {
+        eventTime: firestoreCompatibleEventTime,
+        updatedAt: serverTimestamp,
+      });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added patient calendar event time update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing patient ID for appointment ${appointment.id}`
+      );
     }
-    // Add similar updates for patient and clinic calendar events
 
-    try {
-      await batch.commit();
-      Logger.info(
-        `[CalendarAdminService] Successfully updated calendar event times for appointment ${appointment.id}.`
+    // Update clinic calendar event
+    if (appointment.clinicBranchId) {
+      const clinicEventRef = this.db.doc(
+        `${CLINICS_COLLECTION}/${appointment.clinicBranchId}/${CALENDAR_COLLECTION}/${calendarEventId}`
       );
-    } catch (error) {
-      Logger.error(
-        `[CalendarAdminService] Error updating calendar event times for appointment ${appointment.id}:`,
-        error
+      batch.update(clinicEventRef, {
+        eventTime: firestoreCompatibleEventTime,
+        updatedAt: serverTimestamp,
+      });
+      updatesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added clinic calendar event time update to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing clinic ID for appointment ${appointment.id}`
+      );
+    }
+
+    // Only commit if we have updates to make
+    if (updatesAdded > 0) {
+      try {
+        await batch.commit();
+        Logger.info(
+          `[CalendarAdminService] Successfully updated ${updatesAdded} calendar event times for appointment ${appointment.id}.`
+        );
+      } catch (error) {
+        Logger.error(
+          `[CalendarAdminService] Error updating calendar event times for appointment ${appointment.id}:`,
+          error
+        );
+        throw error; // Re-throw to allow caller to handle
+      }
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] No calendar event time updates were made for appointment ${appointment.id}`
       );
     }
   }
@@ -154,26 +262,83 @@ export class CalendarAdminService {
       `[CalendarAdminService] Deleting calendar events for appointment ${appointment.id}`
     );
     const batch = this.db.batch();
+    let deletesAdded = 0;
 
-    // TODO: Confirm paths as in updateAppointmentCalendarEventsStatus
-    if (appointment.calendarEventId) {
-      // Practitioner event
+    // Get the shared calendar event ID
+    const calendarEventId = appointment.calendarEventId;
+
+    if (!calendarEventId) {
+      Logger.warn(
+        `[CalendarAdminService] Missing calendar event ID for appointment ${appointment.id}`
+      );
+      return;
+    }
+
+    // Delete practitioner calendar event
+    if (appointment.practitionerId) {
       const practitionerEventRef = this.db.doc(
-        `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${appointment.calendarEventId}`
+        `${PRACTITIONERS_COLLECTION}/${appointment.practitionerId}/${CALENDAR_COLLECTION}/${calendarEventId}`
       );
       batch.delete(practitionerEventRef);
+      deletesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added practitioner calendar event deletion to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing practitioner ID for appointment ${appointment.id}`
+      );
     }
-    // Add similar deletes for patient and clinic calendar events
 
-    try {
-      await batch.commit();
-      Logger.info(
-        `[CalendarAdminService] Successfully deleted calendar events for appointment ${appointment.id}.`
+    // Delete patient calendar event
+    if (appointment.patientId) {
+      const patientEventRef = this.db.doc(
+        `${PATIENTS_COLLECTION}/${appointment.patientId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
+      batch.delete(patientEventRef);
+      deletesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added patient calendar event deletion to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing patient ID for appointment ${appointment.id}`
       );
-    } catch (error) {
-      Logger.error(
-        `[CalendarAdminService] Error deleting calendar events for appointment ${appointment.id}:`,
-        error
+    }
+
+    // Delete clinic calendar event
+    if (appointment.clinicBranchId) {
+      const clinicEventRef = this.db.doc(
+        `${CLINICS_COLLECTION}/${appointment.clinicBranchId}/${CALENDAR_COLLECTION}/${calendarEventId}`
+      );
+      batch.delete(clinicEventRef);
+      deletesAdded++;
+      Logger.debug(
+        `[CalendarAdminService] Added clinic calendar event deletion to batch`
+      );
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] Missing clinic ID for appointment ${appointment.id}`
+      );
+    }
+
+    // Only commit if we have deletions to make
+    if (deletesAdded > 0) {
+      try {
+        await batch.commit();
+        Logger.info(
+          `[CalendarAdminService] Successfully deleted ${deletesAdded} calendar events for appointment ${appointment.id}.`
+        );
+      } catch (error) {
+        Logger.error(
+          `[CalendarAdminService] Error deleting calendar events for appointment ${appointment.id}:`,
+          error
+        );
+        throw error; // Re-throw to allow caller to handle
+      }
+    } else {
+      Logger.warn(
+        `[CalendarAdminService] No calendar event deletions were made for appointment ${appointment.id}`
       );
     }
   }

package/src/services/calendar/calendar-refactored.service.ts

@@ -1142,6 +1142,7 @@ export class CalendarServiceV2 extends BaseService {
           CalendarEventStatus.CANCELED,
           CalendarEventStatus.COMPLETED,
           CalendarEventStatus.RESCHEDULED,
+          CalendarEventStatus.NO_SHOW,
         ],
         [CalendarEventStatus.REJECTED]: [],
         [CalendarEventStatus.CANCELED]: [],
@@ -1150,6 +1151,7 @@ export class CalendarServiceV2 extends BaseService {
           CalendarEventStatus.CANCELED,
         ],
         [CalendarEventStatus.COMPLETED]: [],
+        [CalendarEventStatus.NO_SHOW]: [],
       };
 
     // Check if transition is valid

package/src/types/calendar/index.ts

@@ -27,6 +27,7 @@ export enum CalendarEventStatus {
   CANCELED = "canceled", // When event is canceled by the patient
   RESCHEDULED = "rescheduled", // When event is rescheduled by the clinic administrator
   COMPLETED = "completed", // When event is completed
+  NO_SHOW = "no_show", // When event is no-show by the patient
 }
 
 /**