@blackcode_sa/metaestetics-api 1.11.0 → 1.11.1

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

@@ -21,18 +21,15 @@ import { BaseService } from "../base.service";
 import {
   Appointment,
   AppointmentStatus,
-  CreateAppointmentData,
   UpdateAppointmentData,
   SearchAppointmentsParams,
   PaymentStatus,
   AppointmentMediaItem,
   PatientReviewInfo,
-  LinkedFormInfo,
   type CreateAppointmentHttpData,
   APPOINTMENTS_COLLECTION,
 } from "../../types/appointment";
 import {
-  createAppointmentSchema,
   updateAppointmentSchema,
   searchAppointmentsSchema,
   rescheduleAppointmentSchema,
@@ -47,8 +44,6 @@ import { FilledDocumentService } from "../documentation-templates/filled-documen
 
 // Import utility functions
 import {
-  fetchAggregatedInfoUtil,
-  createAppointmentUtil,
   updateAppointmentUtil,
   getAppointmentByIdUtil,
   searchAppointmentsUtil,

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

@@ -33,7 +33,6 @@ import {
   PractitionerProfileInfo,
 } from "../../../types/profile";
 import { BlockingCondition } from "../../../backoffice/types/static/blocking-condition.types";
-import { Contraindication } from "../../../backoffice/types/static/contraindication.types";
 import { Requirement } from "../../../backoffice/types/requirement.types";
 import { PRACTITIONERS_COLLECTION } from "../../../types/practitioner";
 import { CLINICS_COLLECTION } from "../../../types/clinic";
@@ -43,6 +42,7 @@ import {
   Technology,
   TECHNOLOGIES_COLLECTION,
 } from "../../../backoffice/types/technology.types";
+import type { ContraindicationDynamic } from "../../../backoffice";
 
 /**
  * Fetches all the necessary information for an appointment by IDs.
@@ -66,7 +66,7 @@ export async function fetchAggregatedInfoUtil(
   patientInfo: PatientProfileInfo;
   procedureInfo: ProcedureSummaryInfo;
   blockingConditions: BlockingCondition[];
-  contraindications: Contraindication[];
+  contraindications: ContraindicationDynamic[];
   preProcedureRequirements: Requirement[];
   postProcedureRequirements: Requirement[];
 }> {
@@ -162,7 +162,7 @@ export async function fetchAggregatedInfoUtil(
     }
 
     let blockingConditions: BlockingCondition[] = [];
-    let contraindications: Contraindication[] = [];
+    let contraindications: ContraindicationDynamic[] = [];
     let preProcedureRequirements: Requirement[] = [];
     let postProcedureRequirements: Requirement[] = [];
 
@@ -213,85 +213,85 @@ export async function fetchAggregatedInfoUtil(
  * @param generateId Function to generate a unique ID
  * @returns The created Appointment
  */
-export async function createAppointmentUtil(
-  db: Firestore,
-  data: CreateAppointmentData,
-  aggregatedInfo: {
-    clinicInfo: ClinicInfo;
-    practitionerInfo: PractitionerProfileInfo;
-    patientInfo: PatientProfileInfo;
-    procedureInfo: ProcedureSummaryInfo;
-    blockingConditions: BlockingCondition[];
-    contraindications: Contraindication[];
-    preProcedureRequirements: Requirement[];
-    postProcedureRequirements: Requirement[];
-  },
-  generateId: () => string
-): Promise<Appointment> {
-  try {
-    const appointmentId = generateId();
-
-    // Create appointment object
-    const appointment: Omit<Appointment, "createdAt" | "updatedAt"> & {
-      createdAt: any;
-      updatedAt: any;
-    } = {
-      id: appointmentId,
-      calendarEventId: data.calendarEventId,
-      clinicBranchId: data.clinicBranchId,
-      clinicInfo: aggregatedInfo.clinicInfo,
-      practitionerId: data.practitionerId,
-      practitionerInfo: aggregatedInfo.practitionerInfo,
-      patientId: data.patientId,
-      patientInfo: aggregatedInfo.patientInfo,
-      procedureId: data.procedureId,
-      procedureInfo: aggregatedInfo.procedureInfo,
-      status: data.initialStatus,
-      bookingTime: Timestamp.now(),
-      appointmentStartTime: data.appointmentStartTime,
-      appointmentEndTime: data.appointmentEndTime,
-      patientNotes: data.patientNotes || null,
-      cost: data.cost,
-      currency: data.currency,
-      paymentStatus: data.initialPaymentStatus || PaymentStatus.UNPAID,
-      blockingConditions: aggregatedInfo.blockingConditions,
-      contraindications: aggregatedInfo.contraindications,
-      preProcedureRequirements: aggregatedInfo.preProcedureRequirements,
-      postProcedureRequirements: aggregatedInfo.postProcedureRequirements,
-      completedPreRequirements: [],
-      completedPostRequirements: [],
-      createdAt: serverTimestamp(),
-      updatedAt: serverTimestamp(),
-    };
-
-    // Add additional fields for confirmation if appointment is already confirmed
-    if (data.initialStatus === AppointmentStatus.CONFIRMED) {
-      appointment.confirmationTime = Timestamp.now();
-    }
-
-    // Save to Firestore
-    await setDoc(doc(db, APPOINTMENTS_COLLECTION, appointmentId), appointment);
-
-    // Update the calendar event with the appointment ID
-    const calendarEventRef = doc(db, CALENDAR_COLLECTION, data.calendarEventId);
-    await updateDoc(calendarEventRef, {
-      appointmentId: appointmentId,
-      updatedAt: serverTimestamp(),
-    });
-
-    // Return the created appointment
-    // Convert serverTimestamp to regular Timestamp for immediate use
-    const now = Timestamp.now();
-    return {
-      ...appointment,
-      createdAt: now,
-      updatedAt: now,
-    } as Appointment;
-  } catch (error) {
-    console.error("Error creating appointment:", error);
-    throw error;
-  }
-}
+// export async function createAppointmentUtil(
+//   db: Firestore,
+//   data: CreateAppointmentData,
+//   aggregatedInfo: {
+//     clinicInfo: ClinicInfo;
+//     practitionerInfo: PractitionerProfileInfo;
+//     patientInfo: PatientProfileInfo;
+//     procedureInfo: ProcedureSummaryInfo;
+//     blockingConditions: BlockingCondition[];
+//     contraindications: ContraindicationDynamic[];
+//     preProcedureRequirements: Requirement[];
+//     postProcedureRequirements: Requirement[];
+//   },
+//   generateId: () => string
+// ): Promise<Appointment> {
+//   try {
+//     const appointmentId = generateId();
+
+//     // Create appointment object
+//     const appointment: Omit<Appointment, "createdAt" | "updatedAt"> & {
+//       createdAt: any;
+//       updatedAt: any;
+//     } = {
+//       id: appointmentId,
+//       calendarEventId: data.calendarEventId,
+//       clinicBranchId: data.clinicBranchId,
+//       clinicInfo: aggregatedInfo.clinicInfo,
+//       practitionerId: data.practitionerId,
+//       practitionerInfo: aggregatedInfo.practitionerInfo,
+//       patientId: data.patientId,
+//       patientInfo: aggregatedInfo.patientInfo,
+//       procedureId: data.procedureId,
+//       procedureInfo: aggregatedInfo.procedureInfo,
+//       status: data.initialStatus,
+//       bookingTime: Timestamp.now(),
+//       appointmentStartTime: data.appointmentStartTime,
+//       appointmentEndTime: data.appointmentEndTime,
+//       patientNotes: data.patientNotes || null,
+//       cost: data.cost,
+//       currency: data.currency,
+//       paymentStatus: data.initialPaymentStatus || PaymentStatus.UNPAID,
+//       blockingConditions: aggregatedInfo.blockingConditions,
+//       contraindications: aggregatedInfo.contraindications,
+//       preProcedureRequirements: aggregatedInfo.preProcedureRequirements,
+//       postProcedureRequirements: aggregatedInfo.postProcedureRequirements,
+//       completedPreRequirements: [],
+//       completedPostRequirements: [],
+//       createdAt: serverTimestamp(),
+//       updatedAt: serverTimestamp(),
+//     };
+
+//     // Add additional fields for confirmation if appointment is already confirmed
+//     if (data.initialStatus === AppointmentStatus.CONFIRMED) {
+//       appointment.confirmationTime = Timestamp.now();
+//     }
+
+//     // Save to Firestore
+//     await setDoc(doc(db, APPOINTMENTS_COLLECTION, appointmentId), appointment);
+
+//     // Update the calendar event with the appointment ID
+//     const calendarEventRef = doc(db, CALENDAR_COLLECTION, data.calendarEventId);
+//     await updateDoc(calendarEventRef, {
+//       appointmentId: appointmentId,
+//       updatedAt: serverTimestamp(),
+//     });
+
+//     // Return the created appointment
+//     // Convert serverTimestamp to regular Timestamp for immediate use
+//     const now = Timestamp.now();
+//     return {
+//       ...appointment,
+//       createdAt: now,
+//       updatedAt: now,
+//     } as Appointment;
+//   } catch (error) {
+//     console.error("Error creating appointment:", error);
+//     throw error;
+//   }
+// }
 
 /**
  * Updates an existing appointment in Firestore.
@@ -327,23 +327,27 @@ export async function updateAppointmentUtil(
       const validPreReqIds = currentAppointment.preProcedureRequirements.map(
         (req) => req.id
       );
-      const invalidPreReqIds = data.completedPreRequirements.filter(
-        (id) => !validPreReqIds.includes(id)
-      );
 
-      if (invalidPreReqIds.length > 0) {
-        throw new Error(
-          `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
+      // 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)
         );
-      }
 
-      // Update the completed pre-requirements
-      completedPreRequirements = [
-        ...new Set([
-          ...completedPreRequirements,
-          ...data.completedPreRequirements,
-        ]),
-      ];
+        if (invalidPreReqIds.length > 0) {
+          throw new Error(
+            `Invalid pre-requirement IDs: ${invalidPreReqIds.join(", ")}`
+          );
+        }
+
+        // Update the completed pre-requirements
+        completedPreRequirements = [
+          ...new Set([
+            ...completedPreRequirements,
+            ...data.completedPreRequirements,
+          ]),
+        ];
+      }
     }
 
     if (data.completedPostRequirements) {
@@ -351,30 +355,37 @@ export async function updateAppointmentUtil(
       const validPostReqIds = currentAppointment.postProcedureRequirements.map(
         (req) => req.id
       );
-      const invalidPostReqIds = data.completedPostRequirements.filter(
-        (id) => !validPostReqIds.includes(id)
-      );
 
-      if (invalidPostReqIds.length > 0) {
-        throw new Error(
-          `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
+      if (Array.isArray(data.completedPostRequirements)) {
+        const invalidPostReqIds = data.completedPostRequirements.filter(
+          (id) => !validPostReqIds.includes(id)
         );
-      }
 
-      // Update the completed post-requirements
-      completedPostRequirements = [
-        ...new Set([
-          ...completedPostRequirements,
-          ...data.completedPostRequirements,
-        ]),
-      ];
+        if (invalidPostReqIds.length > 0) {
+          throw new Error(
+            `Invalid post-requirement IDs: ${invalidPostReqIds.join(", ")}`
+          );
+        }
+
+        // Update the completed post-requirements
+        completedPostRequirements = [
+          ...new Set([
+            ...completedPostRequirements,
+            ...data.completedPostRequirements,
+          ]),
+        ];
+      }
     }
 
     // Prepare update data
     const updateData: any = {
       ...data,
-      completedPreRequirements,
-      completedPostRequirements,
+      completedPreRequirements: Array.isArray(data.completedPreRequirements)
+        ? completedPreRequirements
+        : data.completedPreRequirements,
+      completedPostRequirements: Array.isArray(data.completedPostRequirements)
+        ? completedPostRequirements
+        : data.completedPostRequirements,
       updatedAt: serverTimestamp(),
     };
 
@@ -454,7 +465,7 @@ async function updateCalendarEventStatus(
       case AppointmentStatus.CANCELED_CLINIC:
         calendarStatus = "canceled";
         break;
-      case AppointmentStatus.RESCHEDULED:
+      case AppointmentStatus.RESCHEDULED_BY_CLINIC:
         calendarStatus = "rescheduled";
         break;
       case AppointmentStatus.COMPLETED: