@blackcode_sa/metaestetics-api 1.6.14 → 1.6.15

package/src/admin/index.ts

@@ -1,4 +1,6 @@
 import { NotificationsAdmin } from "./notifications/notifications.admin";
+import * as admin from "firebase-admin";
+import { TimestampUtils } from "../utils/TimestampUtils";
 
 import { UserRole } from "../types";
 // Import types needed by admin consumers (like Cloud Functions)
@@ -111,3 +113,22 @@ console.log("[Admin Module] Initialized and services exported.");
 // if they have dependencies (like Firestore db) that need to be injected.
 // The initialization pattern might differ depending on how this module is consumed
 // (e.g., within a larger NestJS app vs. standalone Cloud Functions).
+
+// Initialize TimestampUtils for server-side use
+TimestampUtils.enableServerMode();
+
+// Export all admin services that are needed
+export * from "./booking/booking.admin";
+export * from "./booking/booking.calculator";
+export * from "./booking/booking.types";
+export * from "./calendar/calendar.admin.service";
+export * from "./documentation-templates/document-manager.admin";
+export * from "./logger";
+export * from "./mailing/appointment/appointment.mailing.service";
+export * from "./notifications/notifications.admin";
+export * from "./requirements/patient-requirements.admin.service";
+export * from "./aggregation/appointment/appointment.aggregation.service";
+
+// Re-export types that Cloud Functions might need direct access to
+export * from "../types/appointment";
+// Add other types as needed

package/src/admin/notifications/notifications.admin.ts

@@ -277,10 +277,7 @@ export class NotificationsAdmin {
         .toLocaleDateString()} is confirmed.`;
     }
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -289,7 +286,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: NotificationType.APPOINTMENT_STATUS_CHANGE,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -353,10 +350,7 @@ export class NotificationsAdmin {
       }
     }
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -365,7 +359,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: recipientRole,
       notificationType: NotificationType.APPOINTMENT_CANCELLED,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,
@@ -404,10 +398,7 @@ export class NotificationsAdmin {
     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 = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -416,7 +407,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: NotificationType.APPOINTMENT_RESCHEDULED_PROPOSAL,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -458,10 +449,7 @@ export class NotificationsAdmin {
       .toDate()
       .toLocaleDateString()} is now ${appointment.paymentStatus}.`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationType =
       appointment.paymentStatus === PaymentStatus.PAID
