@blackcode_sa/metaestetics-api 1.5.15 → 1.5.17

package/dist/index.mjs

@@ -57,9 +57,9 @@ import {
   confirmPasswordReset
 } from "firebase/auth";
 import {
-  collection as collection9,
-  query as query8,
-  getDocs as getDocs8
+  collection as collection10,
+  query as query9,
+  getDocs as getDocs9
 } from "firebase/firestore";
 
 // src/types/documentation-templates/index.ts
@@ -111,27 +111,27 @@ var FilledDocumentStatus = /* @__PURE__ */ ((FilledDocumentStatus2) => {
 })(FilledDocumentStatus || {});
 
 // src/types/calendar/index.ts
-var CalendarEventStatus = /* @__PURE__ */ ((CalendarEventStatus3) => {
-  CalendarEventStatus3["PENDING"] = "pending";
-  CalendarEventStatus3["CONFIRMED"] = "confirmed";
-  CalendarEventStatus3["REJECTED"] = "rejected";
-  CalendarEventStatus3["CANCELED"] = "canceled";
-  CalendarEventStatus3["RESCHEDULED"] = "rescheduled";
-  CalendarEventStatus3["COMPLETED"] = "completed";
-  return CalendarEventStatus3;
+var CalendarEventStatus = /* @__PURE__ */ ((CalendarEventStatus4) => {
+  CalendarEventStatus4["PENDING"] = "pending";
+  CalendarEventStatus4["CONFIRMED"] = "confirmed";
+  CalendarEventStatus4["REJECTED"] = "rejected";
+  CalendarEventStatus4["CANCELED"] = "canceled";
+  CalendarEventStatus4["RESCHEDULED"] = "rescheduled";
+  CalendarEventStatus4["COMPLETED"] = "completed";
+  return CalendarEventStatus4;
 })(CalendarEventStatus || {});
-var CalendarSyncStatus = /* @__PURE__ */ ((CalendarSyncStatus3) => {
-  CalendarSyncStatus3["INTERNAL"] = "internal";
-  CalendarSyncStatus3["EXTERNAL"] = "external";
-  return CalendarSyncStatus3;
+var CalendarSyncStatus = /* @__PURE__ */ ((CalendarSyncStatus4) => {
+  CalendarSyncStatus4["INTERNAL"] = "internal";
+  CalendarSyncStatus4["EXTERNAL"] = "external";
+  return CalendarSyncStatus4;
 })(CalendarSyncStatus || {});
-var CalendarEventType = /* @__PURE__ */ ((CalendarEventType2) => {
-  CalendarEventType2["APPOINTMENT"] = "appointment";
-  CalendarEventType2["BLOCKING"] = "blocking";
-  CalendarEventType2["BREAK"] = "break";
-  CalendarEventType2["FREE_DAY"] = "free_day";
-  CalendarEventType2["OTHER"] = "other";
-  return CalendarEventType2;
+var CalendarEventType = /* @__PURE__ */ ((CalendarEventType3) => {
+  CalendarEventType3["APPOINTMENT"] = "appointment";
+  CalendarEventType3["BLOCKING"] = "blocking";
+  CalendarEventType3["BREAK"] = "break";
+  CalendarEventType3["FREE_DAY"] = "free_day";
+  CalendarEventType3["OTHER"] = "other";
+  return CalendarEventType3;
 })(CalendarEventType || {});
 var CALENDAR_COLLECTION = "calendar";
 
@@ -577,12 +577,12 @@ var BaseService = class {
 
 // src/services/user.service.ts
 import {
-  collection as collection4,
+  collection as collection5,
   doc as doc6,
   getDoc as getDoc10,
-  getDocs as getDocs4,
-  query as query4,
-  where as where4,
+  getDocs as getDocs5,
+  query as query5,
+  where as where5,
   updateDoc as updateDoc9,
   deleteDoc as deleteDoc3,
   Timestamp as Timestamp9,
@@ -701,7 +701,11 @@ import {
   arrayRemove as arrayRemove2,
   serverTimestamp as serverTimestamp4,
   increment,
-  Timestamp as Timestamp3
+  Timestamp as Timestamp3,
+  collection as collection2,
+  query as query2,
+  where as where2,
+  getDocs as getDocs2
 } from "firebase/firestore";
 import {
   ref,
@@ -999,6 +1003,8 @@ var patientProfileSchema = z5.object({
   isVerified: z5.boolean(),
   doctors: z5.array(patientDoctorSchema),
   clinics: z5.array(patientClinicSchema),
+  doctorIds: z5.array(z5.string()),
+  clinicIds: z5.array(z5.string()),
   createdAt: z5.instanceof(Timestamp),
   updatedAt: z5.instanceof(Timestamp)
 });
@@ -1011,7 +1017,9 @@ var createPatientProfileSchema = z5.object({
   isActive: z5.boolean(),
   isVerified: z5.boolean(),
   doctors: z5.array(patientDoctorSchema).optional(),
-  clinics: z5.array(patientClinicSchema).optional()
+  clinics: z5.array(patientClinicSchema).optional(),
+  doctorIds: z5.array(z5.string()).optional(),
+  clinicIds: z5.array(z5.string()).optional()
 });
 var createPatientSensitiveInfoSchema = z5.object({
   patientId: z5.string(),
@@ -1027,6 +1035,33 @@ var createPatientSensitiveInfoSchema = z5.object({
   addressData: addressDataSchema.optional(),
   emergencyContacts: z5.array(emergencyContactSchema).optional()
 });
+var searchPatientsSchema = z5.object({
+  clinicId: z5.string().optional(),
+  practitionerId: z5.string().optional()
+}).refine((data) => data.clinicId || data.practitionerId, {
+  message: "At least one of clinicId or practitionerId must be provided",
+  path: []
+  // Optional: specify a path like ['clinicId'] or ['practitionerId']
+});
+var requesterInfoSchema = z5.object({
+  id: z5.string(),
+  role: z5.enum(["clinic_admin", "practitioner"]),
+  associatedClinicId: z5.string().optional(),
+  associatedPractitionerId: z5.string().optional()
+}).refine(
+  (data) => {
+    if (data.role === "clinic_admin") {
+      return !!data.associatedClinicId;
+    } else if (data.role === "practitioner") {
+      return !!data.associatedPractitionerId;
+    }
+    return false;
+  },
+  {
+    message: "Associated ID (clinic or practitioner) is required based on role",
+    path: ["associatedClinicId", "associatedPractitionerId"]
+  }
+);
 
 // src/services/patient/utils/docs.utils.ts
 import {
@@ -1310,9 +1345,9 @@ var addAllergyUtil = async (db, patientId, data, userRef) => {
 var updateAllergyUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateAllergySchema.parse(data);
   const { allergyIndex, ...updateData } = validatedData;
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (allergyIndex >= medicalInfo.allergies.length) {
     throw new Error("Invalid allergy index");
   }
@@ -1328,9 +1363,9 @@ var updateAllergyUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeAllergyUtil = async (db, patientId, allergyIndex, userRef) => {
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (allergyIndex >= medicalInfo.allergies.length) {
     throw new Error("Invalid allergy index");
   }
@@ -1355,9 +1390,9 @@ var addBlockingConditionUtil = async (db, patientId, data, userRef) => {
 var updateBlockingConditionUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateBlockingConditionSchema.parse(data);
   const { conditionIndex, ...updateData } = validatedData;
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (conditionIndex >= medicalInfo.blockingConditions.length) {
     throw new Error("Invalid blocking condition index");
   }
@@ -1373,9 +1408,9 @@ var updateBlockingConditionUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeBlockingConditionUtil = async (db, patientId, conditionIndex, userRef) => {
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (conditionIndex >= medicalInfo.blockingConditions.length) {
     throw new Error("Invalid blocking condition index");
   }
@@ -1400,9 +1435,9 @@ var addContraindicationUtil = async (db, patientId, data, userRef) => {
 var updateContraindicationUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateContraindicationSchema.parse(data);
   const { contraindicationIndex, ...updateData } = validatedData;
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (contraindicationIndex >= medicalInfo.contraindications.length) {
     throw new Error("Invalid contraindication index");
   }
@@ -1418,9 +1453,9 @@ var updateContraindicationUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeContraindicationUtil = async (db, patientId, contraindicationIndex, userRef) => {
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (contraindicationIndex >= medicalInfo.contraindications.length) {
     throw new Error("Invalid contraindication index");
   }
@@ -1445,9 +1480,9 @@ var addMedicationUtil = async (db, patientId, data, userRef) => {
 var updateMedicationUtil = async (db, patientId, data, userRef) => {
   const validatedData = updateMedicationSchema.parse(data);
   const { medicationIndex, ...updateData } = validatedData;
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (medicationIndex >= medicalInfo.currentMedications.length) {
     throw new Error("Invalid medication index");
   }
@@ -1463,9 +1498,9 @@ var updateMedicationUtil = async (db, patientId, data, userRef) => {
   });
 };
 var removeMedicationUtil = async (db, patientId, medicationIndex, userRef) => {
-  const doc26 = await getDoc3(getMedicalInfoDocRef(db, patientId));
-  if (!doc26.exists()) throw new Error("Medical info not found");
-  const medicalInfo = doc26.data();
+  const doc27 = await getDoc3(getMedicalInfoDocRef(db, patientId));
+  if (!doc27.exists()) throw new Error("Medical info not found");
+  const medicalInfo = doc27.data();
   if (medicationIndex >= medicalInfo.currentMedications.length) {
     throw new Error("Invalid medication index");
   }
@@ -1481,6 +1516,7 @@ var removeMedicationUtil = async (db, patientId, medicationIndex, userRef) => {
 
 // src/services/patient/utils/profile.utils.ts
 var createPatientProfileUtil = async (db, data, generateId2) => {
+  var _a, _b;
   try {
     console.log("[createPatientProfileUtil] Starting patient profile creation");
     const validatedData = createPatientProfileSchema.parse(data);
@@ -1500,6 +1536,8 @@ var createPatientProfileUtil = async (db, data, generateId2) => {
       isVerified: validatedData.isVerified,
       doctors: validatedData.doctors || [],
       clinics: validatedData.clinics || [],
+      doctorIds: ((_a = validatedData.doctors) == null ? void 0 : _a.map((d) => d.userRef)) || [],
+      clinicIds: ((_b = validatedData.clinics) == null ? void 0 : _b.map((c) => c.clinicId)) || [],
       createdAt: serverTimestamp4(),
       updatedAt: serverTimestamp4()
     };
@@ -1733,6 +1771,67 @@ var testCreateSubDocuments = async (db, patientId, userRef) => {
     throw error;
   }
 };
+var searchPatientsUtil = async (db, params, requester) => {
+  searchPatientsSchema.parse(params);
+  requesterInfoSchema.parse(requester);
+  const constraints = [];
+  const patientsCollectionRef = collection2(db, PATIENTS_COLLECTION);
+  if (requester.role === "clinic_admin") {
+    if (!requester.associatedClinicId) {
+      throw new Error(
+        "Associated clinic ID is required for clinic admin search."
+      );
+    }
+    if (params.clinicId && params.clinicId !== requester.associatedClinicId) {
+      console.warn(
+        `Clinic admin (${requester.id}) attempted to search outside their associated clinic (${requester.associatedClinicId})`
+      );
+      return [];
+    }
+    constraints.push(
+      where2("clinicIds", "array-contains", requester.associatedClinicId)
+    );
+    if (params.practitionerId) {
+      constraints.push(
+        where2("doctorIds", "array-contains", params.practitionerId)
+      );
+    }
+  } else if (requester.role === "practitioner") {
+    if (!requester.associatedPractitionerId) {
+      throw new Error(
+        "Associated practitioner ID is required for practitioner search."
+      );
+    }
+    if (params.practitionerId && params.practitionerId !== requester.associatedPractitionerId) {
+      console.warn(
+        `Practitioner (${requester.id}) attempted to search for patients of another practitioner (${params.practitionerId})`
+      );
+      return [];
+    }
+    constraints.push(
+      where2("doctorIds", "array-contains", requester.associatedPractitionerId)
+    );
+    if (params.clinicId) {
+      constraints.push(where2("clinicIds", "array-contains", params.clinicId));
+    }
+  } else {
+    throw new Error("Invalid requester role.");
+  }
+  try {
+    const finalQuery = query2(patientsCollectionRef, ...constraints);
+    const querySnapshot = await getDocs2(finalQuery);
+    const patients = querySnapshot.docs.map(
+      (doc27) => doc27.data()
+    );
+    console.log(
+      `[searchPatientsUtil] Found ${patients.length} patients matching criteria.`
+    );
+    return patients;
+  } catch (error) {
+    console.error("[searchPatientsUtil] Error searching patients:", error);
+    return [];
+  }
+};
 
 // src/services/patient/utils/location.utils.ts
 import {
@@ -1821,54 +1920,101 @@ import {
   getDoc as getDoc6,
   updateDoc as updateDoc5,
   arrayUnion as arrayUnion3,
+  arrayRemove as arrayRemove3,
   serverTimestamp as serverTimestamp6,
   Timestamp as Timestamp4
 } from "firebase/firestore";
 var addDoctorUtil = async (db, patientId, doctorRef, assignedBy) => {
+  var _a;
   const newDoctor = {
     userRef: doctorRef,
     assignedAt: Timestamp4.now(),
     assignedBy,
     isActive: true
   };
-  await updateDoc5(getPatientDocRef(db, patientId), {
-    doctors: arrayUnion3(newDoctor),
-    updatedAt: serverTimestamp6()
-  });
-};
-var removeDoctorUtil = async (db, patientId, doctorRef) => {
   const patientDoc = await getDoc6(getPatientDocRef(db, patientId));
   if (!patientDoc.exists()) throw new Error("Patient profile not found");
   const patientData = patientDoc.data();
-  const updatedDoctors = patientData.doctors.map(
-    (doctor) => doctor.userRef === doctorRef ? { ...doctor, isActive: false } : doctor
+  const existingDoctorIndex = (_a = patientData.doctors) == null ? void 0 : _a.findIndex(
+    (d) => d.userRef === doctorRef
   );
-  await updateDoc5(getPatientDocRef(db, patientId), {
+  const updates = {
+    updatedAt: serverTimestamp6(),
+    doctorIds: arrayUnion3(doctorRef)
+  };
+  if (existingDoctorIndex !== void 0 && existingDoctorIndex > -1) {
+    const updatedDoctors = [...patientData.doctors];
+    updatedDoctors[existingDoctorIndex] = {
+      ...updatedDoctors[existingDoctorIndex],
+      isActive: true,
+      assignedAt: Timestamp4.now(),
+      assignedBy
+    };
+    updates.doctors = updatedDoctors;
+  } else {
+    updates.doctors = arrayUnion3(newDoctor);
+  }
+  await updateDoc5(getPatientDocRef(db, patientId), updates);
+};
+var removeDoctorUtil = async (db, patientId, doctorRef) => {
+  var _a;
+  const patientDocRef = getPatientDocRef(db, patientId);
+  const patientDoc = await getDoc6(patientDocRef);
+  if (!patientDoc.exists()) throw new Error("Patient profile not found");
+  const patientData = patientDoc.data();
+  const updatedDoctors = ((_a = patientData.doctors) == null ? void 0 : _a.filter((doctor) => doctor.userRef !== doctorRef)) || [];
+  await updateDoc5(patientDocRef, {
     doctors: updatedDoctors,
+    // Set the filtered array
+    doctorIds: arrayRemove3(doctorRef),
+    // Remove ID from the denormalized list
     updatedAt: serverTimestamp6()
   });
 };
 var addClinicUtil = async (db, patientId, clinicId, assignedBy) => {
+  var _a;
   const newClinic = {
     clinicId,
     assignedAt: Timestamp4.now(),
     assignedBy,
     isActive: true
   };
-  await updateDoc5(getPatientDocRef(db, patientId), {
-    clinics: arrayUnion3(newClinic),
-    updatedAt: serverTimestamp6()
-  });
-};
-var removeClinicUtil = async (db, patientId, clinicId) => {
   const patientDoc = await getDoc6(getPatientDocRef(db, patientId));
   if (!patientDoc.exists()) throw new Error("Patient profile not found");
   const patientData = patientDoc.data();
-  const updatedClinics = patientData.clinics.map(
-    (clinic) => clinic.clinicId === clinicId ? { ...clinic, isActive: false } : clinic
+  const existingClinicIndex = (_a = patientData.clinics) == null ? void 0 : _a.findIndex(
+    (c) => c.clinicId === clinicId
   );
-  await updateDoc5(getPatientDocRef(db, patientId), {
+  const updates = {
+    updatedAt: serverTimestamp6(),
+    clinicIds: arrayUnion3(clinicId)
+  };
+  if (existingClinicIndex !== void 0 && existingClinicIndex > -1) {
+    const updatedClinics = [...patientData.clinics];
+    updatedClinics[existingClinicIndex] = {
+      ...updatedClinics[existingClinicIndex],
+      isActive: true,
+      assignedAt: Timestamp4.now(),
+      assignedBy
+    };
+    updates.clinics = updatedClinics;
+  } else {
+    updates.clinics = arrayUnion3(newClinic);
+  }
+  await updateDoc5(getPatientDocRef(db, patientId), updates);
+};
+var removeClinicUtil = async (db, patientId, clinicId) => {
+  var _a;
+  const patientDocRef = getPatientDocRef(db, patientId);
+  const patientDoc = await getDoc6(patientDocRef);
+  if (!patientDoc.exists()) throw new Error("Patient profile not found");
+  const patientData = patientDoc.data();
+  const updatedClinics = ((_a = patientData.clinics) == null ? void 0 : _a.filter((clinic) => clinic.clinicId !== clinicId)) || [];
+  await updateDoc5(patientDocRef, {
     clinics: updatedClinics,
+    // Set the filtered array
+    clinicIds: arrayRemove3(clinicId),
+    // Remove ID from the denormalized list
     updatedAt: serverTimestamp6()
   });
 };
@@ -2109,16 +2255,33 @@ var PatientService = class extends BaseService {
   async updatePatientProfileByUserRef(userRef, data) {
     return updatePatientProfileByUserRefUtil(this.db, userRef, data);
   }
+  /**
+   * Searches for patient profiles based on clinic/practitioner association.
+   * Requires information about the requester for security checks.
+   *
+   * @param {SearchPatientsParams} params - The search criteria (clinicId, practitionerId).
+   * @param {RequesterInfo} requester - Information about the user performing the search (ID, role, associated IDs).
+   * @returns {Promise<PatientProfile[]>} A promise resolving to an array of matching patient profiles.
+   */
+  async searchPatients(params, requester) {
+    console.log(
+      `[PatientService.searchPatients] Initiating search with params:`,
+      params,
+      `by requester:`,
+      requester
+    );
+    return searchPatientsUtil(this.db, params, requester);
+  }
 };
 
 // src/services/clinic/utils/admin.utils.ts
 import {
-  collection as collection2,
+  collection as collection3,
   doc as doc4,
   getDoc as getDoc8,
-  getDocs as getDocs2,
-  query as query2,
-  where as where2,
+  getDocs as getDocs3,
+  query as query3,
+  where as where3,
   updateDoc as updateDoc7,
   setDoc as setDoc6,
   deleteDoc,
@@ -2410,6 +2573,7 @@ var clinicAdminSchema = z9.object({
 var adminTokenSchema = z9.object({
   id: z9.string(),
   token: z9.string(),
+  email: z9.string().email().optional().nullable(),
   status: z9.nativeEnum(AdminTokenStatus),
   usedByUserRef: z9.string().optional(),
   createdAt: z9.instanceof(Date).or(z9.instanceof(Timestamp5)),
@@ -2418,7 +2582,8 @@ var adminTokenSchema = z9.object({
   // Timestamp
 });
 var createAdminTokenSchema = z9.object({
-  expiresInDays: z9.number().min(1).max(30).optional()
+  expiresInDays: z9.number().min(1).max(30).optional(),
+  email: z9.string().email().optional().nullable()
 });
 var clinicGroupSchema = z9.object({
   id: z9.string(),
@@ -2674,7 +2839,7 @@ async function createClinicAdmin(db, data, clinicGroupService) {
   }
   console.log("[CLINIC_ADMIN] Preparing admin data object");
   const adminData = {
-    id: doc4(collection2(db, CLINIC_ADMINS_COLLECTION)).id,
+    id: doc4(collection3(db, CLINIC_ADMINS_COLLECTION)).id,
     // Generate a new ID for the admin document
     userRef: validatedData.userRef,
     clinicGroupId: clinicGroupId || "",
@@ -2766,23 +2931,23 @@ async function getClinicAdmin(db, adminId) {
   return null;
 }
 async function getClinicAdminByUserRef(db, userRef) {
-  const q = query2(
-    collection2(db, CLINIC_ADMINS_COLLECTION),
-    where2("userRef", "==", userRef)
+  const q = query3(
+    collection3(db, CLINIC_ADMINS_COLLECTION),
+    where3("userRef", "==", userRef)
   );
-  const querySnapshot = await getDocs2(q);
+  const querySnapshot = await getDocs3(q);
   if (querySnapshot.empty) {
     return null;
   }
   return querySnapshot.docs[0].data();
 }
 async function getClinicAdminsByGroup(db, clinicGroupId) {
-  const q = query2(
-    collection2(db, CLINIC_ADMINS_COLLECTION),
-    where2("clinicGroupId", "==", clinicGroupId)
+  const q = query3(
+    collection3(db, CLINIC_ADMINS_COLLECTION),
+    where3("clinicGroupId", "==", clinicGroupId)
   );
-  const querySnapshot = await getDocs2(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const querySnapshot = await getDocs3(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function updateClinicAdmin(db, adminId, data) {
   const admin = await getClinicAdmin(db, adminId);
@@ -3047,12 +3212,12 @@ var ClinicAdminService = class extends BaseService {
 
 // src/services/practitioner/practitioner.service.ts
 import {
-  collection as collection3,
+  collection as collection4,
   doc as doc5,
   getDoc as getDoc9,
-  getDocs as getDocs3,
-  query as query3,
-  where as where3,
+  getDocs as getDocs4,
+  query as query4,
+  where as where4,
   updateDoc as updateDoc8,
   setDoc as setDoc7,
   deleteDoc as deleteDoc2,
@@ -3439,17 +3604,17 @@ var PractitionerService = class extends BaseService {
    * @returns Array of active tokens
    */
   async getPractitionerActiveTokens(practitionerId) {
-    const tokensRef = collection3(
+    const tokensRef = collection4(
       this.db,
       `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
     );
-    const q = query3(
+    const q = query4(
       tokensRef,
-      where3("status", "==", "active" /* ACTIVE */),
-      where3("expiresAt", ">", Timestamp8.now())
+      where4("status", "==", "active" /* ACTIVE */),
+      where4("expiresAt", ">", Timestamp8.now())
     );
-    const querySnapshot = await getDocs3(q);
-    return querySnapshot.docs.map((doc26) => doc26.data());
+    const querySnapshot = await getDocs4(q);
+    return querySnapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Gets a token by its string value and validates it
@@ -3457,21 +3622,21 @@ var PractitionerService = class extends BaseService {
    * @returns The token if found and valid, null otherwise
    */
   async validateToken(tokenString) {
-    const practitionersRef = collection3(this.db, PRACTITIONERS_COLLECTION);
-    const practitionersSnapshot = await getDocs3(practitionersRef);
+    const practitionersRef = collection4(this.db, PRACTITIONERS_COLLECTION);
+    const practitionersSnapshot = await getDocs4(practitionersRef);
     for (const practitionerDoc of practitionersSnapshot.docs) {
       const practitionerId = practitionerDoc.id;
-      const tokensRef = collection3(
+      const tokensRef = collection4(
         this.db,
         `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
       );
-      const q = query3(
+      const q = query4(
         tokensRef,
-        where3("token", "==", tokenString),
-        where3("status", "==", "active" /* ACTIVE */),
-        where3("expiresAt", ">", Timestamp8.now())
+        where4("token", "==", tokenString),
+        where4("status", "==", "active" /* ACTIVE */),
+        where4("expiresAt", ">", Timestamp8.now())
       );
-      const tokenSnapshot = await getDocs3(q);
+      const tokenSnapshot = await getDocs4(q);
       if (!tokenSnapshot.empty) {
         return tokenSnapshot.docs[0].data();
       }
@@ -3511,11 +3676,11 @@ var PractitionerService = class extends BaseService {
    * Dohvata zdravstvenog radnika po User ID-u
    */
   async getPractitionerByUserRef(userRef) {
-    const q = query3(
-      collection3(this.db, PRACTITIONERS_COLLECTION),
-      where3("userRef", "==", userRef)
+    const q = query4(
+      collection4(this.db, PRACTITIONERS_COLLECTION),
+      where4("userRef", "==", userRef)
     );
-    const querySnapshot = await getDocs3(q);
+    const querySnapshot = await getDocs4(q);
     if (querySnapshot.empty) {
       return null;
     }
@@ -3525,38 +3690,38 @@ var PractitionerService = class extends BaseService {
    * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
    */
   async getPractitionersByClinic(clinicId) {
-    const q = query3(
-      collection3(this.db, PRACTITIONERS_COLLECTION),
-      where3("clinics", "array-contains", clinicId),
-      where3("isActive", "==", true),
-      where3("status", "==", "active" /* ACTIVE */)
+    const q = query4(
+      collection4(this.db, PRACTITIONERS_COLLECTION),
+      where4("clinics", "array-contains", clinicId),
+      where4("isActive", "==", true),
+      where4("status", "==", "active" /* ACTIVE */)
     );
-    const querySnapshot = await getDocs3(q);
-    return querySnapshot.docs.map((doc26) => doc26.data());
+    const querySnapshot = await getDocs4(q);
+    return querySnapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Dohvata sve zdravstvene radnike za određenu kliniku
    */
   async getAllPractitionersByClinic(clinicId) {
-    const q = query3(
-      collection3(this.db, PRACTITIONERS_COLLECTION),
-      where3("clinics", "array-contains", clinicId),
-      where3("isActive", "==", true)
+    const q = query4(
+      collection4(this.db, PRACTITIONERS_COLLECTION),
+      where4("clinics", "array-contains", clinicId),
+      where4("isActive", "==", true)
     );
-    const querySnapshot = await getDocs3(q);
-    return querySnapshot.docs.map((doc26) => doc26.data());
+    const querySnapshot = await getDocs4(q);
+    return querySnapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Dohvata sve draft zdravstvene radnike za određenu kliniku sa statusom DRAFT
    */
   async getDraftPractitionersByClinic(clinicId) {
-    const q = query3(
-      collection3(this.db, PRACTITIONERS_COLLECTION),
-      where3("clinics", "array-contains", clinicId),
-      where3("status", "==", "draft" /* DRAFT */)
+    const q = query4(
+      collection4(this.db, PRACTITIONERS_COLLECTION),
+      where4("clinics", "array-contains", clinicId),
+      where4("status", "==", "draft" /* DRAFT */)
     );
-    const querySnapshot = await getDocs3(q);
-    return querySnapshot.docs.map((doc26) => doc26.data());
+    const querySnapshot = await getDocs4(q);
+    return querySnapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Ažurira profil zdravstvenog radnika
@@ -3852,20 +4017,20 @@ var UserService = class extends BaseService {
    * Dohvata korisnika po email-u
    */
   async getUserByEmail(email) {
-    const usersRef = collection4(this.db, USERS_COLLECTION);
-    const q = query4(usersRef, where4("email", "==", email));
-    const querySnapshot = await getDocs4(q);
+    const usersRef = collection5(this.db, USERS_COLLECTION);
+    const q = query5(usersRef, where5("email", "==", email));
+    const querySnapshot = await getDocs5(q);
     if (querySnapshot.empty) return null;
     const userData = querySnapshot.docs[0].data();
     return userSchema.parse(userData);
   }
   async getUsersByRole(role) {
     const constraints = [
-      where4("roles", "array-contains", role)
+      where5("roles", "array-contains", role)
     ];
-    const q = query4(collection4(this.db, USERS_COLLECTION), ...constraints);
-    const querySnapshot = await getDocs4(q);
-    const users = querySnapshot.docs.map((doc26) => doc26.data());
+    const q = query5(collection5(this.db, USERS_COLLECTION), ...constraints);
+    const querySnapshot = await getDocs5(q);
+    const users = querySnapshot.docs.map((doc27) => doc27.data());
     return Promise.all(users.map((userData) => userSchema.parse(userData)));
   }
   /**
@@ -4002,12 +4167,12 @@ var UserService = class extends BaseService {
 
 // src/services/clinic/utils/clinic-group.utils.ts
 import {
-  collection as collection5,
+  collection as collection6,
   doc as doc7,
   getDoc as getDoc11,
-  getDocs as getDocs5,
-  query as query5,
-  where as where5,
+  getDocs as getDocs6,
+  query as query6,
+  where as where6,
   updateDoc as updateDoc10,
   setDoc as setDoc9,
   Timestamp as Timestamp10
@@ -4136,7 +4301,7 @@ async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdm
   }
   const now = Timestamp10.now();
   console.log("[CLINIC_GROUP] Preparing clinic group data object");
-  const groupId = doc7(collection5(db, CLINIC_GROUPS_COLLECTION)).id;
+  const groupId = doc7(collection6(db, CLINIC_GROUPS_COLLECTION)).id;
   console.log("[CLINIC_GROUP] Logo value:", {
     logoValue: validatedData.logo,
     logoType: validatedData.logo === null ? "null" : typeof validatedData.logo
@@ -4240,12 +4405,12 @@ async function getClinicGroup(db, groupId) {
   return null;
 }
 async function getAllActiveGroups(db) {
-  const q = query5(
-    collection5(db, CLINIC_GROUPS_COLLECTION),
-    where5("isActive", "==", true)
+  const q = query6(
+    collection6(db, CLINIC_GROUPS_COLLECTION),
+    where6("isActive", "==", true)
   );
-  const querySnapshot = await getDocs5(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const querySnapshot = await getDocs6(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function updateClinicGroup(db, groupId, data, app) {
   console.log("[CLINIC_GROUP] Updating clinic group", { groupId });
@@ -4359,6 +4524,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   }
   const now = Timestamp10.now();
   const expiresInDays = (data == null ? void 0 : data.expiresInDays) || 7;
+  const email = (data == null ? void 0 : data.email) || null;
   const expiresAt = new Timestamp10(
     now.seconds + expiresInDays * 24 * 60 * 60,
     now.nanoseconds
@@ -4367,6 +4533,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
     id: generateId(),
     token: generateId(),
     status: "active" /* ACTIVE */,
+    email,
     createdAt: now,
     expiresAt
   };
@@ -4619,12 +4786,12 @@ var ClinicGroupService = class extends BaseService {
 
 // src/services/clinic/utils/clinic.utils.ts
 import {
-  collection as collection6,
+  collection as collection7,
   doc as doc8,
   getDoc as getDoc12,
-  getDocs as getDocs6,
-  query as query6,
-  where as where6,
+  getDocs as getDocs7,
+  query as query7,
+  where as where7,
   updateDoc as updateDoc11,
   setDoc as setDoc10,
   Timestamp as Timestamp11
@@ -4693,7 +4860,7 @@ async function createClinic(db, data, creatorAdminId, clinicGroupService, clinic
       throw geohashError;
     }
   }
-  const clinicId = doc8(collection6(db, CLINICS_COLLECTION)).id;
+  const clinicId = doc8(collection7(db, CLINICS_COLLECTION)).id;
   console.log("[CLINIC] Generated clinic ID:", clinicId);
   console.log("[CLINIC] Processing photos");
   let logoUrl = null;
@@ -4909,13 +5076,13 @@ async function getClinic(db, clinicId) {
   return null;
 }
 async function getClinicsByGroup(db, groupId) {
-  const q = query6(
-    collection6(db, CLINICS_COLLECTION),
-    where6("clinicGroupId", "==", groupId),
-    where6("isActive", "==", true)
+  const q = query7(
+    collection7(db, CLINICS_COLLECTION),
+    where7("clinicGroupId", "==", groupId),
+    where7("isActive", "==", true)
   );
-  const querySnapshot = await getDocs6(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const querySnapshot = await getDocs7(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function updateClinic(db, clinicId, data, adminId, clinicAdminService, app) {
   console.log("[CLINIC] Starting clinic update", { clinicId, adminId });
@@ -5121,13 +5288,13 @@ async function getClinicsByAdmin(db, adminId, options = {}, clinicAdminService,
   if (clinicIds.length === 0) {
     return [];
   }
-  const constraints = [where6("id", "in", clinicIds)];
+  const constraints = [where7("id", "in", clinicIds)];
   if (options.isActive !== void 0) {
-    constraints.push(where6("isActive", "==", options.isActive));
+    constraints.push(where7("isActive", "==", options.isActive));
   }
-  const q = query6(collection6(db, CLINICS_COLLECTION), ...constraints);
-  const querySnapshot = await getDocs6(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const q = query7(collection7(db, CLINICS_COLLECTION), ...constraints);
+  const querySnapshot = await getDocs7(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function getActiveClinicsByAdmin(db, adminId, clinicAdminService, clinicGroupService) {
   return getClinicsByAdmin(
@@ -5141,7 +5308,7 @@ async function getActiveClinicsByAdmin(db, adminId, clinicAdminService, clinicGr
 
 // src/services/clinic/utils/review.utils.ts
 import {
-  collection as collection7,
+  collection as collection8,
   doc as doc9,
   Timestamp as Timestamp12,
   getDoc as getDoc13,
@@ -5157,14 +5324,14 @@ async function addReview(db, clinicId, review, app) {
   const now = Timestamp12.now();
   const reviewData = {
     ...review,
-    id: doc9(collection7(db, "clinic_reviews")).id,
+    id: doc9(collection8(db, "clinic_reviews")).id,
     clinicId,
     createdAt: now,
     updatedAt: now,
     isVerified: false
   };
   clinicReviewSchema.parse(reviewData);
-  await addDoc2(collection7(db, "clinic_reviews"), reviewData);
+  await addDoc2(collection8(db, "clinic_reviews"), reviewData);
   const newRating = clinic.rating ? {
     average: (clinic.rating.average * clinic.rating.count + review.rating) / (clinic.rating.count + 1),
     count: clinic.rating.count + 1
@@ -5252,10 +5419,10 @@ async function removeTags(db, clinicId, adminId, tagsToRemove, clinicAdminServic
 
 // src/services/clinic/utils/search.utils.ts
 import {
-  collection as collection8,
-  query as query7,
-  where as where7,
-  getDocs as getDocs7
+  collection as collection9,
+  query as query8,
+  where as where8,
+  getDocs as getDocs8
 } from "firebase/firestore";
 import { geohashQueryBounds, distanceBetween } from "geofire-common";
 async function findClinicsInRadius(db, center, radiusInKm, filters) {
@@ -5266,22 +5433,22 @@ async function findClinicsInRadius(db, center, radiusInKm, filters) {
   const matchingDocs = [];
   for (const b of bounds) {
     const constraints = [
-      where7("location.geohash", ">=", b[0]),
-      where7("location.geohash", "<=", b[1]),
-      where7("isActive", "==", true)
+      where8("location.geohash", ">=", b[0]),
+      where8("location.geohash", "<=", b[1]),
+      where8("isActive", "==", true)
     ];
     if (filters == null ? void 0 : filters.services) {
       constraints.push(
-        where7("services", "array-contains-any", filters.services)
+        where8("services", "array-contains-any", filters.services)
       );
     }
     if ((filters == null ? void 0 : filters.tags) && filters.tags.length > 0) {
-      constraints.push(where7("tags", "array-contains-any", filters.tags));
+      constraints.push(where8("tags", "array-contains-any", filters.tags));
     }
-    const q = query7(collection8(db, CLINICS_COLLECTION), ...constraints);
-    const querySnapshot = await getDocs7(q);
-    for (const doc26 of querySnapshot.docs) {
-      const clinic = doc26.data();
+    const q = query8(collection9(db, CLINICS_COLLECTION), ...constraints);
+    const querySnapshot = await getDocs8(q);
+    for (const doc27 of querySnapshot.docs) {
+      const clinic = doc27.data();
       const distance = distanceBetween(
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
@@ -5695,9 +5862,9 @@ var AuthService = class extends BaseService {
           token: data.inviteToken
         });
         console.log("[AUTH] Searching for token in clinic groups");
-        const groupsRef = collection9(this.db, CLINIC_GROUPS_COLLECTION);
-        const q = query8(groupsRef);
-        const querySnapshot = await getDocs8(q);
+        const groupsRef = collection10(this.db, CLINIC_GROUPS_COLLECTION);
+        const q = query9(groupsRef);
+        const querySnapshot = await getDocs9(q);
         let foundGroup = null;
         let foundToken = null;
         console.log(
@@ -6144,12 +6311,12 @@ var AuthService = class extends BaseService {
 
 // src/services/notifications/notification.service.ts
 import {
-  collection as collection10,
+  collection as collection11,
   doc as doc11,
   getDoc as getDoc15,
-  getDocs as getDocs9,
-  query as query9,
-  where as where9,
+  getDocs as getDocs10,
+  query as query10,
+  where as where10,
   updateDoc as updateDoc13,
   deleteDoc as deleteDoc6,
   orderBy,
@@ -6182,7 +6349,7 @@ var NotificationService = class extends BaseService {
    * Kreira novu notifikaciju
    */
   async createNotification(notification) {
-    const notificationsRef = collection10(this.db, NOTIFICATIONS_COLLECTION);
+    const notificationsRef = collection11(this.db, NOTIFICATIONS_COLLECTION);
     const now = Timestamp14.now();
     const notificationData = {
       ...notification,
@@ -6220,31 +6387,31 @@ var NotificationService = class extends BaseService {
    * Dohvata sve notifikacije za korisnika
    */
   async getUserNotifications(userId) {
-    const q = query9(
-      collection10(this.db, NOTIFICATIONS_COLLECTION),
-      where9("userId", "==", userId),
+    const q = query10(
+      collection11(this.db, NOTIFICATIONS_COLLECTION),
+      where10("userId", "==", userId),
       orderBy("notificationTime", "desc")
     );
-    const querySnapshot = await getDocs9(q);
-    return querySnapshot.docs.map((doc26) => ({
-      id: doc26.id,
-      ...doc26.data()
+    const querySnapshot = await getDocs10(q);
+    return querySnapshot.docs.map((doc27) => ({
+      id: doc27.id,
+      ...doc27.data()
     }));
   }
   /**
    * Dohvata nepročitane notifikacije za korisnika
    */
   async getUnreadNotifications(userId) {
-    const q = query9(
-      collection10(this.db, NOTIFICATIONS_COLLECTION),
-      where9("userId", "==", userId),
-      where9("isRead", "==", false),
+    const q = query10(
+      collection11(this.db, NOTIFICATIONS_COLLECTION),
+      where10("userId", "==", userId),
+      where10("isRead", "==", false),
       orderBy("notificationTime", "desc")
     );
-    const querySnapshot = await getDocs9(q);
-    return querySnapshot.docs.map((doc26) => ({
-      id: doc26.id,
-      ...doc26.data()
+    const querySnapshot = await getDocs10(q);
+    return querySnapshot.docs.map((doc27) => ({
+      id: doc27.id,
+      ...doc27.data()
     }));
   }
   /**
@@ -6309,43 +6476,43 @@ var NotificationService = class extends BaseService {
    * Dohvata notifikacije po tipu
    */
   async getNotificationsByType(userId, type) {
-    const q = query9(
-      collection10(this.db, NOTIFICATIONS_COLLECTION),
-      where9("userId", "==", userId),
-      where9("notificationType", "==", type),
+    const q = query10(
+      collection11(this.db, NOTIFICATIONS_COLLECTION),
+      where10("userId", "==", userId),
+      where10("notificationType", "==", type),
       orderBy("notificationTime", "desc")
     );
-    const querySnapshot = await getDocs9(q);
-    return querySnapshot.docs.map((doc26) => ({
-      id: doc26.id,
-      ...doc26.data()
+    const querySnapshot = await getDocs10(q);
+    return querySnapshot.docs.map((doc27) => ({
+      id: doc27.id,
+      ...doc27.data()
     }));
   }
   /**
    * Dohvata notifikacije za određeni termin
    */
   async getAppointmentNotifications(appointmentId) {
-    const q = query9(
-      collection10(this.db, NOTIFICATIONS_COLLECTION),
-      where9("appointmentId", "==", appointmentId),
+    const q = query10(
+      collection11(this.db, NOTIFICATIONS_COLLECTION),
+      where10("appointmentId", "==", appointmentId),
       orderBy("notificationTime", "desc")
     );
-    const querySnapshot = await getDocs9(q);
-    return querySnapshot.docs.map((doc26) => ({
-      id: doc26.id,
-      ...doc26.data()
+    const querySnapshot = await getDocs10(q);
+    return querySnapshot.docs.map((doc27) => ({
+      id: doc27.id,
+      ...doc27.data()
     }));
   }
 };
 
 // src/services/procedure/procedure.service.ts
 import {
-  collection as collection11,
+  collection as collection12,
   doc as doc12,
   getDoc as getDoc16,
-  getDocs as getDocs10,
-  query as query10,
-  where as where10,
+  getDocs as getDocs11,
+  query as query11,
+  where as where11,
   updateDoc as updateDoc14,
   setDoc as setDoc13,
   serverTimestamp as serverTimestamp13
@@ -6485,13 +6652,13 @@ var ProcedureService = class extends BaseService {
    * @returns List of procedures
    */
   async getProceduresByClinicBranch(clinicBranchId) {
-    const q = query10(
-      collection11(this.db, PROCEDURES_COLLECTION),
-      where10("clinicBranchId", "==", clinicBranchId),
-      where10("isActive", "==", true)
+    const q = query11(
+      collection12(this.db, PROCEDURES_COLLECTION),
+      where11("clinicBranchId", "==", clinicBranchId),
+      where11("isActive", "==", true)
     );
-    const snapshot = await getDocs10(q);
-    return snapshot.docs.map((doc26) => doc26.data());
+    const snapshot = await getDocs11(q);
+    return snapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Gets all procedures for a practitioner
@@ -6499,13 +6666,13 @@ var ProcedureService = class extends BaseService {
    * @returns List of procedures
    */
   async getProceduresByPractitioner(practitionerId) {
-    const q = query10(
-      collection11(this.db, PROCEDURES_COLLECTION),
-      where10("practitionerId", "==", practitionerId),
-      where10("isActive", "==", true)
+    const q = query11(
+      collection12(this.db, PROCEDURES_COLLECTION),
+      where11("practitionerId", "==", practitionerId),
+      where11("isActive", "==", true)
     );
-    const snapshot = await getDocs10(q);
-    return snapshot.docs.map((doc26) => doc26.data());
+    const snapshot = await getDocs11(q);
+    return snapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Updates a procedure
@@ -6575,15 +6742,15 @@ var ProcedureService = class extends BaseService {
 
 // src/services/documentation-templates/documentation-template.service.ts
 import {
-  collection as collection12,
+  collection as collection13,
   doc as doc13,
   getDoc as getDoc17,
-  getDocs as getDocs11,
+  getDocs as getDocs12,
   setDoc as setDoc14,
   updateDoc as updateDoc15,
   deleteDoc as deleteDoc8,
-  query as query11,
-  where as where11,
+  query as query12,
+  where as where12,
   orderBy as orderBy2,
   limit,
   startAfter
@@ -6591,7 +6758,7 @@ import {
 var DocumentationTemplateService = class extends BaseService {
   constructor() {
     super(...arguments);
-    this.collectionRef = collection12(
+    this.collectionRef = collection13(
       this.db,
       DOCUMENTATION_TEMPLATES_COLLECTION
     );
@@ -6686,21 +6853,21 @@ var DocumentationTemplateService = class extends BaseService {
    * @returns Array of templates and the last document for pagination
    */
   async getActiveTemplates(pageSize = 20, lastDoc) {
-    let q = query11(
+    let q = query12(
       this.collectionRef,
-      where11("isActive", "==", true),
+      where12("isActive", "==", true),
       orderBy2("updatedAt", "desc"),
       limit(pageSize)
     );
     if (lastDoc) {
-      q = query11(q, startAfter(lastDoc));
+      q = query12(q, startAfter(lastDoc));
     }
-    const querySnapshot = await getDocs11(q);
+    const querySnapshot = await getDocs12(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      templates.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      templates.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       templates,
@@ -6715,22 +6882,22 @@ var DocumentationTemplateService = class extends BaseService {
    * @returns Array of templates and the last document for pagination
    */
   async getTemplatesByTags(tags, pageSize = 20, lastDoc) {
-    let q = query11(
+    let q = query12(
       this.collectionRef,
-      where11("isActive", "==", true),
-      where11("tags", "array-contains-any", tags),
+      where12("isActive", "==", true),
+      where12("tags", "array-contains-any", tags),
       orderBy2("updatedAt", "desc"),
       limit(pageSize)
     );
     if (lastDoc) {
-      q = query11(q, startAfter(lastDoc));
+      q = query12(q, startAfter(lastDoc));
     }
-    const querySnapshot = await getDocs11(q);
+    const querySnapshot = await getDocs12(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      templates.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      templates.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       templates,
@@ -6745,21 +6912,21 @@ var DocumentationTemplateService = class extends BaseService {
    * @returns Array of templates and the last document for pagination
    */
   async getTemplatesByCreator(userId, pageSize = 20, lastDoc) {
-    let q = query11(
+    let q = query12(
       this.collectionRef,
-      where11("createdBy", "==", userId),
+      where12("createdBy", "==", userId),
       orderBy2("updatedAt", "desc"),
       limit(pageSize)
     );
     if (lastDoc) {
-      q = query11(q, startAfter(lastDoc));
+      q = query12(q, startAfter(lastDoc));
     }
-    const querySnapshot = await getDocs11(q);
+    const querySnapshot = await getDocs12(q);
     const templates = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      templates.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      templates.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       templates,
@@ -6770,14 +6937,14 @@ var DocumentationTemplateService = class extends BaseService {
 
 // src/services/documentation-templates/filled-document.service.ts
 import {
-  collection as collection13,
+  collection as collection14,
   doc as doc14,
   getDoc as getDoc18,
-  getDocs as getDocs12,
+  getDocs as getDocs13,
   setDoc as setDoc15,
   updateDoc as updateDoc16,
-  query as query12,
-  where as where12,
+  query as query13,
+  where as where13,
   orderBy as orderBy3,
   limit as limit2,
   startAfter as startAfter2
@@ -6785,7 +6952,7 @@ import {
 var FilledDocumentService = class extends BaseService {
   constructor(...args) {
     super(...args);
-    this.collectionRef = collection13(
+    this.collectionRef = collection14(
       this.db,
       FILLED_DOCUMENTS_COLLECTION
     );
@@ -6872,21 +7039,21 @@ var FilledDocumentService = class extends BaseService {
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByPatient(patientId, pageSize = 20, lastDoc) {
-    let q = query12(
+    let q = query13(
       this.collectionRef,
-      where12("patientId", "==", patientId),
+      where13("patientId", "==", patientId),
       orderBy3("updatedAt", "desc"),
       limit2(pageSize)
     );
     if (lastDoc) {
-      q = query12(q, startAfter2(lastDoc));
+      q = query13(q, startAfter2(lastDoc));
     }
-    const querySnapshot = await getDocs12(q);
+    const querySnapshot = await getDocs13(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      documents.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      documents.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       documents,
@@ -6901,21 +7068,21 @@ var FilledDocumentService = class extends BaseService {
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByPractitioner(practitionerId, pageSize = 20, lastDoc) {
-    let q = query12(
+    let q = query13(
       this.collectionRef,
-      where12("practitionerId", "==", practitionerId),
+      where13("practitionerId", "==", practitionerId),
       orderBy3("updatedAt", "desc"),
       limit2(pageSize)
     );
     if (lastDoc) {
-      q = query12(q, startAfter2(lastDoc));
+      q = query13(q, startAfter2(lastDoc));
     }
-    const querySnapshot = await getDocs12(q);
+    const querySnapshot = await getDocs13(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      documents.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      documents.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       documents,
@@ -6930,21 +7097,21 @@ var FilledDocumentService = class extends BaseService {
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByClinic(clinicId, pageSize = 20, lastDoc) {
-    let q = query12(
+    let q = query13(
       this.collectionRef,
-      where12("clinicId", "==", clinicId),
+      where13("clinicId", "==", clinicId),
       orderBy3("updatedAt", "desc"),
       limit2(pageSize)
     );
     if (lastDoc) {
-      q = query12(q, startAfter2(lastDoc));
+      q = query13(q, startAfter2(lastDoc));
     }
-    const querySnapshot = await getDocs12(q);
+    const querySnapshot = await getDocs13(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      documents.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      documents.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       documents,
@@ -6959,21 +7126,21 @@ var FilledDocumentService = class extends BaseService {
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByTemplate(templateId, pageSize = 20, lastDoc) {
-    let q = query12(
+    let q = query13(
       this.collectionRef,
-      where12("templateId", "==", templateId),
+      where13("templateId", "==", templateId),
       orderBy3("updatedAt", "desc"),
       limit2(pageSize)
     );
     if (lastDoc) {
-      q = query12(q, startAfter2(lastDoc));
+      q = query13(q, startAfter2(lastDoc));
     }
-    const querySnapshot = await getDocs12(q);
+    const querySnapshot = await getDocs13(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      documents.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      documents.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       documents,
@@ -6988,21 +7155,21 @@ var FilledDocumentService = class extends BaseService {
    * @returns Array of filled documents and the last document for pagination
    */
   async getFilledDocumentsByStatus(status, pageSize = 20, lastDoc) {
-    let q = query12(
+    let q = query13(
       this.collectionRef,
-      where12("status", "==", status),
+      where13("status", "==", status),
       orderBy3("updatedAt", "desc"),
       limit2(pageSize)
     );
     if (lastDoc) {
-      q = query12(q, startAfter2(lastDoc));
+      q = query13(q, startAfter2(lastDoc));
     }
-    const querySnapshot = await getDocs12(q);
+    const querySnapshot = await getDocs13(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc26) => {
-      documents.push(doc26.data());
-      lastVisible = doc26;
+    querySnapshot.forEach((doc27) => {
+      documents.push(doc27.data());
+      lastVisible = doc27;
     });
     return {
       documents,
@@ -7012,7 +7179,7 @@ var FilledDocumentService = class extends BaseService {
 };
 
 // src/services/calendar/calendar-refactored.service.ts
-import { Timestamp as Timestamp24, serverTimestamp as serverTimestamp19 } from "firebase/firestore";
+import { Timestamp as Timestamp25, serverTimestamp as serverTimestamp20 } from "firebase/firestore";
 
 // src/types/calendar/synced-calendar.types.ts
 var SyncedCalendarProvider = /* @__PURE__ */ ((SyncedCalendarProvider3) => {
@@ -7025,14 +7192,14 @@ var SYNCED_CALENDARS_COLLECTION = "syncedCalendars";
 
 // src/services/calendar/calendar-refactored.service.ts
 import {
-  doc as doc20,
-  getDoc as getDoc23,
-  collection as collection18,
-  query as query17,
-  where as where17,
-  getDocs as getDocs17,
-  setDoc as setDoc20,
-  updateDoc as updateDoc21
+  doc as doc21,
+  getDoc as getDoc24,
+  collection as collection20,
+  query as query19,
+  where as where19,
+  getDocs as getDocs19,
+  setDoc as setDoc21,
+  updateDoc as updateDoc22
 } from "firebase/firestore";
 
 // src/validations/calendar.schema.ts
@@ -7211,15 +7378,15 @@ var calendarEventSchema = z18.object({
 
 // src/services/calendar/utils/clinic.utils.ts
 import {
-  collection as collection14,
+  collection as collection15,
   doc as doc16,
   getDoc as getDoc19,
-  getDocs as getDocs13,
+  getDocs as getDocs14,
   setDoc as setDoc16,
   updateDoc as updateDoc17,
   deleteDoc as deleteDoc9,
-  query as query13,
-  where as where13,
+  query as query14,
+  where as where14,
   orderBy as orderBy4,
   Timestamp as Timestamp19,
   serverTimestamp as serverTimestamp15
@@ -7316,14 +7483,14 @@ async function checkAutoConfirmAppointmentsUtil(db, clinicId) {
 
 // src/services/calendar/utils/patient.utils.ts
 import {
-  collection as collection15,
+  collection as collection16,
   getDoc as getDoc20,
-  getDocs as getDocs14,
+  getDocs as getDocs15,
   setDoc as setDoc17,
   updateDoc as updateDoc18,
   deleteDoc as deleteDoc10,
-  query as query14,
-  where as where14,
+  query as query15,
+  where as where15,
   orderBy as orderBy5,
   Timestamp as Timestamp20,
   serverTimestamp as serverTimestamp16
@@ -7360,14 +7527,14 @@ async function updatePatientCalendarEventUtil(db, patientId, eventId, updateData
 
 // src/services/calendar/utils/practitioner.utils.ts
 import {
-  collection as collection16,
+  collection as collection17,
   getDoc as getDoc21,
-  getDocs as getDocs15,
+  getDocs as getDocs16,
   setDoc as setDoc18,
   updateDoc as updateDoc19,
   deleteDoc as deleteDoc11,
-  query as query15,
-  where as where15,
+  query as query16,
+  where as where16,
   orderBy as orderBy6,
   Timestamp as Timestamp21,
   serverTimestamp as serverTimestamp17
@@ -7478,19 +7645,126 @@ async function updateAppointmentUtil(db, clinicId, practitionerId, patientId, ev
   return clinicEvent;
 }
 
-// src/services/calendar/utils/synced-calendar.utils.ts
+// src/services/calendar/utils/calendar-event.utils.ts
 import {
-  collection as collection17,
+  collection as collection18,
+  doc as doc19,
   getDoc as getDoc22,
-  getDocs as getDocs16,
+  getDocs as getDocs17,
   setDoc as setDoc19,
   updateDoc as updateDoc20,
   deleteDoc as deleteDoc12,
-  query as query16,
+  query as query17,
+  where as where17,
   orderBy as orderBy7,
   Timestamp as Timestamp22,
   serverTimestamp as serverTimestamp18
 } from "firebase/firestore";
+async function searchCalendarEventsUtil(db, params) {
+  const { searchLocation, entityId, ...filters } = params;
+  let baseCollectionPath;
+  const constraints = [];
+  switch (searchLocation) {
+    case "practitioner" /* PRACTITIONER */:
+      if (!entityId) {
+        throw new Error(
+          "Practitioner ID (entityId) is required when searching practitioner calendar."
+        );
+      }
+      baseCollectionPath = `${PRACTITIONERS_COLLECTION}/${entityId}/${CALENDAR_COLLECTION}`;
+      if (filters.practitionerId && filters.practitionerId !== entityId) {
+        console.warn(
+          `Provided practitionerId filter (${filters.practitionerId}) does not match search entityId (${entityId}). Returning empty results.`
+        );
+        return [];
+      }
+      filters.practitionerId = void 0;
+      break;
+    case "patient" /* PATIENT */:
+      if (!entityId) {
+        throw new Error(
+          "Patient ID (entityId) is required when searching patient calendar."
+        );
+      }
+      baseCollectionPath = `${PATIENTS_COLLECTION}/${entityId}/${CALENDAR_COLLECTION}`;
+      if (filters.patientId && filters.patientId !== entityId) {
+        console.warn(
+          `Provided patientId filter (${filters.patientId}) does not match search entityId (${entityId}). Returning empty results.`
+        );
+        return [];
+      }
+      filters.patientId = void 0;
+      break;
+    case "clinic" /* CLINIC */:
+      if (!entityId) {
+        throw new Error(
+          "Clinic ID (entityId) is required when searching clinic-related events."
+        );
+      }
+      baseCollectionPath = CALENDAR_COLLECTION;
+      constraints.push(where17("clinicBranchId", "==", entityId));
+      if (filters.clinicId && filters.clinicId !== entityId) {
+        console.warn(
+          `Provided clinicId filter (${filters.clinicId}) does not match search entityId (${entityId}). Returning empty results.`
+        );
+        return [];
+      }
+      filters.clinicId = void 0;
+      break;
+    default:
+      throw new Error(`Invalid search location: ${searchLocation}`);
+  }
+  const collectionRef = collection18(db, baseCollectionPath);
+  if (filters.clinicId) {
+    constraints.push(where17("clinicBranchId", "==", filters.clinicId));
+  }
+  if (filters.practitionerId) {
+    constraints.push(
+      where17("practitionerProfileId", "==", filters.practitionerId)
+    );
+  }
+  if (filters.patientId) {
+    constraints.push(where17("patientProfileId", "==", filters.patientId));
+  }
+  if (filters.procedureId) {
+    constraints.push(where17("procedureId", "==", filters.procedureId));
+  }
+  if (filters.eventStatus) {
+    constraints.push(where17("status", "==", filters.eventStatus));
+  }
+  if (filters.eventType) {
+    constraints.push(where17("eventType", "==", filters.eventType));
+  }
+  if (filters.dateRange) {
+    constraints.push(where17("eventTime.start", ">=", filters.dateRange.start));
+    constraints.push(where17("eventTime.start", "<=", filters.dateRange.end));
+  }
+  try {
+    const finalQuery = query17(collectionRef, ...constraints);
+    const querySnapshot = await getDocs17(finalQuery);
+    const events = querySnapshot.docs.map(
+      (doc27) => ({ id: doc27.id, ...doc27.data() })
+    );
+    return events;
+  } catch (error) {
+    console.error("Error searching calendar events:", error);
+    return [];
+  }
+}
+
+// src/services/calendar/utils/synced-calendar.utils.ts
+import {
+  collection as collection19,
+  getDoc as getDoc23,
+  getDocs as getDocs18,
+  setDoc as setDoc20,
+  updateDoc as updateDoc21,
+  deleteDoc as deleteDoc13,
+  query as query18,
+  orderBy as orderBy8,
+  Timestamp as Timestamp23,
+  serverTimestamp as serverTimestamp19
+} from "firebase/firestore";
 async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
   const calendarId = generateId2();
   const calendarRef = getPractitionerSyncedCalendarDocRef(
@@ -7501,14 +7775,14 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp18(),
-    updatedAt: serverTimestamp18()
+    createdAt: serverTimestamp19(),
+    updatedAt: serverTimestamp19()
   };
-  await setDoc19(calendarRef, newCalendar);
+  await setDoc20(calendarRef, newCalendar);
   return {
     ...newCalendar,
-    createdAt: Timestamp22.now(),
-    updatedAt: Timestamp22.now()
+    createdAt: Timestamp23.now(),
+    updatedAt: Timestamp23.now()
   };
 }
 async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId2) {
@@ -7517,14 +7791,14 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp18(),
-    updatedAt: serverTimestamp18()
+    createdAt: serverTimestamp19(),
+    updatedAt: serverTimestamp19()
   };
-  await setDoc19(calendarRef, newCalendar);
+  await setDoc20(calendarRef, newCalendar);
   return {
     ...newCalendar,
-    createdAt: Timestamp22.now(),
-    updatedAt: Timestamp22.now()
+    createdAt: Timestamp23.now(),
+    updatedAt: Timestamp23.now()
   };
 }
 async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId2) {
@@ -7533,14 +7807,14 @@ async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, genera
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp18(),
-    updatedAt: serverTimestamp18()
+    createdAt: serverTimestamp19(),
+    updatedAt: serverTimestamp19()
   };
-  await setDoc19(calendarRef, newCalendar);
+  await setDoc20(calendarRef, newCalendar);
   return {
     ...newCalendar,
-    createdAt: Timestamp22.now(),
-    updatedAt: Timestamp22.now()
+    createdAt: Timestamp23.now(),
+    updatedAt: Timestamp23.now()
   };
 }
 async function getPractitionerSyncedCalendarUtil(db, practitionerId, calendarId) {
@@ -7549,54 +7823,54 @@ async function getPractitionerSyncedCalendarUtil(db, practitionerId, calendarId)
     practitionerId,
     calendarId
   );
-  const calendarDoc = await getDoc22(calendarRef);
+  const calendarDoc = await getDoc23(calendarRef);
   if (!calendarDoc.exists()) {
     return null;
   }
   return calendarDoc.data();
 }
 async function getPractitionerSyncedCalendarsUtil(db, practitionerId) {
-  const calendarsRef = collection17(
+  const calendarsRef = collection19(
     db,
     `practitioners/${practitionerId}/${SYNCED_CALENDARS_COLLECTION}`
   );
-  const q = query16(calendarsRef, orderBy7("createdAt", "desc"));
-  const querySnapshot = await getDocs16(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const q = query18(calendarsRef, orderBy8("createdAt", "desc"));
+  const querySnapshot = await getDocs18(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function getPatientSyncedCalendarUtil(db, patientId, calendarId) {
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
-  const calendarDoc = await getDoc22(calendarRef);
+  const calendarDoc = await getDoc23(calendarRef);
   if (!calendarDoc.exists()) {
     return null;
   }
   return calendarDoc.data();
 }
 async function getPatientSyncedCalendarsUtil(db, patientId) {
-  const calendarsRef = collection17(
+  const calendarsRef = collection19(
     db,
     `patients/${patientId}/${SYNCED_CALENDARS_COLLECTION}`
   );
-  const q = query16(calendarsRef, orderBy7("createdAt", "desc"));
-  const querySnapshot = await getDocs16(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const q = query18(calendarsRef, orderBy8("createdAt", "desc"));
+  const querySnapshot = await getDocs18(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function getClinicSyncedCalendarUtil(db, clinicId, calendarId) {
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
-  const calendarDoc = await getDoc22(calendarRef);
+  const calendarDoc = await getDoc23(calendarRef);
   if (!calendarDoc.exists()) {
     return null;
   }
   return calendarDoc.data();
 }
 async function getClinicSyncedCalendarsUtil(db, clinicId) {
-  const calendarsRef = collection17(
+  const calendarsRef = collection19(
     db,
     `clinics/${clinicId}/${SYNCED_CALENDARS_COLLECTION}`
   );
-  const q = query16(calendarsRef, orderBy7("createdAt", "desc"));
-  const querySnapshot = await getDocs16(q);
-  return querySnapshot.docs.map((doc26) => doc26.data());
+  const q = query18(calendarsRef, orderBy8("createdAt", "desc"));
+  const querySnapshot = await getDocs18(q);
+  return querySnapshot.docs.map((doc27) => doc27.data());
 }
 async function updatePractitionerSyncedCalendarUtil(db, practitionerId, calendarId, updateData) {
   const calendarRef = getPractitionerSyncedCalendarDocRef(
@@ -7606,10 +7880,10 @@ async function updatePractitionerSyncedCalendarUtil(db, practitionerId, calendar
   );
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp18()
+    updatedAt: serverTimestamp19()
   };
-  await updateDoc20(calendarRef, updates);
-  const updatedDoc = await getDoc22(calendarRef);
+  await updateDoc21(calendarRef, updates);
+  const updatedDoc = await getDoc23(calendarRef);
   if (!updatedDoc.exists()) {
     throw new Error("Synced calendar not found after update");
   }
@@ -7619,10 +7893,10 @@ async function updatePatientSyncedCalendarUtil(db, patientId, calendarId, update
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp18()
+    updatedAt: serverTimestamp19()
   };
-  await updateDoc20(calendarRef, updates);
-  const updatedDoc = await getDoc22(calendarRef);
+  await updateDoc21(calendarRef, updates);
+  const updatedDoc = await getDoc23(calendarRef);
   if (!updatedDoc.exists()) {
     throw new Error("Synced calendar not found after update");
   }
@@ -7632,10 +7906,10 @@ async function updateClinicSyncedCalendarUtil(db, clinicId, calendarId, updateDa
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp18()
+    updatedAt: serverTimestamp19()
   };
-  await updateDoc20(calendarRef, updates);
-  const updatedDoc = await getDoc22(calendarRef);
+  await updateDoc21(calendarRef, updates);
+  const updatedDoc = await getDoc23(calendarRef);
   if (!updatedDoc.exists()) {
     throw new Error("Synced calendar not found after update");
   }
@@ -7647,19 +7921,19 @@ async function deletePractitionerSyncedCalendarUtil(db, practitionerId, calendar
     practitionerId,
     calendarId
   );
-  await deleteDoc12(calendarRef);
+  await deleteDoc13(calendarRef);
 }
 async function deletePatientSyncedCalendarUtil(db, patientId, calendarId) {
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
-  await deleteDoc12(calendarRef);
+  await deleteDoc13(calendarRef);
 }
 async function deleteClinicSyncedCalendarUtil(db, clinicId, calendarId) {
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
-  await deleteDoc12(calendarRef);
+  await deleteDoc13(calendarRef);
 }
 async function updateLastSyncedTimestampUtil(db, entityType, entityId, calendarId) {
   const updateData = {
-    lastSyncedAt: Timestamp22.now()
+    lastSyncedAt: Timestamp23.now()
   };
   switch (entityType) {
     case "practitioner":
@@ -7689,7 +7963,7 @@ async function updateLastSyncedTimestampUtil(db, entityType, entityId, calendarI
 }
 
 // src/services/calendar/utils/google-calendar.utils.ts
-import { Timestamp as Timestamp23 } from "firebase/firestore";
+import { Timestamp as Timestamp24 } from "firebase/firestore";
 var GOOGLE_CALENDAR_API_URL = "https://www.googleapis.com/calendar/v3";
 var GOOGLE_OAUTH_URL = "https://oauth2.googleapis.com/token";
 var CLIENT_ID = "your-client-id";
@@ -7809,7 +8083,7 @@ async function ensureValidToken(db, entityType, entityId, syncedCalendar) {
     tokenExpiry.setSeconds(tokenExpiry.getSeconds() + expiresIn);
     const updateData = {
       accessToken,
-      tokenExpiry: Timestamp23.fromDate(tokenExpiry)
+      tokenExpiry: Timestamp24.fromDate(tokenExpiry)
     };
     switch (entityType) {
       case "practitioner":
@@ -7984,8 +8258,8 @@ function convertGoogleEventToCalendarEventUtil(googleEvent, entityId, entityType
     eventName: googleEvent.summary || "External Event",
     eventLocation: googleEvent.location,
     eventTime: {
-      start: Timestamp23.fromDate(start),
-      end: Timestamp23.fromDate(end)
+      start: Timestamp24.fromDate(start),
+      end: Timestamp24.fromDate(end)
     },
     description: googleEvent.description || "",
     // External events are always set as CONFIRMED - status updates will happen externally
@@ -7999,7 +8273,7 @@ function convertGoogleEventToCalendarEventUtil(googleEvent, entityId, entityType
       {
         eventId: googleEvent.id,
         syncedCalendarProvider: "google" /* GOOGLE */,
-        syncedAt: Timestamp23.now()
+        syncedAt: Timestamp24.now()
       }
     ]
   };
@@ -8777,7 +9051,7 @@ var CalendarServiceV2 = class extends BaseService {
       return 0;
     }
     let importedEventsCount = 0;
-    const currentTime = Timestamp24.now();
+    const currentTime = Timestamp25.now();
     for (const calendar of activeCalendars) {
       try {
         let externalEvents = [];
@@ -8844,7 +9118,7 @@ var CalendarServiceV2 = class extends BaseService {
   async createDoctorBlockingEvent(doctorId, eventData) {
     try {
       const eventId = this.generateId();
-      const eventRef = doc20(
+      const eventRef = doc21(
         this.db,
         PRACTITIONERS_COLLECTION,
         doctorId,
@@ -8854,14 +9128,14 @@ var CalendarServiceV2 = class extends BaseService {
       const newEvent = {
         id: eventId,
         ...eventData,
-        createdAt: serverTimestamp19(),
-        updatedAt: serverTimestamp19()
+        createdAt: serverTimestamp20(),
+        updatedAt: serverTimestamp20()
       };
-      await setDoc20(eventRef, newEvent);
+      await setDoc21(eventRef, newEvent);
       return {
         ...newEvent,
-        createdAt: Timestamp24.now(),
-        updatedAt: Timestamp24.now()
+        createdAt: Timestamp25.now(),
+        updatedAt: Timestamp25.now()
       };
     } catch (error) {
       console.error(
@@ -8879,8 +9153,8 @@ var CalendarServiceV2 = class extends BaseService {
    */
   async synchronizeExternalCalendars(lookbackDays = 7, lookforwardDays = 30) {
     try {
-      const practitionersRef = collection18(this.db, PRACTITIONERS_COLLECTION);
-      const practitionersSnapshot = await getDocs17(practitionersRef);
+      const practitionersRef = collection20(this.db, PRACTITIONERS_COLLECTION);
+      const practitionersSnapshot = await getDocs19(practitionersRef);
       const startDate = /* @__PURE__ */ new Date();
       startDate.setDate(startDate.getDate() - lookbackDays);
       const endDate = /* @__PURE__ */ new Date();
@@ -8938,22 +9212,22 @@ var CalendarServiceV2 = class extends BaseService {
   async updateExistingEventsFromExternalCalendars(doctorId, startDate, endDate) {
     var _a;
     try {
-      const eventsRef = collection18(
+      const eventsRef = collection20(
         this.db,
         PRACTITIONERS_COLLECTION,
         doctorId,
         CALENDAR_COLLECTION
       );
-      const q = query17(
+      const q = query19(
         eventsRef,
-        where17("syncStatus", "==", "external" /* EXTERNAL */),
-        where17("eventTime.start", ">=", Timestamp24.fromDate(startDate)),
-        where17("eventTime.start", "<=", Timestamp24.fromDate(endDate))
+        where19("syncStatus", "==", "external" /* EXTERNAL */),
+        where19("eventTime.start", ">=", Timestamp25.fromDate(startDate)),
+        where19("eventTime.start", "<=", Timestamp25.fromDate(endDate))
       );
-      const eventsSnapshot = await getDocs17(q);
-      const events = eventsSnapshot.docs.map((doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      const eventsSnapshot = await getDocs19(q);
+      const events = eventsSnapshot.docs.map((doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       }));
       const calendars = await this.syncedCalendarsService.getPractitionerSyncedCalendars(
         doctorId
@@ -9057,21 +9331,21 @@ var CalendarServiceV2 = class extends BaseService {
       const endTime = new Date(
         externalEvent.end.dateTime || externalEvent.end.date
       );
-      const eventRef = doc20(
+      const eventRef = doc21(
         this.db,
         PRACTITIONERS_COLLECTION,
         doctorId,
         CALENDAR_COLLECTION,
         eventId
       );
-      await updateDoc21(eventRef, {
+      await updateDoc22(eventRef, {
         eventName: externalEvent.summary || "External Event",
         eventTime: {
-          start: Timestamp24.fromDate(startTime),
-          end: Timestamp24.fromDate(endTime)
+          start: Timestamp25.fromDate(startTime),
+          end: Timestamp25.fromDate(endTime)
         },
         description: externalEvent.description || "",
-        updatedAt: serverTimestamp19()
+        updatedAt: serverTimestamp20()
       });
       console.log(`Updated local event ${eventId} from external event`);
     } catch (error) {
@@ -9089,16 +9363,16 @@ var CalendarServiceV2 = class extends BaseService {
    */
   async updateEventStatus(doctorId, eventId, status) {
     try {
-      const eventRef = doc20(
+      const eventRef = doc21(
         this.db,
         PRACTITIONERS_COLLECTION,
         doctorId,
         CALENDAR_COLLECTION,
         eventId
       );
-      await updateDoc21(eventRef, {
+      await updateDoc22(eventRef, {
         status,
-        updatedAt: serverTimestamp19()
+        updatedAt: serverTimestamp20()
       });
       console.log(`Updated event ${eventId} status to ${status}`);
     } catch (error) {
@@ -9116,6 +9390,102 @@ var CalendarServiceV2 = class extends BaseService {
       `Setting up scheduled calendar sync job every ${interval} hours`
     );
   }
+  /**
+   * Searches for calendar events based on specified criteria.
+   *
+   * @param {SearchCalendarEventsParams} params - The search parameters.
+   * @param {SearchLocationEnum} params.searchLocation - The primary location to search (practitioner, patient, or clinic).
+   * @param {string} params.entityId - The ID of the entity (practitioner, patient, or clinic) to search within/for.
+   * @param {string} [params.clinicId] - Optional clinic ID to filter by.
+   * @param {string} [params.practitionerId] - Optional practitioner ID to filter by.
+   * @param {string} [params.patientId] - Optional patient ID to filter by.
+   * @param {string} [params.procedureId] - Optional procedure ID to filter by.
+   * @param {DateRange} [params.dateRange] - Optional date range to filter by (event start time).
+   * @param {CalendarEventStatus} [params.eventStatus] - Optional event status to filter by.
+   * @param {CalendarEventType} [params.eventType] - Optional event type to filter by.
+   * @returns {Promise<CalendarEvent[]>} A promise that resolves to an array of matching calendar events.
+   * @throws {Error} If the search location requires an entity ID that is not provided.
+   */
+  async searchCalendarEvents(params) {
+    return searchCalendarEventsUtil(this.db, params);
+  }
+  /**
+   * Gets a doctor's upcoming appointments for a specific date range
+   *
+   * @param {string} doctorId - ID of the practitioner
+   * @param {Date} startDate - Start date of the range
+   * @param {Date} endDate - End date of the range
+   * @param {CalendarEventStatus} [status] - Optional status filter (defaults to CONFIRMED)
+   * @returns {Promise<CalendarEvent[]>} A promise that resolves to an array of appointments
+   */
+  async getPractitionerUpcomingAppointments(doctorId, startDate, endDate, status = "confirmed" /* CONFIRMED */) {
+    const dateRange = {
+      start: Timestamp25.fromDate(startDate),
+      end: Timestamp25.fromDate(endDate)
+    };
+    const searchParams = {
+      searchLocation: "practitioner" /* PRACTITIONER */,
+      entityId: doctorId,
+      dateRange,
+      eventStatus: status,
+      eventType: "appointment" /* APPOINTMENT */
+    };
+    return this.searchCalendarEvents(searchParams);
+  }
+  /**
+   * Gets a patient's appointments for a specific date range
+   *
+   * @param {string} patientId - ID of the patient
+   * @param {Date} startDate - Start date of the range
+   * @param {Date} endDate - End date of the range
+   * @param {CalendarEventStatus} [status] - Optional status filter (defaults to all non-canceled appointments)
+   * @returns {Promise<CalendarEvent[]>} A promise that resolves to an array of appointments
+   */
+  async getPatientAppointments(patientId, startDate, endDate, status) {
+    const dateRange = {
+      start: Timestamp25.fromDate(startDate),
+      end: Timestamp25.fromDate(endDate)
+    };
+    const searchParams = {
+      searchLocation: "patient" /* PATIENT */,
+      entityId: patientId,
+      dateRange,
+      eventType: "appointment" /* APPOINTMENT */
+    };
+    if (status) {
+      searchParams.eventStatus = status;
+    }
+    return this.searchCalendarEvents(searchParams);
+  }
+  /**
+   * Gets all appointments for a clinic within a specific date range
+   *
+   * @param {string} clinicId - ID of the clinic
+   * @param {Date} startDate - Start date of the range
+   * @param {Date} endDate - End date of the range
+   * @param {string} [doctorId] - Optional doctor ID to filter by
+   * @param {CalendarEventStatus} [status] - Optional status filter
+   * @returns {Promise<CalendarEvent[]>} A promise that resolves to an array of appointments
+   */
+  async getClinicAppointments(clinicId, startDate, endDate, doctorId, status) {
+    const dateRange = {
+      start: Timestamp25.fromDate(startDate),
+      end: Timestamp25.fromDate(endDate)
+    };
+    const searchParams = {
+      searchLocation: "clinic" /* CLINIC */,
+      entityId: clinicId,
+      dateRange,
+      eventType: "appointment" /* APPOINTMENT */
+    };
+    if (doctorId) {
+      searchParams.practitionerId = doctorId;
+    }
+    if (status) {
+      searchParams.eventStatus = status;
+    }
+    return this.searchCalendarEvents(searchParams);
+  }
   // #endregion
   // #region Private Helper Methods
   /**
@@ -9159,8 +9529,8 @@ var CalendarServiceV2 = class extends BaseService {
     const startDate = eventTime.start.toDate();
     const startTime = startDate;
     const endTime = eventTime.end.toDate();
-    const practitionerRef = doc20(this.db, PRACTITIONERS_COLLECTION, doctorId);
-    const practitionerDoc = await getDoc23(practitionerRef);
+    const practitionerRef = doc21(this.db, PRACTITIONERS_COLLECTION, doctorId);
+    const practitionerDoc = await getDoc24(practitionerRef);
     if (!practitionerDoc.exists()) {
       throw new Error(`Doctor with ID ${doctorId} not found`);
     }
@@ -9217,8 +9587,8 @@ var CalendarServiceV2 = class extends BaseService {
    * @returns Updated calendar event
    */
   async updateAppointmentStatus(appointmentId, clinicId, status) {
-    const appointmentRef = doc20(this.db, CALENDAR_COLLECTION, appointmentId);
-    const appointmentDoc = await getDoc23(appointmentRef);
+    const appointmentRef = doc21(this.db, CALENDAR_COLLECTION, appointmentId);
+    const appointmentDoc = await getDoc24(appointmentRef);
     if (!appointmentDoc.exists()) {
       throw new Error(`Appointment with ID ${appointmentId} not found`);
     }
@@ -9349,7 +9719,7 @@ var CalendarServiceV2 = class extends BaseService {
           const newSyncEvent = {
             eventId: result.eventIds[0],
             syncedCalendarProvider: calendar.provider,
-            syncedAt: Timestamp24.now()
+            syncedAt: Timestamp25.now()
           };
           await this.updateEventWithSyncId(
             entityType === "doctor" ? appointment.practitionerProfileId : appointment.patientProfileId,
@@ -9373,8 +9743,8 @@ var CalendarServiceV2 = class extends BaseService {
   async updateEventWithSyncId(entityId, entityType, eventId, syncEvent) {
     try {
       const collectionPath = entityType === "doctor" ? `${PRACTITIONERS_COLLECTION}/${entityId}/${CALENDAR_COLLECTION}` : `${PATIENTS_COLLECTION}/${entityId}/${CALENDAR_COLLECTION}`;
-      const eventRef = doc20(this.db, collectionPath, eventId);
-      const eventDoc = await getDoc23(eventRef);
+      const eventRef = doc21(this.db, collectionPath, eventId);
+      const eventDoc = await getDoc24(eventRef);
       if (eventDoc.exists()) {
         const event = eventDoc.data();
         const syncIds = [...event.syncedCalendarEventId || []];
@@ -9386,9 +9756,9 @@ var CalendarServiceV2 = class extends BaseService {
         } else {
           syncIds.push(syncEvent);
         }
-        await updateDoc21(eventRef, {
+        await updateDoc22(eventRef, {
           syncedCalendarEventId: syncIds,
-          updatedAt: serverTimestamp19()
+          updatedAt: serverTimestamp20()
         });
         console.log(
           `Updated event ${eventId} with sync ID ${syncEvent.eventId}`
@@ -9412,8 +9782,8 @@ var CalendarServiceV2 = class extends BaseService {
    * @returns Working hours for the clinic
    */
   async getClinicWorkingHours(clinicId, date) {
-    const clinicRef = doc20(this.db, CLINICS_COLLECTION, clinicId);
-    const clinicDoc = await getDoc23(clinicRef);
+    const clinicRef = doc21(this.db, CLINICS_COLLECTION, clinicId);
+    const clinicDoc = await getDoc24(clinicRef);
     if (!clinicDoc.exists()) {
       throw new Error(`Clinic with ID ${clinicId} not found`);
     }
@@ -9441,8 +9811,8 @@ var CalendarServiceV2 = class extends BaseService {
    * @returns Doctor's schedule
    */
   async getDoctorSchedule(doctorId, date) {
-    const practitionerRef = doc20(this.db, PRACTITIONERS_COLLECTION, doctorId);
-    const practitionerDoc = await getDoc23(practitionerRef);
+    const practitionerRef = doc21(this.db, PRACTITIONERS_COLLECTION, doctorId);
+    const practitionerDoc = await getDoc24(practitionerRef);
     if (!practitionerDoc.exists()) {
       throw new Error(`Doctor with ID ${doctorId} not found`);
     }
@@ -9474,19 +9844,19 @@ var CalendarServiceV2 = class extends BaseService {
     startOfDay.setHours(0, 0, 0, 0);
     const endOfDay = new Date(date);
     endOfDay.setHours(23, 59, 59, 999);
-    const appointmentsRef = collection18(this.db, CALENDAR_COLLECTION);
-    const q = query17(
+    const appointmentsRef = collection20(this.db, CALENDAR_COLLECTION);
+    const q = query19(
       appointmentsRef,
-      where17("practitionerProfileId", "==", doctorId),
-      where17("eventTime.start", ">=", Timestamp24.fromDate(startOfDay)),
-      where17("eventTime.start", "<=", Timestamp24.fromDate(endOfDay)),
-      where17("status", "in", [
+      where19("practitionerProfileId", "==", doctorId),
+      where19("eventTime.start", ">=", Timestamp25.fromDate(startOfDay)),
+      where19("eventTime.start", "<=", Timestamp25.fromDate(endOfDay)),
+      where19("status", "in", [
         "confirmed" /* CONFIRMED */,
         "pending" /* PENDING */
       ])
     );
-    const querySnapshot = await getDocs17(q);
-    return querySnapshot.docs.map((doc26) => doc26.data());
+    const querySnapshot = await getDocs19(q);
+    return querySnapshot.docs.map((doc27) => doc27.data());
   }
   /**
    * Calculates available time slots based on working hours, schedule and existing appointments
@@ -9543,11 +9913,11 @@ var CalendarServiceV2 = class extends BaseService {
     var _a;
     try {
       const [clinicDoc, practitionerDoc, patientDoc, patientSensitiveInfoDoc] = await Promise.all([
-        getDoc23(doc20(this.db, CLINICS_COLLECTION, clinicId)),
-        getDoc23(doc20(this.db, PRACTITIONERS_COLLECTION, doctorId)),
-        getDoc23(doc20(this.db, PATIENTS_COLLECTION, patientId)),
-        getDoc23(
-          doc20(
+        getDoc24(doc21(this.db, CLINICS_COLLECTION, clinicId)),
+        getDoc24(doc21(this.db, PRACTITIONERS_COLLECTION, doctorId)),
+        getDoc24(doc21(this.db, PATIENTS_COLLECTION, patientId)),
+        getDoc24(
+          doc21(
             this.db,
             PATIENTS_COLLECTION,
             patientId,
@@ -9580,7 +9950,7 @@ var CalendarServiceV2 = class extends BaseService {
           fullName: `${sensitiveData.firstName} ${sensitiveData.lastName}`,
           email: sensitiveData.email || "",
           phone: sensitiveData.phoneNumber || null,
-          dateOfBirth: sensitiveData.dateOfBirth || Timestamp24.now(),
+          dateOfBirth: sensitiveData.dateOfBirth || Timestamp25.now(),
           gender: sensitiveData.gender || "other" /* OTHER */
         };
       } else if (patientDoc.exists()) {
@@ -9589,7 +9959,7 @@ var CalendarServiceV2 = class extends BaseService {
           fullName: patientDoc.data().displayName,
           email: ((_a = patientDoc.data().contactInfo) == null ? void 0 : _a.email) || "",
           phone: patientDoc.data().phoneNumber || null,
-          dateOfBirth: patientDoc.data().dateOfBirth || Timestamp24.now(),
+          dateOfBirth: patientDoc.data().dateOfBirth || Timestamp25.now(),
           gender: patientDoc.data().gender || "other" /* OTHER */
         };
       }
@@ -9613,13 +9983,13 @@ var CalendarServiceV2 = class extends BaseService {
 // src/backoffice/services/brand.service.ts
 import {
   addDoc as addDoc4,
-  collection as collection19,
-  doc as doc21,
-  getDoc as getDoc24,
-  getDocs as getDocs18,
-  query as query18,
-  updateDoc as updateDoc22,
-  where as where18
+  collection as collection21,
+  doc as doc22,
+  getDoc as getDoc25,
+  getDocs as getDocs20,
+  query as query20,
+  updateDoc as updateDoc23,
+  where as where20
 } from "firebase/firestore";
 
 // src/backoffice/types/brand.types.ts
@@ -9631,7 +10001,7 @@ var BrandService = class extends BaseService {
    * Gets reference to brands collection
    */
   getBrandsRef() {
-    return collection19(this.db, BRANDS_COLLECTION);
+    return collection21(this.db, BRANDS_COLLECTION);
   }
   /**
    * Creates a new brand
@@ -9651,12 +10021,12 @@ var BrandService = class extends BaseService {
    * Gets all active brands
    */
   async getAll() {
-    const q = query18(this.getBrandsRef(), where18("isActive", "==", true));
-    const snapshot = await getDocs18(q);
+    const q = query20(this.getBrandsRef(), where20("isActive", "==", true));
+    const snapshot = await getDocs20(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -9668,8 +10038,8 @@ var BrandService = class extends BaseService {
       ...brand,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc21(this.getBrandsRef(), brandId);
-    await updateDoc22(docRef, updateData);
+    const docRef = doc22(this.getBrandsRef(), brandId);
+    await updateDoc23(docRef, updateData);
     return this.getById(brandId);
   }
   /**
@@ -9684,8 +10054,8 @@ var BrandService = class extends BaseService {
    * Gets a brand by ID
    */
   async getById(brandId) {
-    const docRef = doc21(this.getBrandsRef(), brandId);
-    const docSnap = await getDoc24(docRef);
+    const docRef = doc22(this.getBrandsRef(), brandId);
+    const docSnap = await getDoc25(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -9697,13 +10067,13 @@ var BrandService = class extends BaseService {
 // src/backoffice/services/category.service.ts
 import {
   addDoc as addDoc5,
-  collection as collection20,
-  doc as doc22,
-  getDoc as getDoc25,
-  getDocs as getDocs19,
-  query as query19,
-  updateDoc as updateDoc23,
-  where as where19
+  collection as collection22,
+  doc as doc23,
+  getDoc as getDoc26,
+  getDocs as getDocs21,
+  query as query21,
+  updateDoc as updateDoc24,
+  where as where21
 } from "firebase/firestore";
 
 // src/backoffice/types/category.types.ts
@@ -9715,7 +10085,7 @@ var CategoryService = class extends BaseService {
    * Referenca na Firestore kolekciju kategorija
    */
   get categoriesRef() {
-    return collection20(this.db, CATEGORIES_COLLECTION);
+    return collection22(this.db, CATEGORIES_COLLECTION);
   }
   /**
    * Kreira novu kategoriju u sistemu
@@ -9738,12 +10108,12 @@ var CategoryService = class extends BaseService {
    * @returns Lista aktivnih kategorija
    */
   async getAll() {
-    const q = query19(this.categoriesRef, where19("isActive", "==", true));
-    const snapshot = await getDocs19(q);
+    const q = query21(this.categoriesRef, where21("isActive", "==", true));
+    const snapshot = await getDocs21(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -9753,16 +10123,16 @@ var CategoryService = class extends BaseService {
    * @returns Lista kategorija koje pripadaju traženoj familiji
    */
   async getAllByFamily(family) {
-    const q = query19(
+    const q = query21(
       this.categoriesRef,
-      where19("family", "==", family),
-      where19("isActive", "==", true)
+      where21("family", "==", family),
+      where21("isActive", "==", true)
     );
-    const snapshot = await getDocs19(q);
+    const snapshot = await getDocs21(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -9777,8 +10147,8 @@ var CategoryService = class extends BaseService {
       ...category,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc22(this.categoriesRef, id);
-    await updateDoc23(docRef, updateData);
+    const docRef = doc23(this.categoriesRef, id);
+    await updateDoc24(docRef, updateData);
     return this.getById(id);
   }
   /**
@@ -9794,8 +10164,8 @@ var CategoryService = class extends BaseService {
    * @returns Kategorija ili null ako ne postoji
    */
   async getById(id) {
-    const docRef = doc22(this.categoriesRef, id);
-    const docSnap = await getDoc25(docRef);
+    const docRef = doc23(this.categoriesRef, id);
+    const docSnap = await getDoc26(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -9807,13 +10177,13 @@ var CategoryService = class extends BaseService {
 // src/backoffice/services/subcategory.service.ts
 import {
   addDoc as addDoc6,
-  collection as collection21,
-  doc as doc23,
-  getDoc as getDoc26,
-  getDocs as getDocs20,
-  query as query20,
-  updateDoc as updateDoc24,
-  where as where20
+  collection as collection23,
+  doc as doc24,
+  getDoc as getDoc27,
+  getDocs as getDocs22,
+  query as query22,
+  updateDoc as updateDoc25,
+  where as where22
 } from "firebase/firestore";
 
 // src/backoffice/types/subcategory.types.ts
@@ -9826,7 +10196,7 @@ var SubcategoryService = class extends BaseService {
    * @param categoryId - ID roditeljske kategorije
    */
   getSubcategoriesRef(categoryId) {
-    return collection21(
+    return collection23(
       this.db,
       CATEGORIES_COLLECTION,
       categoryId,
@@ -9860,15 +10230,15 @@ var SubcategoryService = class extends BaseService {
    * @returns Lista aktivnih podkategorija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query20(
+    const q = query22(
       this.getSubcategoriesRef(categoryId),
-      where20("isActive", "==", true)
+      where22("isActive", "==", true)
     );
-    const snapshot = await getDocs20(q);
+    const snapshot = await getDocs22(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -9884,8 +10254,8 @@ var SubcategoryService = class extends BaseService {
       ...subcategory,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc23(this.getSubcategoriesRef(categoryId), subcategoryId);
-    await updateDoc24(docRef, updateData);
+    const docRef = doc24(this.getSubcategoriesRef(categoryId), subcategoryId);
+    await updateDoc25(docRef, updateData);
     return this.getById(categoryId, subcategoryId);
   }
   /**
@@ -9903,8 +10273,8 @@ var SubcategoryService = class extends BaseService {
    * @returns Podkategorija ili null ako ne postoji
    */
   async getById(categoryId, subcategoryId) {
-    const docRef = doc23(this.getSubcategoriesRef(categoryId), subcategoryId);
-    const docSnap = await getDoc26(docRef);
+    const docRef = doc24(this.getSubcategoriesRef(categoryId), subcategoryId);
+    const docSnap = await getDoc27(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -9916,15 +10286,15 @@ var SubcategoryService = class extends BaseService {
 // src/backoffice/services/technology.service.ts
 import {
   addDoc as addDoc7,
-  collection as collection22,
-  doc as doc24,
-  getDoc as getDoc27,
-  getDocs as getDocs21,
-  query as query21,
-  updateDoc as updateDoc25,
-  where as where21,
+  collection as collection24,
+  doc as doc25,
+  getDoc as getDoc28,
+  getDocs as getDocs23,
+  query as query23,
+  updateDoc as updateDoc26,
+  where as where23,
   arrayUnion as arrayUnion5,
-  arrayRemove as arrayRemove3
+  arrayRemove as arrayRemove4
 } from "firebase/firestore";
 
 // src/backoffice/types/technology.types.ts
@@ -9940,7 +10310,7 @@ var TechnologyService = class extends BaseService {
    * Vraća referencu na Firestore kolekciju tehnologija
    */
   getTechnologiesRef() {
-    return collection22(this.db, TECHNOLOGIES_COLLECTION);
+    return collection24(this.db, TECHNOLOGIES_COLLECTION);
   }
   /**
    * Kreira novu tehnologiju
@@ -9971,12 +10341,12 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAll() {
-    const q = query21(this.getTechnologiesRef(), where21("isActive", "==", true));
-    const snapshot = await getDocs21(q);
+    const q = query23(this.getTechnologiesRef(), where23("isActive", "==", true));
+    const snapshot = await getDocs23(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -9986,16 +10356,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByFamily(family) {
-    const q = query21(
+    const q = query23(
       this.getTechnologiesRef(),
-      where21("isActive", "==", true),
-      where21("family", "==", family)
+      where23("isActive", "==", true),
+      where23("family", "==", family)
     );
-    const snapshot = await getDocs21(q);
+    const snapshot = await getDocs23(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -10005,16 +10375,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllByCategoryId(categoryId) {
-    const q = query21(
+    const q = query23(
       this.getTechnologiesRef(),
-      where21("isActive", "==", true),
-      where21("categoryId", "==", categoryId)
+      where23("isActive", "==", true),
+      where23("categoryId", "==", categoryId)
     );
-    const snapshot = await getDocs21(q);
+    const snapshot = await getDocs23(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -10024,16 +10394,16 @@ var TechnologyService = class extends BaseService {
    * @returns Lista aktivnih tehnologija
    */
   async getAllBySubcategoryId(subcategoryId) {
-    const q = query21(
+    const q = query23(
       this.getTechnologiesRef(),
-      where21("isActive", "==", true),
-      where21("subcategoryId", "==", subcategoryId)
+      where23("isActive", "==", true),
+      where23("subcategoryId", "==", subcategoryId)
     );
-    const snapshot = await getDocs21(q);
+    const snapshot = await getDocs23(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -10048,8 +10418,8 @@ var TechnologyService = class extends BaseService {
       ...technology,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, updateData);
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, updateData);
     return this.getById(technologyId);
   }
   /**
@@ -10067,8 +10437,8 @@ var TechnologyService = class extends BaseService {
    * @returns Tehnologija ili null ako ne postoji
    */
   async getById(technologyId) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    const docSnap = await getDoc27(docRef);
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    const docSnap = await getDoc28(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -10082,9 +10452,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija sa novim zahtevom
    */
   async addRequirement(technologyId, requirement) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
     const requirementType = requirement.type === "pre" ? "requirements.pre" : "requirements.post";
-    await updateDoc25(docRef, {
+    await updateDoc26(docRef, {
       [requirementType]: arrayUnion5(requirement),
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -10097,10 +10467,10 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija bez uklonjenog zahteva
    */
   async removeRequirement(technologyId, requirement) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
     const requirementType = requirement.type === "pre" ? "requirements.pre" : "requirements.post";
-    await updateDoc25(docRef, {
-      [requirementType]: arrayRemove3(requirement),
+    await updateDoc26(docRef, {
+      [requirementType]: arrayRemove4(requirement),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -10137,8 +10507,8 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addBlockingCondition(technologyId, condition) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
       blockingConditions: arrayUnion5(condition),
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -10151,9 +10521,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeBlockingCondition(technologyId, condition) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
-      blockingConditions: arrayRemove3(condition),
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
+      blockingConditions: arrayRemove4(condition),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -10165,8 +10535,8 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addContraindication(technologyId, contraindication) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
       contraindications: arrayUnion5(contraindication),
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -10179,9 +10549,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeContraindication(technologyId, contraindication) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
-      contraindications: arrayRemove3(contraindication),
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
+      contraindications: arrayRemove4(contraindication),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -10193,8 +10563,8 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async addBenefit(technologyId, benefit) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
       benefits: arrayUnion5(benefit),
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -10207,9 +10577,9 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async removeBenefit(technologyId, benefit) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
-      benefits: arrayRemove3(benefit),
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
+      benefits: arrayRemove4(benefit),
       updatedAt: /* @__PURE__ */ new Date()
     });
     return this.getById(technologyId);
@@ -10248,8 +10618,8 @@ var TechnologyService = class extends BaseService {
    * @returns Ažurirana tehnologija
    */
   async updateCertificationRequirement(technologyId, certificationRequirement) {
-    const docRef = doc24(this.getTechnologiesRef(), technologyId);
-    await updateDoc25(docRef, {
+    const docRef = doc25(this.getTechnologiesRef(), technologyId);
+    await updateDoc26(docRef, {
       certificationRequirement,
       updatedAt: /* @__PURE__ */ new Date()
     });
@@ -10351,13 +10721,13 @@ var TechnologyService = class extends BaseService {
 // src/backoffice/services/product.service.ts
 import {
   addDoc as addDoc8,
-  collection as collection23,
-  doc as doc25,
-  getDoc as getDoc28,
-  getDocs as getDocs22,
-  query as query22,
-  updateDoc as updateDoc26,
-  where as where22
+  collection as collection25,
+  doc as doc26,
+  getDoc as getDoc29,
+  getDocs as getDocs24,
+  query as query24,
+  updateDoc as updateDoc27,
+  where as where24
 } from "firebase/firestore";
 
 // src/backoffice/types/product.types.ts
@@ -10371,7 +10741,7 @@ var ProductService = class extends BaseService {
    * @returns Firestore collection reference
    */
   getProductsRef(technologyId) {
-    return collection23(
+    return collection25(
       this.db,
       TECHNOLOGIES_COLLECTION,
       technologyId,
@@ -10401,15 +10771,15 @@ var ProductService = class extends BaseService {
    * Gets all products for a technology
    */
   async getAllByTechnology(technologyId) {
-    const q = query22(
+    const q = query24(
       this.getProductsRef(technologyId),
-      where22("isActive", "==", true)
+      where24("isActive", "==", true)
     );
-    const snapshot = await getDocs22(q);
+    const snapshot = await getDocs24(q);
     return snapshot.docs.map(
-      (doc26) => ({
-        id: doc26.id,
-        ...doc26.data()
+      (doc27) => ({
+        id: doc27.id,
+        ...doc27.data()
       })
     );
   }
@@ -10417,21 +10787,21 @@ var ProductService = class extends BaseService {
    * Gets all products for a brand by filtering through all technologies
    */
   async getAllByBrand(brandId) {
-    const allTechnologiesRef = collection23(this.db, TECHNOLOGIES_COLLECTION);
-    const technologiesSnapshot = await getDocs22(allTechnologiesRef);
+    const allTechnologiesRef = collection25(this.db, TECHNOLOGIES_COLLECTION);
+    const technologiesSnapshot = await getDocs24(allTechnologiesRef);
     const products = [];
     for (const techDoc of technologiesSnapshot.docs) {
-      const q = query22(
+      const q = query24(
         this.getProductsRef(techDoc.id),
-        where22("brandId", "==", brandId),
-        where22("isActive", "==", true)
+        where24("brandId", "==", brandId),
+        where24("isActive", "==", true)
       );
-      const snapshot = await getDocs22(q);
+      const snapshot = await getDocs24(q);
       products.push(
         ...snapshot.docs.map(
-          (doc26) => ({
-            id: doc26.id,
-            ...doc26.data()
+          (doc27) => ({
+            id: doc27.id,
+            ...doc27.data()
           })
         )
       );
@@ -10446,8 +10816,8 @@ var ProductService = class extends BaseService {
       ...product,
       updatedAt: /* @__PURE__ */ new Date()
     };
-    const docRef = doc25(this.getProductsRef(technologyId), productId);
-    await updateDoc26(docRef, updateData);
+    const docRef = doc26(this.getProductsRef(technologyId), productId);
+    await updateDoc27(docRef, updateData);
     return this.getById(technologyId, productId);
   }
   /**
@@ -10462,8 +10832,8 @@ var ProductService = class extends BaseService {
    * Gets a product by ID
    */
   async getById(technologyId, productId) {
-    const docRef = doc25(this.getProductsRef(technologyId), productId);
-    const docSnap = await getDoc28(docRef);
+    const docRef = doc26(this.getProductsRef(technologyId), productId);
+    const docSnap = await getDoc29(docRef);
     if (!docSnap.exists()) return null;
     return {
       id: docSnap.id,
@@ -10678,7 +11048,9 @@ export {
   preRequirementNotificationSchema,
   procedureCategorizationSchema,
   procedureInfoSchema,
+  requesterInfoSchema,
   reviewInfoSchema,
+  searchPatientsSchema,
   serviceInfoSchema,
   syncedCalendarEventSchema,
   timeSlotSchema2 as timeSlotSchema,