@blackcode_sa/metaestetics-api 1.6.14 → 1.6.15

package/dist/admin/index.mjs

@@ -37,7 +37,7 @@ var NotificationStatus = /* @__PURE__ */ ((NotificationStatus2) => {
 })(NotificationStatus || {});
 
 // src/admin/notifications/notifications.admin.ts
-import * as admin2 from "firebase-admin";
+import * as admin from "firebase-admin";
 import { Expo } from "expo-server-sdk";
 
 // src/types/appointment/index.ts
@@ -54,6 +54,21 @@ var AppointmentStatus = /* @__PURE__ */ ((AppointmentStatus2) => {
   AppointmentStatus2["RESCHEDULED_BY_CLINIC"] = "rescheduled_by_clinic";
   return AppointmentStatus2;
 })(AppointmentStatus || {});
+var PaymentStatus = /* @__PURE__ */ ((PaymentStatus2) => {
+  PaymentStatus2["UNPAID"] = "unpaid";
+  PaymentStatus2["PAID"] = "paid";
+  PaymentStatus2["PARTIALLY_PAID"] = "partially_paid";
+  PaymentStatus2["REFUNDED"] = "refunded";
+  PaymentStatus2["NOT_APPLICABLE"] = "not_applicable";
+  return PaymentStatus2;
+})(PaymentStatus || {});
+var MediaType = /* @__PURE__ */ ((MediaType2) => {
+  MediaType2["BEFORE_PHOTO"] = "before_photo";
+  MediaType2["AFTER_PHOTO"] = "after_photo";
+  MediaType2["CONSENT_SCAN"] = "consent_scan";
+  MediaType2["OTHER_DOCUMENT"] = "other_document";
+  return MediaType2;
+})(MediaType || {});
 var APPOINTMENTS_COLLECTION = "appointments";
 
 // src/types/documentation-templates/index.ts
@@ -72,117 +87,11 @@ var UserRole = /* @__PURE__ */ ((UserRole2) => {
   return UserRole2;
 })(UserRole || {});
 
-// src/utils/TimestampUtils.ts
-import * as admin from "firebase-admin";
-import { Timestamp as ClientTimestamp } from "firebase/firestore";
-var TimestampUtils = class {
-  /**
-   * Converts an admin Firestore Timestamp to a client Firestore Timestamp
-   * @param adminTimestamp - Admin SDK Timestamp (from firebase-admin)
-   * @returns A client SDK Timestamp (from firebase/firestore) with same seconds/nanoseconds or null if input is null
-   */
-  static adminToClient(adminTimestamp) {
-    if (!adminTimestamp) return null;
-    return new ClientTimestamp(
-      adminTimestamp.seconds,
-      adminTimestamp.nanoseconds
-    );
-  }
-  /**
-   * Converts a client Firestore Timestamp to an admin Firestore Timestamp
-   * @param clientTimestamp - Client SDK Timestamp (from firebase/firestore)
-   * @returns An admin SDK Timestamp (from firebase-admin) with same seconds/nanoseconds or null if input is null
-   */
-  static clientToAdmin(clientTimestamp) {
-    if (!clientTimestamp) return null;
-    return new admin.firestore.Timestamp(
-      clientTimestamp.seconds,
-      clientTimestamp.nanoseconds
-    );
-  }
-  /**
-   * Creates a client-compatible timestamp for the current time
-   * @returns A client SDK Timestamp (from firebase/firestore) for the current time
-   */
-  static nowAsClient() {
-    const now = admin.firestore.Timestamp.now();
-    return this.adminToClient(now);
-  }
-  /**
-   * Converts a Date object to a client Firestore Timestamp
-   * @param date - JavaScript Date object
-   * @returns A client SDK Timestamp (from firebase/firestore) or null if input is null
-   */
-  static dateToClientTimestamp(date) {
-    if (!date) return null;
-    return ClientTimestamp.fromDate(date);
-  }
-  /**
-   * Converts a Date object to an admin Firestore Timestamp
-   * @param date - JavaScript Date object
-   * @returns An admin SDK Timestamp (from firebase-admin) or null if input is null
-   */
-  static dateToAdminTimestamp(date) {
-    if (!date) return null;
-    return admin.firestore.Timestamp.fromDate(date);
-  }
-  /**
-   * Deeply converts all admin Firestore Timestamps in an object to client Firestore Timestamps
-   * @param obj - Object that may contain admin Firestore Timestamps
-   * @returns The same object with all admin Timestamps converted to client Timestamps
-   */
-  static convertObjectTimestampsAdminToClient(obj) {
-    if (!obj || typeof obj !== "object") {
-      return obj;
-    }
-    if (obj instanceof admin.firestore.Timestamp) {
-      return this.adminToClient(obj);
-    }
-    if (Array.isArray(obj)) {
-      return obj.map(
-        (item) => this.convertObjectTimestampsAdminToClient(item)
-      );
-    }
-    const result = { ...obj };
-    for (const key in result) {
-      if (Object.prototype.hasOwnProperty.call(result, key)) {
-        result[key] = this.convertObjectTimestampsAdminToClient(result[key]);
-      }
-    }
-    return result;
-  }
-  /**
-   * Deeply converts all client Firestore Timestamps in an object to admin Firestore Timestamps
-   * @param obj - Object that may contain client Firestore Timestamps
-   * @returns The same object with all client Timestamps converted to admin Timestamps
-   */
-  static convertObjectTimestampsClientToAdmin(obj) {
-    if (!obj || typeof obj !== "object") {
-      return obj;
-    }
-    if (obj instanceof ClientTimestamp) {
-      return this.clientToAdmin(obj);
-    }
-    if (Array.isArray(obj)) {
-      return obj.map(
-        (item) => this.convertObjectTimestampsClientToAdmin(item)
-      );
-    }
-    const result = { ...obj };
-    for (const key in result) {
-      if (Object.prototype.hasOwnProperty.call(result, key)) {
-        result[key] = this.convertObjectTimestampsClientToAdmin(result[key]);
-      }
-    }
-    return result;
-  }
-};
-
 // src/admin/notifications/notifications.admin.ts
 var NotificationsAdmin = class {
   constructor(firestore12) {
     this.expo = new Expo();
-    this.db = firestore12 || admin2.firestore();
+    this.db = firestore12 || admin.firestore();
   }
   /**
    * Dohvata notifikaciju po ID-u
@@ -198,8 +107,8 @@ var NotificationsAdmin = class {
     const docRef = await this.db.collection("notifications").add({
       ...notification,
       status: "pending" /* PENDING */,
-      createdAt: admin2.firestore.FieldValue.serverTimestamp(),
-      updatedAt: admin2.firestore.FieldValue.serverTimestamp()
+      createdAt: admin.firestore.FieldValue.serverTimestamp(),
+      updatedAt: admin.firestore.FieldValue.serverTimestamp()
     });
     return docRef.id;
   }