@@ -475,7 +463,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: notificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -514,10 +502,7 @@ export class NotificationsAdmin {
     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 = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const notificationData: Omit<
       Notification,
@@ -526,7 +511,7 @@ export class NotificationsAdmin {
       userId: patientUserId,
       userRole: UserRole.PATIENT,
       notificationType: NotificationType.REVIEW_REQUEST,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: patientExpoTokens,
       title,
       body,
@@ -576,10 +561,7 @@ export class NotificationsAdmin {
       .toDate()
       .toLocaleDateString()}.`;
 
-    const adminTsNow = admin.firestore.Timestamp.now();
-    const clientCompatibleNotificationTime = TimestampUtils.adminToClient(
-      adminTsNow
-    ) as FirebaseClientTimestamp;
+    const notificationTimestampForDb = admin.firestore.Timestamp.now();
 
     const tempNotificationType = NotificationType.GENERAL_MESSAGE;
 
@@ -590,7 +572,7 @@ export class NotificationsAdmin {
       userId: recipientUserId,
       userRole: UserRole.PRACTITIONER,
       notificationType: tempNotificationType,
-      notificationTime: clientCompatibleNotificationTime,
+      notificationTime: notificationTimestampForDb as any,
       notificationTokens: recipientExpoTokens,
       title,
       body,

package/src/admin/requirements/patient-requirements.admin.service.ts

@@ -176,7 +176,7 @@ export class PatientRequirementsAdminService {
           userId: patientId,
           userRole: UserRole.PATIENT,
           notificationType: NotificationType.REQUIREMENT_INSTRUCTION_DUE,
-          notificationTime: currentInstruction.dueTime, // This is a Firestore Timestamp
+          notificationTime: currentInstruction.dueTime as any, // dueTime should be an admin.firestore.Timestamp already
           notificationTokens: patientExpoTokens,
           title: `Reminder: ${instance.requirementName}`,
           body: currentInstruction.instructionText,

package/src/utils/TimestampUtils.ts

@@ -1,22 +1,62 @@
 import * as admin from "firebase-admin";
 import { Timestamp as ClientTimestamp } from "firebase/firestore";
 
+/**
+ * Detect if we're running in a server environment (like Cloud Functions)
+ * or compiled for server usage
+ */
+const IS_SERVER_ENV =
+  process.env.NODE_ENV === "production" ||
+  process.env.FUNCTIONS_EMULATOR === "true" ||
+  process.env.FIREBASE_CONFIG !== undefined;
+
 /**
  * Utilities for managing timestamps across client and server-side Firebase code.
  * This module provides conversion functions to ensure timestamp compatibility
  * between admin and client Firebase SDKs.
  */
 export class TimestampUtils {
+  /**
+   * Flag to force server mode where admin timestamps are preserved
+   * This should be true in Cloud Functions environments
+   */
+  private static serverMode = IS_SERVER_ENV;
+
+  /**
+   * Enables server mode where admin timestamps are preserved when saving
+   * to Firestore via the admin SDK
+   */
+  static enableServerMode(): void {
+    this.serverMode = true;
+  }
+
+  /**
+   * Disables server mode - use this only for client-side or mixed environments
+   */
+  static disableServerMode(): void {
+    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 null if input is null
+   * @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: admin.firestore.Timestamp | null
-  ): ClientTimestamp | null {
+  ): ClientTimestamp | admin.firestore.Timestamp | null {
     if (!adminTimestamp) return null;
 
+    // In server mode (Cloud Functions), just return the admin timestamp
+    if (this.serverMode) {
+      return adminTimestamp;
+    }
+
+    // In client mode, convert to client timestamp
     return new ClientTimestamp(
       adminTimestamp.seconds,
       adminTimestamp.nanoseconds
@@ -40,8 +80,21 @@ export class TimestampUtils {
   }
 
   /**
-   * Creates a client-compatible timestamp for the current time
-   * @returns A client SDK Timestamp (from firebase/firestore) for the current time
+   * 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(): admin.firestore.Timestamp | ClientTimestamp {
+    const now = admin.firestore.Timestamp.now();
+    // In server mode, return the admin timestamp directly
+    if (this.serverMode) {
+      return now;
+    }
+    // In client mode, convert to client timestamp
+    return this.adminToClient(now) as ClientTimestamp;
+  }
+
+  /**
+   * @deprecated Use nowAsTimestamp() instead for better cross-environment compatibility
    */
   static nowAsClient(): ClientTimestamp {
     const now = admin.firestore.Timestamp.now();
@@ -49,33 +102,87 @@ export class TimestampUtils {
   }
 
   /**
-   * Converts a Date object to a client Firestore Timestamp
+   * Converts a Date object to a timestamp in the appropriate format based on environment
    * @param date - JavaScript Date object
-   * @returns A client SDK Timestamp (from firebase/firestore) or null if input is null
+   * @returns A timestamp (admin timestamp in server mode, client in client mode) or null if input is null
    */
-  static dateToClientTimestamp(date: Date | null): ClientTimestamp | null {
+  static dateToTimestamp(
+    date: Date | null
+  ): admin.firestore.Timestamp | ClientTimestamp | null {
     if (!date) return null;
 
+    if (this.serverMode) {
+      return admin.firestore.Timestamp.fromDate(date);
+    }
+
     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
+   * @deprecated Use dateToTimestamp() instead for better cross-environment compatibility
+   */
+  static dateToClientTimestamp(date: Date | null): ClientTimestamp | null {
+    if (!date) return null;
+    return ClientTimestamp.fromDate(date);
+  }
+
+  /**
+   * @deprecated Use dateToTimestamp() instead for better cross-environment compatibility
    */
   static dateToAdminTimestamp(
     date: Date | null
   ): admin.firestore.Timestamp | null {
     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
+   * Gets a server timestamp field value for use in create/update operations
+   * Works in both admin and client environments
+   */
+  static serverTimestamp(): admin.firestore.FieldValue | any {
+    if (this.serverMode) {
+      return admin.firestore.FieldValue.serverTimestamp();
+    }
+    // In client mode, we'd need to import from firebase/firestore
+    // This would be implemented for client environments
+    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<T>(obj: T): T {
+    if (!obj || typeof obj !== "object") {
+      return obj;
+    }
+
+    if (obj instanceof admin.firestore.Timestamp) {
+      return this.serverMode ? obj : (this.adminToClient(obj) as unknown as T);
+    }
+
+    if (obj instanceof ClientTimestamp && this.serverMode) {
+      return this.clientToAdmin(obj) as unknown as T;
+    }
+
+    if (Array.isArray(obj)) {
+      return obj.map((item) => this.normalizeTimestamps(item)) as unknown as T;
+    }
+
+    const result = { ...obj } as any;
+
+    for (const key in result) {
+      if (Object.prototype.hasOwnProperty.call(result, key)) {
+        result[key] = this.normalizeTimestamps(result[key]);
+      }
+    }
+
+    return result as T;
+  }
+
+  /**
+   * @deprecated Use normalizeTimestamps() instead for better cross-environment compatibility
    */
   static convertObjectTimestampsAdminToClient<T>(obj: T): T {
     if (!obj || typeof obj !== "object") {
@@ -104,9 +211,7 @@ export class TimestampUtils {
   }
 
   /**
-   * 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
+   * @deprecated Use normalizeTimestamps() instead for better cross-environment compatibility
    */
   static convertObjectTimestampsClientToAdmin<T>(obj: T): T {
     if (!obj || typeof obj !== "object") {