@blackcode_sa/metaestetics-api 1.7.22 → 1.7.23

package/dist/index.d.mts

@@ -7606,7 +7606,17 @@ declare class AppointmentService extends BaseService {
      * Admin proposes to reschedule an appointment.
      * Sets status to RESCHEDULED_BY_CLINIC and updates times.
      */
-    rescheduleAppointmentAdmin(appointmentId: string, newStartTime: Timestamp, newEndTime: Timestamp): Promise<Appointment>;
+    rescheduleAppointmentAdmin(params: {
+        appointmentId: string;
+        newStartTime: any;
+        newEndTime: any;
+    }): Promise<Appointment>;
+    /**
+     * Helper method to convert various timestamp formats to Firestore Timestamp
+     * @param value - Any timestamp format (Timestamp, number, string, Date, serialized Timestamp)
+     * @returns Firestore Timestamp object
+     */
+    private convertToTimestamp;
     /**
      * User confirms a reschedule proposed by the clinic.
      * Status changes from RESCHEDULED_BY_CLINIC to CONFIRMED.

package/dist/index.d.ts

@@ -7606,7 +7606,17 @@ declare class AppointmentService extends BaseService {
      * Admin proposes to reschedule an appointment.
      * Sets status to RESCHEDULED_BY_CLINIC and updates times.
      */
-    rescheduleAppointmentAdmin(appointmentId: string, newStartTime: Timestamp, newEndTime: Timestamp): Promise<Appointment>;
+    rescheduleAppointmentAdmin(params: {
+        appointmentId: string;
+        newStartTime: any;
+        newEndTime: any;
+    }): Promise<Appointment>;
+    /**
+     * Helper method to convert various timestamp formats to Firestore Timestamp
+     * @param value - Any timestamp format (Timestamp, number, string, Date, serialized Timestamp)
+     * @returns Firestore Timestamp object
+     */
+    private convertToTimestamp;
     /**
      * User confirms a reschedule proposed by the clinic.
      * Status changes from RESCHEDULED_BY_CLINIC to CONFIRMED.

package/dist/index.js

@@ -703,6 +703,17 @@ var searchAppointmentsSchema = import_zod2.z.object({
     path: ["endDate"]
   }
 );
+var rescheduleAppointmentSchema = import_zod2.z.object({
+  appointmentId: import_zod2.z.string().min(MIN_STRING_LENGTH, "Appointment ID is required"),
+  newStartTime: import_zod2.z.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
+    "New start time must be a valid timestamp, Date object, number, or string"
+  ),
+  newEndTime: import_zod2.z.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
+    "New end time must be a valid timestamp, Date object, number, or string"
+  )
+});
 
 // src/config/firebase.ts
 var import_app = require("firebase/app");
@@ -13492,22 +13503,63 @@ var AppointmentService = class extends BaseService {
    * Admin proposes to reschedule an appointment.
    * Sets status to RESCHEDULED_BY_CLINIC and updates times.
    */
-  async rescheduleAppointmentAdmin(appointmentId, newStartTime, newEndTime) {
+  async rescheduleAppointmentAdmin(params) {
     console.log(
-      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${params.appointmentId}`
+    );
+    const validatedParams = await rescheduleAppointmentSchema.parseAsync(
+      params
+    );
+    const startTimestamp = this.convertToTimestamp(
+      validatedParams.newStartTime
     );
-    if (newEndTime.toMillis() <= newStartTime.toMillis()) {
+    const endTimestamp = this.convertToTimestamp(validatedParams.newEndTime);
+    if (endTimestamp.toMillis() <= startTimestamp.toMillis()) {
       throw new Error("New end time must be after new start time.");
     }
     const updateData = {
       status: "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */,
-      appointmentStartTime: newStartTime,
-      appointmentEndTime: newEndTime,
+      appointmentStartTime: startTimestamp,
+      appointmentEndTime: endTimestamp,
       rescheduleTime: import_firestore43.Timestamp.now(),
       confirmationTime: null,
       updatedAt: (0, import_firestore43.serverTimestamp)()
     };
-    return this.updateAppointment(appointmentId, updateData);
+    return this.updateAppointment(validatedParams.appointmentId, updateData);
+  }
+  /**
+   * Helper method to convert various timestamp formats to Firestore Timestamp
+   * @param value - Any timestamp format (Timestamp, number, string, Date, serialized Timestamp)
+   * @returns Firestore Timestamp object
+   */
+  convertToTimestamp(value) {
+    console.log(`[APPOINTMENT_SERVICE] Converting timestamp:`, {
+      value,
+      type: typeof value
+    });
+    if (value && typeof value.toMillis === "function") {
+      return value;
+    }
+    if (typeof value === "number") {
+      return import_firestore43.Timestamp.fromMillis(value);
+    }
+    if (typeof value === "string") {
+      return import_firestore43.Timestamp.fromDate(new Date(value));
+    }
+    if (value instanceof Date) {
+      return import_firestore43.Timestamp.fromDate(value);
+    }
+    if (value && typeof value._seconds === "number") {
+      return new import_firestore43.Timestamp(value._seconds, value._nanoseconds || 0);
+    }
+    if (value && typeof value.seconds === "number") {
+      return new import_firestore43.Timestamp(value.seconds, value.nanoseconds || 0);
+    }
+    throw new Error(
+      `Invalid timestamp format: ${typeof value}, value: ${JSON.stringify(
+        value
+      )}`
+    );
   }
   /**
    * User confirms a reschedule proposed by the clinic.

package/dist/index.mjs

@@ -464,6 +464,17 @@ var searchAppointmentsSchema = z2.object({
     path: ["endDate"]
   }
 );
+var rescheduleAppointmentSchema = z2.object({
+  appointmentId: z2.string().min(MIN_STRING_LENGTH, "Appointment ID is required"),
+  newStartTime: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
+    "New start time must be a valid timestamp, Date object, number, or string"
+  ),
+  newEndTime: z2.any().refine(
+    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
+    "New end time must be a valid timestamp, Date object, number, or string"
+  )
+});
 
 // src/config/firebase.ts
 import { initializeApp } from "firebase/app";
@@ -13613,22 +13624,63 @@ var AppointmentService = class extends BaseService {
    * Admin proposes to reschedule an appointment.
    * Sets status to RESCHEDULED_BY_CLINIC and updates times.
    */
-  async rescheduleAppointmentAdmin(appointmentId, newStartTime, newEndTime) {
+  async rescheduleAppointmentAdmin(params) {
     console.log(
-      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${params.appointmentId}`
+    );
+    const validatedParams = await rescheduleAppointmentSchema.parseAsync(
+      params
+    );
+    const startTimestamp = this.convertToTimestamp(
+      validatedParams.newStartTime
     );
-    if (newEndTime.toMillis() <= newStartTime.toMillis()) {
+    const endTimestamp = this.convertToTimestamp(validatedParams.newEndTime);
+    if (endTimestamp.toMillis() <= startTimestamp.toMillis()) {
       throw new Error("New end time must be after new start time.");
     }
     const updateData = {
       status: "rescheduled_by_clinic" /* RESCHEDULED_BY_CLINIC */,
-      appointmentStartTime: newStartTime,
-      appointmentEndTime: newEndTime,
+      appointmentStartTime: startTimestamp,
+      appointmentEndTime: endTimestamp,
       rescheduleTime: Timestamp29.now(),
       confirmationTime: null,
       updatedAt: serverTimestamp24()
     };
-    return this.updateAppointment(appointmentId, updateData);
+    return this.updateAppointment(validatedParams.appointmentId, updateData);
+  }
+  /**
+   * Helper method to convert various timestamp formats to Firestore Timestamp
+   * @param value - Any timestamp format (Timestamp, number, string, Date, serialized Timestamp)
+   * @returns Firestore Timestamp object
+   */
+  convertToTimestamp(value) {
+    console.log(`[APPOINTMENT_SERVICE] Converting timestamp:`, {
+      value,
+      type: typeof value
+    });
+    if (value && typeof value.toMillis === "function") {
+      return value;
+    }
+    if (typeof value === "number") {
+      return Timestamp29.fromMillis(value);
+    }
+    if (typeof value === "string") {
+      return Timestamp29.fromDate(new Date(value));
+    }
+    if (value instanceof Date) {
+      return Timestamp29.fromDate(value);
+    }
+    if (value && typeof value._seconds === "number") {
+      return new Timestamp29(value._seconds, value._nanoseconds || 0);
+    }
+    if (value && typeof value.seconds === "number") {
+      return new Timestamp29(value.seconds, value.nanoseconds || 0);
+    }
+    throw new Error(
+      `Invalid timestamp format: ${typeof value}, value: ${JSON.stringify(
+        value
+      )}`
+    );
   }
   /**
    * User confirms a reschedule proposed by the clinic.

package/package.json

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

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

@@ -35,6 +35,7 @@ import {
   createAppointmentSchema,
   updateAppointmentSchema,
   searchAppointmentsSchema,
+  rescheduleAppointmentSchema,
 } from "../../validations/appointment.schema";
 
 // Import other services needed (dependency injection pattern)
@@ -682,26 +683,87 @@ export class AppointmentService extends BaseService {
    * Admin proposes to reschedule an appointment.
    * Sets status to RESCHEDULED_BY_CLINIC and updates times.
    */
-  async rescheduleAppointmentAdmin(
-    appointmentId: string,
-    newStartTime: Timestamp,
-    newEndTime: Timestamp
-  ): Promise<Appointment> {
+  async rescheduleAppointmentAdmin(params: {
+    appointmentId: string;
+    newStartTime: any; // Accept any type (number, string, Timestamp, etc.)
+    newEndTime: any; // Accept any type (number, string, Timestamp, etc.)
+  }): Promise<Appointment> {
     console.log(
-      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${appointmentId}`
+      `[APPOINTMENT_SERVICE] Admin rescheduling appointment: ${params.appointmentId}`
+    );
+
+    // Validate input data
+    const validatedParams = await rescheduleAppointmentSchema.parseAsync(
+      params
     );
-    if (newEndTime.toMillis() <= newStartTime.toMillis()) {
+
+    // Convert input to Timestamp objects
+    const startTimestamp = this.convertToTimestamp(
+      validatedParams.newStartTime
+    );
+    const endTimestamp = this.convertToTimestamp(validatedParams.newEndTime);
+
+    if (endTimestamp.toMillis() <= startTimestamp.toMillis()) {
       throw new Error("New end time must be after new start time.");
     }
+
     const updateData: UpdateAppointmentData = {
       status: AppointmentStatus.RESCHEDULED_BY_CLINIC,
-      appointmentStartTime: newStartTime,
-      appointmentEndTime: newEndTime,
+      appointmentStartTime: startTimestamp,
+      appointmentEndTime: endTimestamp,
       rescheduleTime: Timestamp.now(),
       confirmationTime: null,
       updatedAt: serverTimestamp(),
     };
-    return this.updateAppointment(appointmentId, updateData);
+    return this.updateAppointment(validatedParams.appointmentId, updateData);
+  }
+
+  /**
+   * Helper method to convert various timestamp formats to Firestore Timestamp
+   * @param value - Any timestamp format (Timestamp, number, string, Date, serialized Timestamp)
+   * @returns Firestore Timestamp object
+   */
+  private convertToTimestamp(value: any): Timestamp {
+    console.log(`[APPOINTMENT_SERVICE] Converting timestamp:`, {
+      value,
+      type: typeof value,
+    });
+
+    // If it's already a Timestamp object with methods
+    if (value && typeof value.toMillis === "function") {
+      return value;
+    }
+
+    // If it's a number (milliseconds since epoch)
+    if (typeof value === "number") {
+      return Timestamp.fromMillis(value);
+    }
+
+    // If it's a string (ISO date string)
+    if (typeof value === "string") {
+      return Timestamp.fromDate(new Date(value));
+    }
+
+    // If it's a Date object
+    if (value instanceof Date) {
+      return Timestamp.fromDate(value);
+    }
+
+    // If it has _seconds property (serialized Timestamp) - THIS IS WHAT FRONTEND SENDS
+    if (value && typeof value._seconds === "number") {
+      return new Timestamp(value._seconds, value._nanoseconds || 0);
+    }
+
+    // If it has seconds property (serialized Timestamp)
+    if (value && typeof value.seconds === "number") {
+      return new Timestamp(value.seconds, value.nanoseconds || 0);
+    }
+
+    throw new Error(
+      `Invalid timestamp format: ${typeof value}, value: ${JSON.stringify(
+        value
+      )}`
+    );
   }
 
   /**

package/src/validations/appointment.schema.ts

@@ -360,3 +360,36 @@ export const searchAppointmentsSchema = z
       path: ["endDate"],
     }
   );
+
+/**
+ * Schema for validating appointment reschedule data
+ */
+export const rescheduleAppointmentSchema = z.object({
+  appointmentId: z
+    .string()
+    .min(MIN_STRING_LENGTH, "Appointment ID is required"),
+  newStartTime: z
+    .any()
+    .refine(
+      (val) =>
+        val instanceof Date ||
+        val?._seconds !== undefined ||
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
+      "New start time must be a valid timestamp, Date object, number, or string"
+    ),
+  newEndTime: z
+    .any()
+    .refine(
+      (val) =>
+        val instanceof Date ||
+        val?._seconds !== undefined ||
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
+      "New end time must be a valid timestamp, Date object, number, or string"
+    ),
+});