@blackcode_sa/metaestetics-api 1.7.24 → 1.7.26

package/dist/admin/index.js

@@ -987,14 +987,19 @@ var ClinicAggregationService = class {
     );
     for (const practitionerId of practitionerIds) {
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerId);
-      batch.update(practitionerRef, {
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
-      batch.update(practitionerRef, {
-        clinicsInfo: admin3.firestore.FieldValue.arrayUnion(clinicInfo),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data();
+        const currentClinicsInfo = (practitionerData == null ? void 0 : practitionerData.clinicsInfo) || [];
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+        batch.update(practitionerRef, {
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+      }
     }
     try {
       await batch.commit();
@@ -1058,28 +1063,35 @@ var ClinicAggregationService = class {
       );
       return;
     }
-    const batch = this.db.batch();
     const clinicId = clinicInfo.id;
     const groupRef = this.db.collection(CLINIC_GROUPS_COLLECTION).doc(clinicGroupId);
     console.log(
       `[ClinicAggregationService] Starting update of ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
     );
-    batch.update(groupRef, {
-      clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-      updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-    });
-    batch.update(groupRef, {
-      clinicsInfo: admin3.firestore.FieldValue.arrayUnion(clinicInfo),
-      updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-    });
     try {
-      await batch.commit();
-      console.log(
-        `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
-      );
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data();
+        const currentClinicsInfo = (clinicGroupData == null ? void 0 : clinicGroupData.clinicsInfo) || [];
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+        await groupRef.update({
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+        console.log(
+          `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot update clinic info.`
+        );
+      }
     } catch (error) {
       console.error(
-        `[ClinicAggregationService] Error committing update for ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
+        `[ClinicAggregationService] Error updating ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
         error
       );
       throw error;
@@ -1223,12 +1235,23 @@ var ClinicAggregationService = class {
     );
     for (const practitionerId of practitionerIds) {
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerId);
-      batch.update(practitionerRef, {
-        clinicIds: admin3.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data();
+        const currentClinicIds = (practitionerData == null ? void 0 : practitionerData.clinics) || [];
+        const currentClinicsInfo = (practitionerData == null ? void 0 : practitionerData.clinicsInfo) || [];
+        const filteredClinicIds = currentClinicIds.filter(
+          (id) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        batch.update(practitionerRef, {
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+      }
     }
     try {
       await batch.commit();
@@ -1295,15 +1318,30 @@ var ClinicAggregationService = class {
       `[ClinicAggregationService] Removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
     );
     try {
-      await groupRef.update({
-        clinicIds: admin3.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
-      console.log(
-        `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
-      );
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data();
+        const currentClinicIds = (clinicGroupData == null ? void 0 : clinicGroupData.clinics) || [];
+        const currentClinicsInfo = (clinicGroupData == null ? void 0 : clinicGroupData.clinicsInfo) || [];
+        const filteredClinicIds = currentClinicIds.filter(
+          (id) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        await groupRef.update({
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+        console.log(
+          `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot remove clinic.`
+        );
+      }
     } catch (error) {
       console.error(
         `[ClinicAggregationService] Error removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}:`,

package/dist/admin/index.mjs

@@ -930,14 +930,19 @@ var ClinicAggregationService = class {
     );
     for (const practitionerId of practitionerIds) {
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerId);
-      batch.update(practitionerRef, {
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
-      batch.update(practitionerRef, {
-        clinicsInfo: admin3.firestore.FieldValue.arrayUnion(clinicInfo),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data();
+        const currentClinicsInfo = (practitionerData == null ? void 0 : practitionerData.clinicsInfo) || [];
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+        batch.update(practitionerRef, {
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+      }
     }
     try {
       await batch.commit();
@@ -1001,28 +1006,35 @@ var ClinicAggregationService = class {
       );
       return;
     }
-    const batch = this.db.batch();
     const clinicId = clinicInfo.id;
     const groupRef = this.db.collection(CLINIC_GROUPS_COLLECTION).doc(clinicGroupId);
     console.log(
       `[ClinicAggregationService] Starting update of ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
     );
-    batch.update(groupRef, {
-      clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-      updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-    });
-    batch.update(groupRef, {
-      clinicsInfo: admin3.firestore.FieldValue.arrayUnion(clinicInfo),
-      updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-    });
     try {
-      await batch.commit();
-      console.log(
-        `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
-      );
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data();
+        const currentClinicsInfo = (clinicGroupData == null ? void 0 : clinicGroupData.clinicsInfo) || [];
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+        await groupRef.update({
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+        console.log(
+          `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot update clinic info.`
+        );
+      }
     } catch (error) {
       console.error(
-        `[ClinicAggregationService] Error committing update for ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
+        `[ClinicAggregationService] Error updating ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
         error
       );
       throw error;
@@ -1166,12 +1178,23 @@ var ClinicAggregationService = class {
     );
     for (const practitionerId of practitionerIds) {
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(practitionerId);
-      batch.update(practitionerRef, {
-        clinicIds: admin3.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data();
+        const currentClinicIds = (practitionerData == null ? void 0 : practitionerData.clinics) || [];
+        const currentClinicsInfo = (practitionerData == null ? void 0 : practitionerData.clinicsInfo) || [];
+        const filteredClinicIds = currentClinicIds.filter(
+          (id) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        batch.update(practitionerRef, {
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+      }
     }
     try {
       await batch.commit();
@@ -1238,15 +1261,30 @@ var ClinicAggregationService = class {
       `[ClinicAggregationService] Removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
     );
     try {
-      await groupRef.update({
-        clinicIds: admin3.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin3.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin3.firestore.FieldValue.serverTimestamp()
-      });
-      console.log(
-        `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
-      );
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data();
+        const currentClinicIds = (clinicGroupData == null ? void 0 : clinicGroupData.clinics) || [];
+        const currentClinicsInfo = (clinicGroupData == null ? void 0 : clinicGroupData.clinicsInfo) || [];
+        const filteredClinicIds = currentClinicIds.filter(
+          (id) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic) => clinic.id !== clinicId
+        );
+        await groupRef.update({
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin3.firestore.FieldValue.serverTimestamp()
+        });
+        console.log(
+          `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot remove clinic.`
+        );
+      }
     } catch (error) {
       console.error(
         `[ClinicAggregationService] Error removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}:`,

package/dist/index.js

@@ -523,7 +523,7 @@ var appointmentMediaItemSchema = import_zod2.z.object({
   url: import_zod2.z.string().url("Media URL must be a valid URL"),
   fileName: import_zod2.z.string().optional(),
   uploadedAt: import_zod2.z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "uploadedAt must be a valid timestamp or Date object"
   ),
   uploadedBy: import_zod2.z.string().min(MIN_STRING_LENGTH, "Uploaded by user ID is required"),
@@ -557,11 +557,11 @@ var linkedFormInfoSchema = import_zod2.z.object({
   status: filledDocumentStatusSchema,
   path: import_zod2.z.string().min(MIN_STRING_LENGTH, "Form path is required"),
   submittedAt: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "submittedAt must be a valid timestamp or Date object"
   ).optional(),
   completedAt: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "completedAt must be a valid timestamp or Date object"
   ).optional()
 });
@@ -570,14 +570,14 @@ var patientReviewInfoSchema = import_zod2.z.object({
   rating: import_zod2.z.number().min(1).max(5, "Rating must be between 1 and 5"),
   comment: import_zod2.z.string().max(MAX_STRING_LENGTH_LONG, "Comment too long").optional(),
   reviewedAt: import_zod2.z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "reviewedAt must be a valid timestamp or Date object"
   )
 });
 var finalizedDetailsSchema = import_zod2.z.object({
   by: import_zod2.z.string().min(MIN_STRING_LENGTH, "Finalized by user ID is required"),
   at: import_zod2.z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Finalized at must be a valid timestamp or Date object"
   ),
   notes: import_zod2.z.string().max(MAX_STRING_LENGTH_LONG, "Finalization notes too long").optional()
@@ -588,11 +588,11 @@ var createAppointmentSchema = import_zod2.z.object({
   patientId: import_zod2.z.string().min(MIN_STRING_LENGTH, "Patient ID is required"),
   procedureId: import_zod2.z.string().min(MIN_STRING_LENGTH, "Procedure ID is required"),
   appointmentStartTime: import_zod2.z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Appointment start time must be a valid timestamp or Date object"
   ),
   appointmentEndTime: import_zod2.z.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Appointment end time must be a valid timestamp or Date object"
   ),
   cost: import_zod2.z.number().min(0, "Cost must be a non-negative number"),
@@ -622,11 +622,11 @@ var updateAppointmentSchema = import_zod2.z.object({
   linkedFormIds: import_zod2.z.union([import_zod2.z.array(import_zod2.z.string()), import_zod2.z.any()]).optional(),
   pendingUserFormsIds: import_zod2.z.union([import_zod2.z.array(import_zod2.z.string()), import_zod2.z.any()]).optional(),
   appointmentStartTime: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Appointment start time must be a valid timestamp or Date object"
   ).optional(),
   appointmentEndTime: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Appointment end time must be a valid timestamp or Date object"
   ).optional(),
   calendarEventId: import_zod2.z.string().min(MIN_STRING_LENGTH).optional(),
@@ -670,11 +670,11 @@ var searchAppointmentsSchema = import_zod2.z.object({
   practitionerId: import_zod2.z.string().optional(),
   clinicBranchId: import_zod2.z.string().optional(),
   startDate: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Start date must be a valid timestamp or Date object"
   ).optional(),
   endDate: import_zod2.z.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "End date must be a valid timestamp or Date object"
   ).optional(),
   status: import_zod2.z.union([

package/dist/index.mjs

@@ -281,7 +281,7 @@ var appointmentMediaItemSchema = z2.object({
   url: z2.string().url("Media URL must be a valid URL"),
   fileName: z2.string().optional(),
   uploadedAt: z2.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "uploadedAt must be a valid timestamp or Date object"
   ),
   uploadedBy: z2.string().min(MIN_STRING_LENGTH, "Uploaded by user ID is required"),
@@ -315,11 +315,11 @@ var linkedFormInfoSchema = z2.object({
   status: filledDocumentStatusSchema,
   path: z2.string().min(MIN_STRING_LENGTH, "Form path is required"),
   submittedAt: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "submittedAt must be a valid timestamp or Date object"
   ).optional(),
   completedAt: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "completedAt must be a valid timestamp or Date object"
   ).optional()
 });
@@ -328,14 +328,14 @@ var patientReviewInfoSchema = z2.object({
   rating: z2.number().min(1).max(5, "Rating must be between 1 and 5"),
   comment: z2.string().max(MAX_STRING_LENGTH_LONG, "Comment too long").optional(),
   reviewedAt: z2.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "reviewedAt must be a valid timestamp or Date object"
   )
 });
 var finalizedDetailsSchema = z2.object({
   by: z2.string().min(MIN_STRING_LENGTH, "Finalized by user ID is required"),
   at: z2.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Finalized at must be a valid timestamp or Date object"
   ),
   notes: z2.string().max(MAX_STRING_LENGTH_LONG, "Finalization notes too long").optional()
@@ -346,11 +346,11 @@ var createAppointmentSchema = z2.object({
   patientId: z2.string().min(MIN_STRING_LENGTH, "Patient ID is required"),
   procedureId: z2.string().min(MIN_STRING_LENGTH, "Procedure ID is required"),
   appointmentStartTime: z2.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Appointment start time must be a valid timestamp or Date object"
   ),
   appointmentEndTime: z2.any().refine(
-    (val) => val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (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",
     "Appointment end time must be a valid timestamp or Date object"
   ),
   cost: z2.number().min(0, "Cost must be a non-negative number"),
@@ -380,11 +380,11 @@ var updateAppointmentSchema = z2.object({
   linkedFormIds: z2.union([z2.array(z2.string()), z2.any()]).optional(),
   pendingUserFormsIds: z2.union([z2.array(z2.string()), z2.any()]).optional(),
   appointmentStartTime: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Appointment start time must be a valid timestamp or Date object"
   ).optional(),
   appointmentEndTime: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Appointment end time must be a valid timestamp or Date object"
   ).optional(),
   calendarEventId: z2.string().min(MIN_STRING_LENGTH).optional(),
@@ -428,11 +428,11 @@ var searchAppointmentsSchema = z2.object({
   practitionerId: z2.string().optional(),
   clinicBranchId: z2.string().optional(),
   startDate: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "Start date must be a valid timestamp or Date object"
   ).optional(),
   endDate: z2.any().refine(
-    (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || typeof val === "number",
+    (val) => val === void 0 || 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",
     "End date must be a valid timestamp or Date object"
   ).optional(),
   status: z2.union([

package/package.json

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

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

@@ -1,8 +1,11 @@
 import * as admin from "firebase-admin";
 import { ClinicInfo } from "../../../types/profile"; // Corrected path
-import { PRACTITIONERS_COLLECTION } from "../../../types/practitioner"; // Corrected path
+import {
+  PRACTITIONERS_COLLECTION,
+  Practitioner,
+} from "../../../types/practitioner"; // Corrected path
 import { PROCEDURES_COLLECTION } from "../../../types/procedure"; // Added procedure collection
-import { CLINIC_GROUPS_COLLECTION } from "../../../types/clinic"; // Added clinic group collection
+import { CLINIC_GROUPS_COLLECTION, ClinicGroup } from "../../../types/clinic"; // Added clinic group collection
 import { ClinicLocation } from "../../../types/clinic"; // Added ClinicLocation type
 import { CALENDAR_COLLECTION } from "../../../types/calendar"; // Added calendar collection
 import { PATIENTS_COLLECTION } from "../../../types/patient"; // Added patient collection
@@ -103,16 +106,27 @@ export class ClinicAggregationService {
         .collection(PRACTITIONERS_COLLECTION)
         .doc(practitionerId);
 
-      // Remove old clinic info based on ID matcher
-      batch.update(practitionerRef, {
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
-      // Add updated clinic info
-      batch.update(practitionerRef, {
-        clinicsInfo: admin.firestore.FieldValue.arrayUnion(clinicInfo),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Remove old clinic info based on ID matcher and add updated info
+      // First, get the current practitioner data to filter clinicsInfo manually
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data() as Practitioner;
+        const currentClinicsInfo = practitionerData?.clinicsInfo || [];
+
+        // Filter out the clinic info with matching ID
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Add the updated clinic info to the filtered array
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+
+        // Update with the complete new array
+        batch.update(practitionerRef, {
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+      }
     }
 
     try {
@@ -194,7 +208,6 @@ export class ClinicAggregationService {
       return;
     }
 
-    const batch = this.db.batch();
     const clinicId = clinicInfo.id;
     const groupRef = this.db
       .collection(CLINIC_GROUPS_COLLECTION)
@@ -204,25 +217,38 @@ export class ClinicAggregationService {
       `[ClinicAggregationService] Starting update of ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
     );
 
-    // Remove old clinic info based on ID matcher
-    batch.update(groupRef, {
-      clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    });
-    // Add updated clinic info
-    batch.update(groupRef, {
-      clinicsInfo: admin.firestore.FieldValue.arrayUnion(clinicInfo),
-      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-    });
-
     try {
-      await batch.commit();
-      console.log(
-        `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
-      );
+      // Get current clinic group data to filter clinicsInfo manually
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data() as ClinicGroup;
+        const currentClinicsInfo = clinicGroupData?.clinicsInfo || [];
+
+        // Filter out the clinic info with matching ID
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Add the updated clinic info to the filtered array
+        const updatedClinicsInfo = [...filteredClinicsInfo, clinicInfo];
+
+        // Update with the complete new array
+        await groupRef.update({
+          clinicsInfo: updatedClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+
+        console.log(
+          `[ClinicAggregationService] Successfully updated ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot update clinic info.`
+        );
+      }
     } catch (error) {
       console.error(
-        `[ClinicAggregationService] Error committing update for ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
+        `[ClinicAggregationService] Error updating ClinicInfo (ID: ${clinicId}) in Clinic Group ${clinicGroupId}:`,
         error
       );
       throw error;
@@ -427,13 +453,28 @@ export class ClinicAggregationService {
         .collection(PRACTITIONERS_COLLECTION)
         .doc(practitionerId);
 
-      // Remove clinic ID from clinicIds array
-      batch.update(practitionerRef, {
-        clinicIds: admin.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Get current practitioner data to filter manually
+      const practitionerDoc = await practitionerRef.get();
+      if (practitionerDoc.exists) {
+        const practitionerData = practitionerDoc.data() as Practitioner;
+        const currentClinicIds = practitionerData?.clinics || [];
+        const currentClinicsInfo = practitionerData?.clinicsInfo || [];
+
+        // Filter out the clinic ID and clinic info with matching ID
+        const filteredClinicIds = currentClinicIds.filter(
+          (id: string) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
+
+        // Update with the filtered arrays
+        batch.update(practitionerRef, {
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+      }
     }
 
     try {
@@ -518,16 +559,36 @@ export class ClinicAggregationService {
     );
 
     try {
-      await groupRef.update({
-        clinicIds: admin.firestore.FieldValue.arrayRemove(clinicId),
-        // Remove all clinic info objects where id matches the clinic ID
-        clinicsInfo: admin.firestore.FieldValue.arrayRemove({ id: clinicId }),
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      // Get current clinic group data to filter manually
+      const clinicGroupDoc = await groupRef.get();
+      if (clinicGroupDoc.exists) {
+        const clinicGroupData = clinicGroupDoc.data() as ClinicGroup;
+        const currentClinicIds = clinicGroupData?.clinics || [];
+        const currentClinicsInfo = clinicGroupData?.clinicsInfo || [];
+
+        // Filter out the clinic ID and clinic info with matching ID
+        const filteredClinicIds = currentClinicIds.filter(
+          (id: string) => id !== clinicId
+        );
+        const filteredClinicsInfo = currentClinicsInfo.filter(
+          (clinic: any) => clinic.id !== clinicId
+        );
 
-      console.log(
-        `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
-      );
+        // Update with the filtered arrays
+        await groupRef.update({
+          clinics: filteredClinicIds,
+          clinicsInfo: filteredClinicsInfo,
+          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+        });
+
+        console.log(
+          `[ClinicAggregationService] Successfully removed Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}.`
+        );
+      } else {
+        console.warn(
+          `[ClinicAggregationService] Clinic Group ${clinicGroupId} not found. Cannot remove clinic.`
+        );
+      }
     } catch (error) {
       console.error(
         `[ClinicAggregationService] Error removing Clinic (ID: ${clinicId}) from Clinic Group ${clinicGroupId}:`,

package/src/validations/appointment.schema.ts

@@ -30,7 +30,10 @@ export const appointmentMediaItemSchema = z.object({
       (val) =>
         val instanceof Date ||
         val?._seconds !== undefined ||
-        typeof val === "number",
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
       "uploadedAt must be a valid timestamp or Date object"
     ),
   uploadedBy: z
@@ -80,7 +83,10 @@ export const linkedFormInfoSchema = z.object({
         val === undefined ||
         val instanceof Date ||
         val?._seconds !== undefined ||
-        typeof val === "number",
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
       "submittedAt must be a valid timestamp or Date object"
     )
     .optional(),
@@ -91,7 +97,10 @@ export const linkedFormInfoSchema = z.object({
         val === undefined ||
         val instanceof Date ||
         val?._seconds !== undefined ||
-        typeof val === "number",
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
       "completedAt must be a valid timestamp or Date object"
     )
     .optional(),
@@ -110,7 +119,10 @@ export const patientReviewInfoSchema = z.object({
       (val) =>
         val instanceof Date ||
         val?._seconds !== undefined ||
-        typeof val === "number",
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
       "reviewedAt must be a valid timestamp or Date object"
     ),
 });
@@ -123,7 +135,10 @@ export const finalizedDetailsSchema = z.object({
       (val) =>
         val instanceof Date ||
         val?._seconds !== undefined ||
-        typeof val === "number",
+        val?.seconds !== undefined ||
+        typeof val === "number" ||
+        typeof val === "string" ||
+        (val && typeof val.toMillis === "function"),
       "Finalized at must be a valid timestamp or Date object"
     ),
   notes: z
@@ -153,7 +168,10 @@ export const createAppointmentSchema = z
         (val) =>
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "Appointment start time must be a valid timestamp or Date object"
       ),
     appointmentEndTime: z
@@ -162,7 +180,10 @@ export const createAppointmentSchema = z
         (val) =>
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "Appointment end time must be a valid timestamp or Date object"
       ),
     cost: z.number().min(0, "Cost must be a non-negative number"),
@@ -228,7 +249,10 @@ export const updateAppointmentSchema = z
           val === undefined ||
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "Appointment start time must be a valid timestamp or Date object"
       )
       .optional(),
@@ -239,7 +263,10 @@ export const updateAppointmentSchema = z
           val === undefined ||
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "Appointment end time must be a valid timestamp or Date object"
       )
       .optional(),
@@ -311,7 +338,10 @@ export const searchAppointmentsSchema = z
           val === undefined ||
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "Start date must be a valid timestamp or Date object"
       )
       .optional(),
@@ -322,7 +352,10 @@ export const searchAppointmentsSchema = z
           val === undefined ||
           val instanceof Date ||
           val?._seconds !== undefined ||
-          typeof val === "number",
+          val?.seconds !== undefined ||
+          typeof val === "number" ||
+          typeof val === "string" ||
+          (val && typeof val.toMillis === "function"),
         "End date must be a valid timestamp or Date object"
       )
       .optional(),