@@ -225,10 +134,10 @@ var NotificationsAdmin = class {
   async updateNotificationStatus(notificationId, status, error) {
     const update = {
       status,
-      updatedAt: admin2.firestore.FieldValue.serverTimestamp()
+      updatedAt: admin.firestore.FieldValue.serverTimestamp()
     };
     if (status === "sent" /* SENT */) {
-      update.sentAt = admin2.firestore.FieldValue.serverTimestamp();
+      update.sentAt = admin.firestore.FieldValue.serverTimestamp();
     }
     if (error) {
       update.error = error;
@@ -298,7 +207,7 @@ var NotificationsAdmin = class {
    * Procesira notifikacije koje čekaju na slanje sa batch limitom
    */
   async processPendingNotifications(batchSize = 100) {
-    const now = admin2.firestore.Timestamp.now();
+    const now = admin.firestore.Timestamp.now();
     const pendingNotifications = await this.db.collection("notifications").where("status", "==", "pending" /* PENDING */).where("notificationTime", "<=", now).limit(batchSize).get();
     const results = await Promise.allSettled(
       pendingNotifications.docs.map(async (doc) => {
@@ -329,7 +238,7 @@ var NotificationsAdmin = class {
       const oldNotifications = await this.db.collection("notifications").where(
         "createdAt",
         "<=",
-        admin2.firestore.Timestamp.fromDate(cutoffDate)
+        admin.firestore.Timestamp.fromDate(cutoffDate)
       ).limit(batchSize).get();
       if (oldNotifications.empty) {
         break;
@@ -371,15 +280,12 @@ var NotificationsAdmin = class {
       title = "New Appointment Confirmed";
       body = `Appointment for ${appointment.procedureInfo.name} with ${appointment.patientInfo.fullName} on ${appointment.appointmentStartTime.toDate().toLocaleDateString()} is confirmed.`;
     }
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const notificationData = {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: "appointmentStatusChange" /* APPOINTMENT_STATUS_CHANGE */,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -425,15 +331,12 @@ var NotificationsAdmin = class {
         body += ` Reason: ${appointment.cancellationReason}`;
       }
     }
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const notificationData = {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: "appointmentCancelled" /* APPOINTMENT_CANCELLED */,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -464,15 +367,12 @@ var NotificationsAdmin = class {
     }
     const title = "Appointment Reschedule Proposed";
     const body = `Action Required: A new time has been proposed for your appointment for ${appointment.procedureInfo.name}. Please review in the app.`;
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const notificationData = {
       userId: patientUserId,
       userRole: "patient" /* PATIENT */,
       notificationType: "appointmentRescheduledProposal" /* APPOINTMENT_RESCHEDULED_PROPOSAL */,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -503,16 +403,13 @@ var NotificationsAdmin = class {
     }
     const title = "Payment Updated";
     const body = `Your payment status for the appointment (${appointment.procedureInfo.name}) on ${appointment.appointmentStartTime.toDate().toLocaleDateString()} is now ${appointment.paymentStatus}.`;
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const notificationType = appointment.paymentStatus === "paid" /* PAID */ ? "paymentConfirmation" /* PAYMENT_CONFIRMATION */ : "generalMessage" /* GENERAL_MESSAGE */;
     const notificationData = {
       userId: patientUserId,
       userRole: "patient" /* PATIENT */,
       notificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -543,15 +440,12 @@ var NotificationsAdmin = class {
     }
     const title = "Leave a Review";
     const body = `How was your recent appointment for ${appointment.procedureInfo.name}? We'd love to hear your feedback!`;
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const notificationData = {
       userId: patientUserId,
       userRole: "patient" /* PATIENT */,
       notificationType: "reviewRequest" /* REVIEW_REQUEST */,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -588,16 +482,13 @@ var NotificationsAdmin = class {
     }
     const title = "New Review Received";
     const body = `A new review has been added by ${appointment.patientInfo.fullName} for your appointment on ${appointment.appointmentStartTime.toDate().toLocaleDateString()}.`;
-    const adminTsNow = admin2.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    );
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
     const tempNotificationType = "generalMessage" /* GENERAL_MESSAGE */;
     const notificationData = {
       userId: recipientUserId,
       userRole: "practitioner" /* PRACTITIONER */,
       notificationType: tempNotificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -621,6 +512,187 @@ var NotificationsAdmin = class {
   }
 };
 
+// src/utils/TimestampUtils.ts
+import * as admin2 from "firebase-admin";
+import { Timestamp as ClientTimestamp } from "firebase/firestore";
+var IS_SERVER_ENV = process.env.NODE_ENV === "production" || process.env.FUNCTIONS_EMULATOR === "true" || process.env.FIREBASE_CONFIG !== void 0;
+var TimestampUtils = class {
+  /**
+   * Enables server mode where admin timestamps are preserved when saving
+   * to Firestore via the admin SDK
+   */
+  static enableServerMode() {
+    this.serverMode = true;
+  }
+  /**
+   * Disables server mode - use this only for client-side or mixed environments
+   */
+  static disableServerMode() {
+    this.serverMode = false;
+  }
+  /**
+   * Converts an admin Firestore Timestamp to a client Firestore Timestamp
+   * In server mode, returns the original admin timestamp for storage consistency
+   *
+   * @param adminTimestamp - Admin SDK Timestamp (from firebase-admin)
+   * @returns A client SDK Timestamp (from firebase/firestore) with same seconds/nanoseconds,
+   *          or the original admin timestamp in server mode,
+   *          or null if input is null
+   */
+  static adminToClient(adminTimestamp) {
+    if (!adminTimestamp) return null;
+    if (this.serverMode) {
+      return adminTimestamp;
+    }
+    return new ClientTimestamp(
+      adminTimestamp.seconds,
+      adminTimestamp.nanoseconds
+    );
+  }
+  /**
+   * Converts a client Firestore Timestamp to an admin Firestore Timestamp
+   * @param clientTimestamp - Client SDK Timestamp (from firebase/firestore)
+   * @returns An admin SDK Timestamp (from firebase-admin) with same seconds/nanoseconds or null if input is null
+   */
+  static clientToAdmin(clientTimestamp) {
+    if (!clientTimestamp) return null;
+    return new admin2.firestore.Timestamp(
+      clientTimestamp.seconds,
+      clientTimestamp.nanoseconds
+    );
+  }
+  /**
+   * Creates a timestamp for the current time in the appropriate format based on environment
+   * @returns A timestamp for the current time (admin timestamp in server mode, client in client mode)
+   */
+  static nowAsTimestamp() {
+    const now = admin2.firestore.Timestamp.now();
+    if (this.serverMode) {
+      return now;
+    }
+    return this.adminToClient(now);
+  }
+  /**
+   * @deprecated Use nowAsTimestamp() instead for better cross-environment compatibility
+   */
+  static nowAsClient() {
+    const now = admin2.firestore.Timestamp.now();
+    return this.adminToClient(now);
+  }
+  /**
+   * Converts a Date object to a timestamp in the appropriate format based on environment
+   * @param date - JavaScript Date object
+   * @returns A timestamp (admin timestamp in server mode, client in client mode) or null if input is null
+   */
+  static dateToTimestamp(date) {
+    if (!date) return null;
+    if (this.serverMode) {
+      return admin2.firestore.Timestamp.fromDate(date);
+    }
+    return ClientTimestamp.fromDate(date);
+  }
+  /**
+   * @deprecated Use dateToTimestamp() instead for better cross-environment compatibility
+   */
+  static dateToClientTimestamp(date) {
+    if (!date) return null;
+    return ClientTimestamp.fromDate(date);
+  }
+  /**
+   * @deprecated Use dateToTimestamp() instead for better cross-environment compatibility
+   */
+  static dateToAdminTimestamp(date) {
+    if (!date) return null;
+    return admin2.firestore.Timestamp.fromDate(date);
+  }
+  /**
+   * Gets a server timestamp field value for use in create/update operations
+   * Works in both admin and client environments
+   */
+  static serverTimestamp() {
+    if (this.serverMode) {
+      return admin2.firestore.FieldValue.serverTimestamp();
+    }
+    throw new Error("Server timestamp in client mode not implemented");
+  }
+  /**
+   * For objects with mixed timestamp types, ensures all timestamps are
+   * in the correct format for the current environment
+   */
+  static normalizeTimestamps(obj) {
+    if (!obj || typeof obj !== "object") {
+      return obj;
+    }
+    if (obj instanceof admin2.firestore.Timestamp) {
+      return this.serverMode ? obj : this.adminToClient(obj);
+    }
+    if (obj instanceof ClientTimestamp && this.serverMode) {
+      return this.clientToAdmin(obj);
+    }
+    if (Array.isArray(obj)) {
+      return obj.map((item) => this.normalizeTimestamps(item));
+    }
+    const result = { ...obj };
+    for (const key in result) {
+      if (Object.prototype.hasOwnProperty.call(result, key)) {
+        result[key] = this.normalizeTimestamps(result[key]);
+      }
+    }
+    return result;
+  }
+  /**
+   * @deprecated Use normalizeTimestamps() instead for better cross-environment compatibility
+   */
+  static convertObjectTimestampsAdminToClient(obj) {
+    if (!obj || typeof obj !== "object") {
+      return obj;
+    }
+    if (obj instanceof admin2.firestore.Timestamp) {
+      return this.adminToClient(obj);
+    }
+    if (Array.isArray(obj)) {
+      return obj.map(
+        (item) => this.convertObjectTimestampsAdminToClient(item)
+      );
+    }
+    const result = { ...obj };
+    for (const key in result) {
+      if (Object.prototype.hasOwnProperty.call(result, key)) {
+        result[key] = this.convertObjectTimestampsAdminToClient(result[key]);
+      }
+    }
+    return result;
+  }
+  /**
+   * @deprecated Use normalizeTimestamps() instead for better cross-environment compatibility
+   */
+  static convertObjectTimestampsClientToAdmin(obj) {
+    if (!obj || typeof obj !== "object") {
+      return obj;
+    }
+    if (obj instanceof ClientTimestamp) {
+      return this.clientToAdmin(obj);
+    }
+    if (Array.isArray(obj)) {
+      return obj.map(
+        (item) => this.convertObjectTimestampsClientToAdmin(item)
+      );
+    }
+    const result = { ...obj };
+    for (const key in result) {
+      if (Object.prototype.hasOwnProperty.call(result, key)) {
+        result[key] = this.convertObjectTimestampsClientToAdmin(result[key]);
+      }
+    }
+    return result;
+  }
+};
+/**
+ * Flag to force server mode where admin timestamps are preserved
+ * This should be true in Cloud Functions environments
+ */
+TimestampUtils.serverMode = IS_SERVER_ENV;
+
 // src/admin/aggregation/clinic/clinic.aggregation.service.ts
 import * as admin3 from "firebase-admin";
 
@@ -2081,7 +2153,7 @@ var PatientRequirementsAdminService = class {
           userRole: "patient" /* PATIENT */,
           notificationType: "requirementInstructionDue" /* REQUIREMENT_INSTRUCTION_DUE */,
           notificationTime: currentInstruction.dueTime,
-          // This is a Firestore Timestamp
+          // dueTime should be an admin.firestore.Timestamp already
           notificationTokens: patientExpoTokens,
           title: `Reminder: ${instance.requirementName}`,
           body: currentInstruction.instructionText,
@@ -2423,14 +2495,8 @@ var CalendarAdminService = class {
     const batch = this.db.batch();
     const serverTimestamp = admin8.firestore.FieldValue.serverTimestamp();
     const firestoreCompatibleEventTime = {
-      start: {
-        seconds: newEventTime.start.seconds,
-        nanoseconds: newEventTime.start.nanoseconds
-      },
-      end: {
-        seconds: newEventTime.end.seconds,
-        nanoseconds: newEventTime.end.nanoseconds
-      }
+      start: TimestampUtils.clientToAdmin(newEventTime.start) || admin8.firestore.Timestamp.now(),
+      end: TimestampUtils.clientToAdmin(newEventTime.end) || admin8.firestore.Timestamp.now()
     };
     if (appointment.calendarEventId) {
       const practitionerEventRef = this.db.doc(
@@ -3178,7 +3244,8 @@ var AppointmentAggregationService = class {
             status: "pendingNotification" /* PENDING_NOTIFICATION */,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin10.firestore.FieldValue.serverTimestamp(),
+            updatedAt: admin10.firestore.Timestamp.now(),
+            // Use current server timestamp
             notificationId: void 0,
             actionTakenAt: void 0
           };
@@ -3288,7 +3355,8 @@ var AppointmentAggregationService = class {
             status: "pendingNotification" /* PENDING_NOTIFICATION */,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin10.firestore.FieldValue.serverTimestamp(),
+            updatedAt: admin10.firestore.Timestamp.now(),
+            // Use current server timestamp
             notificationId: void 0,
             actionTakenAt: void 0
           };
@@ -4499,8 +4567,12 @@ var BookingAdmin = class {
     return events.map((event) => ({
       ...event,
       eventTime: {
-        start: TimestampUtils.adminToClient(event.eventTime.start),
-        end: TimestampUtils.adminToClient(event.eventTime.end)
+        start: TimestampUtils.adminToClient(
+          event.eventTime.start
+        ),
+        end: TimestampUtils.adminToClient(
+          event.eventTime.end
+        )
       }
       // Convert any other timestamps in the event if needed
     }));
@@ -4965,12 +5037,20 @@ var BookingAdmin = class {
 
 // src/admin/index.ts
 console.log("[Admin Module] Initialized and services exported.");
+TimestampUtils.enableServerMode();
 export {
+  APPOINTMENTS_COLLECTION,
   AppointmentAggregationService,
+  AppointmentMailingService,
   AppointmentStatus,
   BaseMailingService,
   BookingAdmin,
+  BookingAvailabilityCalculator,
+  CalendarAdminService,
   ClinicAggregationService,
+  DocumentManagerAdminService,
+  Logger,
+  MediaType,
   NOTIFICATIONS_COLLECTION,
   NotificationStatus,
   NotificationType,
@@ -4980,6 +5060,7 @@ export {
   PatientInstructionStatus,
   PatientRequirementOverallStatus,
   PatientRequirementsAdminService,
+  PaymentStatus,
   PractitionerAggregationService,
   PractitionerInviteMailingService,
   PractitionerTokenStatus,

package/package.json

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

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

@@ -565,7 +565,7 @@ export class AppointmentAggregationService {
             status: PatientInstructionStatus.PENDING_NOTIFICATION,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin.firestore.FieldValue.serverTimestamp() as any,
+            updatedAt: admin.firestore.Timestamp.now() as any, // Use current server timestamp
             notificationId: undefined,
             actionTakenAt: undefined,
           };
@@ -707,7 +707,7 @@ export class AppointmentAggregationService {
             status: PatientInstructionStatus.PENDING_NOTIFICATION,
             originalNotifyAtValue: notifyAtValue,
             originalTimeframeUnit: template.timeframe.unit,
-            updatedAt: admin.firestore.FieldValue.serverTimestamp() as any,
+            updatedAt: admin.firestore.Timestamp.now() as any, // Use current server timestamp
             notificationId: undefined,
             actionTakenAt: undefined,
           } as PatientRequirementInstruction;

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

@@ -205,9 +205,9 @@ export class BookingAdmin {
    */
   private adminTimestampToClientTimestamp(
     timestamp: admin.firestore.Timestamp
-  ): any {
+  ): FirebaseClientTimestamp {
     // Use TimestampUtils instead of custom implementation
-    return TimestampUtils.adminToClient(timestamp);
+    return TimestampUtils.adminToClient(timestamp) as FirebaseClientTimestamp;
   }
 
   /**
@@ -217,8 +217,12 @@ export class BookingAdmin {
     return events.map((event) => ({
       ...event,
       eventTime: {
-        start: TimestampUtils.adminToClient(event.eventTime.start),
-        end: TimestampUtils.adminToClient(event.eventTime.end),
+        start: TimestampUtils.adminToClient(
+          event.eventTime.start
+        ) as FirebaseClientTimestamp,
+        end: TimestampUtils.adminToClient(
+          event.eventTime.end
+        ) as FirebaseClientTimestamp,
       },
       // Convert any other timestamps in the event if needed
     }));

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

@@ -10,6 +10,7 @@ import { Logger } from "../logger";
 import { PRACTITIONERS_COLLECTION } from "../../types/practitioner";
 import { PATIENTS_COLLECTION } from "../../types/patient";
 import { CLINICS_COLLECTION } from "../../types/clinic";
+import { TimestampUtils } from "../../utils/TimestampUtils";
 
 /**
  * @class CalendarAdminService
@@ -103,18 +104,14 @@ export class CalendarAdminService {
     const batch = this.db.batch();
     const serverTimestamp = admin.firestore.FieldValue.serverTimestamp();
 
-    // Convert FirebaseClientTimestamp to a plain object for Firestore admin SDK if needed,
-    // or ensure the CalendarEventTime type is directly compatible.
-    // Firestore admin SDK usually handles { seconds: X, nanoseconds: Y } objects correctly.
+    // Convert client timestamps to admin timestamps since we're in server mode
     const firestoreCompatibleEventTime = {
-      start: {
-        seconds: newEventTime.start.seconds,
-        nanoseconds: newEventTime.start.nanoseconds,
-      },
-      end: {
-        seconds: newEventTime.end.seconds,
-        nanoseconds: newEventTime.end.nanoseconds,
-      },
+      start:
+        TimestampUtils.clientToAdmin(newEventTime.start) ||
+        admin.firestore.Timestamp.now(),
+      end:
+        TimestampUtils.clientToAdmin(newEventTime.end) ||
+        admin.firestore.Timestamp.now(),
     };
 
     // TODO: Confirm paths as in updateAppointmentCalendarEventsStatus