@blackcode_sa/metaestetics-api 1.13.11 → 1.13.14

package/dist/index.d.mts

@@ -6600,12 +6600,14 @@ declare class ClinicService extends BaseService {
     activateClinic(clinicId: string, adminId: string): Promise<void>;
     /**
      * Dohvata kliniku po ID-u
+     * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
      */
-    getClinic(clinicId: string): Promise<Clinic | null>;
+    getClinic(clinicId: string, excludeDraftPractitioners?: boolean): Promise<Clinic | null>;
     /**
      * Dohvata sve klinike u grupi
+     * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
      */
-    getClinicsByGroup(groupId: string): Promise<Clinic[]>;
+    getClinicsByGroup(groupId: string, excludeDraftPractitioners?: boolean): Promise<Clinic[]>;
     /**
      * Pretražuje klinike u određenom radijusu
      */
@@ -6632,15 +6634,15 @@ declare class ClinicService extends BaseService {
      * Handles both URL strings and File uploads for media fields.
      */
     createClinicBranch(clinicGroupId: string, setupData: ClinicBranchSetupData, adminId: string): Promise<Clinic>;
-    getClinicById(clinicId: string): Promise<Clinic | null>;
-    getAllClinics(pagination?: number, lastDoc?: any): Promise<{
+    getClinicById(clinicId: string, excludeDraftPractitioners?: boolean): Promise<Clinic | null>;
+    getAllClinics(pagination?: number, lastDoc?: any, excludeDraftPractitioners?: boolean): Promise<{
         clinics: Clinic[];
         lastDoc: any;
     }>;
     getAllClinicsInRange(center: {
         latitude: number;
         longitude: number;
-    }, rangeInKm: number, pagination?: number, lastDoc?: any): Promise<{
+    }, rangeInKm: number, pagination?: number, lastDoc?: any, excludeDraftPractitioners?: boolean): Promise<{
         clinics: (Clinic & {
             distance: number;
         })[];
@@ -6895,6 +6897,7 @@ declare class ProcedureService extends BaseService {
         isActive?: boolean;
         practitionerId?: string;
         clinicId?: string;
+        excludeDraftPractitioners?: boolean;
     }): Promise<{
         procedures: (Procedure & {
             distance?: number;

package/dist/index.d.ts

@@ -6600,12 +6600,14 @@ declare class ClinicService extends BaseService {
     activateClinic(clinicId: string, adminId: string): Promise<void>;
     /**
      * Dohvata kliniku po ID-u
+     * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
      */
-    getClinic(clinicId: string): Promise<Clinic | null>;
+    getClinic(clinicId: string, excludeDraftPractitioners?: boolean): Promise<Clinic | null>;
     /**
      * Dohvata sve klinike u grupi
+     * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
      */
-    getClinicsByGroup(groupId: string): Promise<Clinic[]>;
+    getClinicsByGroup(groupId: string, excludeDraftPractitioners?: boolean): Promise<Clinic[]>;
     /**
      * Pretražuje klinike u određenom radijusu
      */
@@ -6632,15 +6634,15 @@ declare class ClinicService extends BaseService {
      * Handles both URL strings and File uploads for media fields.
      */
     createClinicBranch(clinicGroupId: string, setupData: ClinicBranchSetupData, adminId: string): Promise<Clinic>;
-    getClinicById(clinicId: string): Promise<Clinic | null>;
-    getAllClinics(pagination?: number, lastDoc?: any): Promise<{
+    getClinicById(clinicId: string, excludeDraftPractitioners?: boolean): Promise<Clinic | null>;
+    getAllClinics(pagination?: number, lastDoc?: any, excludeDraftPractitioners?: boolean): Promise<{
         clinics: Clinic[];
         lastDoc: any;
     }>;
     getAllClinicsInRange(center: {
         latitude: number;
         longitude: number;
-    }, rangeInKm: number, pagination?: number, lastDoc?: any): Promise<{
+    }, rangeInKm: number, pagination?: number, lastDoc?: any, excludeDraftPractitioners?: boolean): Promise<{
         clinics: (Clinic & {
             distance: number;
         })[];
@@ -6895,6 +6897,7 @@ declare class ProcedureService extends BaseService {
         isActive?: boolean;
         practitionerId?: string;
         clinicId?: string;
+        excludeDraftPractitioners?: boolean;
     }): Promise<{
         procedures: (Procedure & {
             distance?: number;

package/dist/index.js

@@ -13530,22 +13530,63 @@ var import_zod21 = require("zod");
 var import_firestore36 = require("firebase/firestore");
 var import_geofire_common4 = require("geofire-common");
 var import_zod20 = require("zod");
-async function getClinic(db, clinicId) {
+function filterDoctorsInfo(doctorsInfo) {
+  if (!doctorsInfo || doctorsInfo.length === 0) {
+    return [];
+  }
+  return doctorsInfo.filter((doctor) => {
+    if (doctor.status === "draft" /* DRAFT */) {
+      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+    if (doctor.isActive === false) {
+      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+    return true;
+  });
+}
+function filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners = false) {
+  if (!clinic) {
+    return clinic;
+  }
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
+  if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
+    return clinic;
+  }
+  const filteredClinic = { ...clinic };
+  if (filteredClinic.doctorsInfo && filteredClinic.doctorsInfo.length > 0) {
+    const originalLength = filteredClinic.doctorsInfo.length;
+    filteredClinic.doctorsInfo = filterDoctorsInfo(filteredClinic.doctorsInfo);
+    if (filteredClinic.doctorsInfo.length !== originalLength) {
+      console.log(
+        `[CLINIC_UTILS] Filtered ${originalLength - filteredClinic.doctorsInfo.length} draft/inactive doctors from clinic ${clinic.id}`
+      );
+    }
+  }
+  return filteredClinic;
+}
+async function getClinic(db, clinicId, excludeDraftPractitioners = false) {
   const docRef = (0, import_firestore36.doc)(db, CLINICS_COLLECTION, clinicId);
   const docSnap = await (0, import_firestore36.getDoc)(docRef);
   if (docSnap.exists()) {
-    return docSnap.data();
+    const clinicData = docSnap.data();
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
   }
   return null;
 }
-async function getClinicsByGroup(db, groupId) {
+async function getClinicsByGroup(db, groupId, excludeDraftPractitioners = false) {
   const q = (0, import_firestore36.query)(
     (0, import_firestore36.collection)(db, CLINICS_COLLECTION),
     (0, import_firestore36.where)("clinicGroupId", "==", groupId),
     (0, import_firestore36.where)("isActive", "==", true)
   );
   const querySnapshot = await (0, import_firestore36.getDocs)(q);
-  return querySnapshot.docs.map((doc47) => doc47.data());
+  return querySnapshot.docs.map((doc47) => {
+    const clinicData = doc47.data();
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
+  });
 }
 async function updateClinic(db, clinicId, data, adminId, clinicAdminService, app) {
   console.log("[CLINIC] Starting clinic update", { clinicId, adminId });
@@ -13750,7 +13791,7 @@ async function getActiveClinicsByAdmin(db, adminId, clinicAdminService, clinicGr
     clinicGroupService
   );
 }
-async function getClinicById(db, clinicId) {
+async function getClinicById(db, clinicId, excludeDraftPractitioners = false) {
   try {
     const clinicRef = (0, import_firestore36.doc)(db, CLINICS_COLLECTION, clinicId);
     const clinicSnapshot = await (0, import_firestore36.getDoc)(clinicRef);
@@ -13758,16 +13799,17 @@ async function getClinicById(db, clinicId) {
       return null;
     }
     const clinicData = clinicSnapshot.data();
-    return {
+    const clinicWithId = {
       ...clinicData,
       id: clinicSnapshot.id
     };
+    return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
   } catch (error) {
     console.error("[CLINIC_UTILS] Error getting clinic by ID:", error);
     throw error;
   }
 }
-async function getAllClinics(db, pagination, lastDoc) {
+async function getAllClinics(db, pagination, lastDoc, excludeDraftPractitioners = false) {
   try {
     const clinicsCollection = (0, import_firestore36.collection)(db, CLINICS_COLLECTION);
     let clinicsQuery = (0, import_firestore36.query)(clinicsCollection);
@@ -13786,10 +13828,11 @@ async function getAllClinics(db, pagination, lastDoc) {
     const lastVisible = clinicsSnapshot.docs[clinicsSnapshot.docs.length - 1];
     const clinics = clinicsSnapshot.docs.map((doc47) => {
       const data = doc47.data();
-      return {
+      const clinicWithId = {
         ...data,
         id: doc47.id
       };
+      return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
     });
     return {
       clinics,
@@ -13800,7 +13843,7 @@ async function getAllClinics(db, pagination, lastDoc) {
     throw error;
   }
 }
-async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc) {
+async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc, excludeDraftPractitioners = false) {
   const bounds = (0, import_geofire_common4.geohashQueryBounds)(
     [center.latitude, center.longitude],
     rangeInKm * 1e3
@@ -13823,8 +13866,9 @@ async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc)
       );
       const distanceInKm = distance / 1e3;
       if (distanceInKm <= rangeInKm) {
+        const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
-          ...clinic,
+          ...filteredClinic,
           distance: distanceInKm
         });
       }
@@ -14003,6 +14047,9 @@ async function getClinicsByFilters(db, filters) {
           uniqueMap.set(c.id, c);
         }
         let clinics = Array.from(uniqueMap.values());
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const pageSize = filters.pagination || 5;
         let startIndex = 0;
@@ -14056,6 +14103,9 @@ async function getClinicsByFilters(db, filters) {
         const q = (0, import_firestore38.query)((0, import_firestore38.collection)(db, CLINICS_COLLECTION), ...constraints);
         const querySnapshot = await (0, import_firestore38.getDocs)(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[CLINIC_SERVICE] Strategy 1 success: ${clinics.length} clinics`);
@@ -14088,6 +14138,9 @@ async function getClinicsByFilters(db, filters) {
         const q = (0, import_firestore38.query)((0, import_firestore38.collection)(db, CLINICS_COLLECTION), ...constraints);
         const querySnapshot = await (0, import_firestore38.getDocs)(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[CLINIC_SERVICE] Strategy 2 success: ${clinics.length} clinics`);
@@ -14569,15 +14622,17 @@ var ClinicService = class extends BaseService {
   }
   /**
    * Dohvata kliniku po ID-u
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinic(clinicId) {
-    return getClinic(this.db, clinicId);
+  async getClinic(clinicId, excludeDraftPractitioners = false) {
+    return getClinic(this.db, clinicId, excludeDraftPractitioners);
   }
   /**
    * Dohvata sve klinike u grupi
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinicsByGroup(groupId) {
-    return getClinicsByGroup(this.db, groupId);
+  async getClinicsByGroup(groupId, excludeDraftPractitioners = false) {
+    return getClinicsByGroup(this.db, groupId, excludeDraftPractitioners);
   }
   /**
    * Pretražuje klinike u određenom radijusu
@@ -14677,19 +14732,20 @@ var ClinicService = class extends BaseService {
     });
     return clinic;
   }
-  async getClinicById(clinicId) {
-    return getClinicById(this.db, clinicId);
+  async getClinicById(clinicId, excludeDraftPractitioners = false) {
+    return getClinicById(this.db, clinicId, excludeDraftPractitioners);
   }
-  async getAllClinics(pagination, lastDoc) {
-    return getAllClinics(this.db, pagination, lastDoc);
+  async getAllClinics(pagination, lastDoc, excludeDraftPractitioners = false) {
+    return getAllClinics(this.db, pagination, lastDoc, excludeDraftPractitioners);
   }
-  async getAllClinicsInRange(center, rangeInKm, pagination, lastDoc) {
+  async getAllClinicsInRange(center, rangeInKm, pagination, lastDoc, excludeDraftPractitioners = false) {
     return getAllClinicsInRange(
       this.db,
       center,
       rangeInKm,
       pagination,
-      lastDoc
+      lastDoc,
+      excludeDraftPractitioners
     );
   }
   /**
@@ -20035,7 +20091,11 @@ var ProcedureService = class extends BaseService {
    * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn("[ProcedureService] practitionerService not available - skipping filtering");
+      }
       return procedures;
     }
     try {
@@ -21130,6 +21190,7 @@ var ProcedureService = class extends BaseService {
   async getProceduresByFilters(filters) {
     try {
       console.log("[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies");
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners);
       if (filters.location && filters.radiusInKm) {
         console.log("[PROCEDURE_SERVICE] Executing geo query:", {
           location: filters.location,
@@ -21219,7 +21280,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21260,7 +21323,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21341,7 +21406,9 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21373,7 +21440,9 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures`);
         if (procedures.length < (filters.pagination || 10)) {
@@ -21704,17 +21773,21 @@ var ProcedureService = class extends BaseService {
   async getProceduresForMap() {
     const proceduresRef = (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION);
     const snapshot = await (0, import_firestore58.getDocs)(proceduresRef);
-    const proceduresForMap = snapshot.docs.map((doc47) => {
+    let procedures = snapshot.docs.map((doc47) => ({
+      id: doc47.id,
+      ...doc47.data()
+    }));
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    const proceduresForMap = procedures.map((procedure) => {
       var _a, _b, _c, _d, _e, _f, _g, _h;
-      const data = doc47.data();
       return {
-        id: doc47.id,
-        name: data.name,
-        clinicId: (_a = data.clinicInfo) == null ? void 0 : _a.id,
-        clinicName: (_b = data.clinicInfo) == null ? void 0 : _b.name,
-        address: ((_d = (_c = data.clinicInfo) == null ? void 0 : _c.location) == null ? void 0 : _d.address) || "",
-        latitude: (_f = (_e = data.clinicInfo) == null ? void 0 : _e.location) == null ? void 0 : _f.latitude,
-        longitude: (_h = (_g = data.clinicInfo) == null ? void 0 : _g.location) == null ? void 0 : _h.longitude
+        id: procedure.id,
+        name: procedure.name,
+        clinicId: (_a = procedure.clinicInfo) == null ? void 0 : _a.id,
+        clinicName: (_b = procedure.clinicInfo) == null ? void 0 : _b.name,
+        address: ((_d = (_c = procedure.clinicInfo) == null ? void 0 : _c.location) == null ? void 0 : _d.address) || "",
+        latitude: (_f = (_e = procedure.clinicInfo) == null ? void 0 : _e.location) == null ? void 0 : _f.latitude,
+        longitude: (_h = (_g = procedure.clinicInfo) == null ? void 0 : _g.location) == null ? void 0 : _h.longitude
       };
     });
     return proceduresForMap;
@@ -21751,10 +21824,12 @@ var ProcedureService = class extends BaseService {
       (0, import_firestore58.orderBy)("name", "asc")
     );
     const querySnapshot = await (0, import_firestore58.getDocs)(proceduresQuery);
-    return querySnapshot.docs.map((doc47) => ({
+    let procedures = querySnapshot.docs.map((doc47) => ({
       id: doc47.id,
       ...doc47.data()
     }));
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    return procedures;
   }
 };
 

package/dist/index.mjs

@@ -13604,22 +13604,63 @@ import {
   geohashQueryBounds
 } from "geofire-common";
 import { z as z20 } from "zod";
-async function getClinic(db, clinicId) {
+function filterDoctorsInfo(doctorsInfo) {
+  if (!doctorsInfo || doctorsInfo.length === 0) {
+    return [];
+  }
+  return doctorsInfo.filter((doctor) => {
+    if (doctor.status === "draft" /* DRAFT */) {
+      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+    if (doctor.isActive === false) {
+      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+    return true;
+  });
+}
+function filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners = false) {
+  if (!clinic) {
+    return clinic;
+  }
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
+  if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
+    return clinic;
+  }
+  const filteredClinic = { ...clinic };
+  if (filteredClinic.doctorsInfo && filteredClinic.doctorsInfo.length > 0) {
+    const originalLength = filteredClinic.doctorsInfo.length;
+    filteredClinic.doctorsInfo = filterDoctorsInfo(filteredClinic.doctorsInfo);
+    if (filteredClinic.doctorsInfo.length !== originalLength) {
+      console.log(
+        `[CLINIC_UTILS] Filtered ${originalLength - filteredClinic.doctorsInfo.length} draft/inactive doctors from clinic ${clinic.id}`
+      );
+    }
+  }
+  return filteredClinic;
+}
+async function getClinic(db, clinicId, excludeDraftPractitioners = false) {
   const docRef = doc23(db, CLINICS_COLLECTION, clinicId);
   const docSnap = await getDoc25(docRef);
   if (docSnap.exists()) {
-    return docSnap.data();
+    const clinicData = docSnap.data();
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
   }
   return null;
 }
-async function getClinicsByGroup(db, groupId) {
+async function getClinicsByGroup(db, groupId, excludeDraftPractitioners = false) {
   const q = query17(
     collection17(db, CLINICS_COLLECTION),
     where17("clinicGroupId", "==", groupId),
     where17("isActive", "==", true)
   );
   const querySnapshot = await getDocs17(q);
-  return querySnapshot.docs.map((doc47) => doc47.data());
+  return querySnapshot.docs.map((doc47) => {
+    const clinicData = doc47.data();
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
+  });
 }
 async function updateClinic(db, clinicId, data, adminId, clinicAdminService, app) {
   console.log("[CLINIC] Starting clinic update", { clinicId, adminId });
@@ -13824,7 +13865,7 @@ async function getActiveClinicsByAdmin(db, adminId, clinicAdminService, clinicGr
     clinicGroupService
   );
 }
-async function getClinicById(db, clinicId) {
+async function getClinicById(db, clinicId, excludeDraftPractitioners = false) {
   try {
     const clinicRef = doc23(db, CLINICS_COLLECTION, clinicId);
     const clinicSnapshot = await getDoc25(clinicRef);
@@ -13832,16 +13873,17 @@ async function getClinicById(db, clinicId) {
       return null;
     }
     const clinicData = clinicSnapshot.data();
-    return {
+    const clinicWithId = {
       ...clinicData,
       id: clinicSnapshot.id
     };
+    return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
   } catch (error) {
     console.error("[CLINIC_UTILS] Error getting clinic by ID:", error);
     throw error;
   }
 }
-async function getAllClinics(db, pagination, lastDoc) {
+async function getAllClinics(db, pagination, lastDoc, excludeDraftPractitioners = false) {
   try {
     const clinicsCollection = collection17(db, CLINICS_COLLECTION);
     let clinicsQuery = query17(clinicsCollection);
@@ -13860,10 +13902,11 @@ async function getAllClinics(db, pagination, lastDoc) {
     const lastVisible = clinicsSnapshot.docs[clinicsSnapshot.docs.length - 1];
     const clinics = clinicsSnapshot.docs.map((doc47) => {
       const data = doc47.data();
-      return {
+      const clinicWithId = {
         ...data,
         id: doc47.id
       };
+      return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
     });
     return {
       clinics,
@@ -13874,7 +13917,7 @@ async function getAllClinics(db, pagination, lastDoc) {
     throw error;
   }
 }
-async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc) {
+async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc, excludeDraftPractitioners = false) {
   const bounds = geohashQueryBounds(
     [center.latitude, center.longitude],
     rangeInKm * 1e3
@@ -13897,8 +13940,9 @@ async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc)
       );
       const distanceInKm = distance / 1e3;
       if (distanceInKm <= rangeInKm) {
+        const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
-          ...clinic,
+          ...filteredClinic,
           distance: distanceInKm
         });
       }
@@ -14090,6 +14134,9 @@ async function getClinicsByFilters(db, filters) {
           uniqueMap.set(c.id, c);
         }
         let clinics = Array.from(uniqueMap.values());
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const pageSize = filters.pagination || 5;
         let startIndex = 0;
@@ -14143,6 +14190,9 @@ async function getClinicsByFilters(db, filters) {
         const q = query19(collection19(db, CLINICS_COLLECTION), ...constraints);
         const querySnapshot = await getDocs19(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[CLINIC_SERVICE] Strategy 1 success: ${clinics.length} clinics`);
@@ -14175,6 +14225,9 @@ async function getClinicsByFilters(db, filters) {
         const q = query19(collection19(db, CLINICS_COLLECTION), ...constraints);
         const querySnapshot = await getDocs19(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
+        const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[CLINIC_SERVICE] Strategy 2 success: ${clinics.length} clinics`);
@@ -14656,15 +14709,17 @@ var ClinicService = class extends BaseService {
   }
   /**
    * Dohvata kliniku po ID-u
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinic(clinicId) {
-    return getClinic(this.db, clinicId);
+  async getClinic(clinicId, excludeDraftPractitioners = false) {
+    return getClinic(this.db, clinicId, excludeDraftPractitioners);
   }
   /**
    * Dohvata sve klinike u grupi
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinicsByGroup(groupId) {
-    return getClinicsByGroup(this.db, groupId);
+  async getClinicsByGroup(groupId, excludeDraftPractitioners = false) {
+    return getClinicsByGroup(this.db, groupId, excludeDraftPractitioners);
   }
   /**
    * Pretražuje klinike u određenom radijusu
@@ -14764,19 +14819,20 @@ var ClinicService = class extends BaseService {
     });
     return clinic;
   }
-  async getClinicById(clinicId) {
-    return getClinicById(this.db, clinicId);
+  async getClinicById(clinicId, excludeDraftPractitioners = false) {
+    return getClinicById(this.db, clinicId, excludeDraftPractitioners);
   }
-  async getAllClinics(pagination, lastDoc) {
-    return getAllClinics(this.db, pagination, lastDoc);
+  async getAllClinics(pagination, lastDoc, excludeDraftPractitioners = false) {
+    return getAllClinics(this.db, pagination, lastDoc, excludeDraftPractitioners);
   }
-  async getAllClinicsInRange(center, rangeInKm, pagination, lastDoc) {
+  async getAllClinicsInRange(center, rangeInKm, pagination, lastDoc, excludeDraftPractitioners = false) {
     return getAllClinicsInRange(
       this.db,
       center,
       rangeInKm,
       pagination,
-      lastDoc
+      lastDoc,
+      excludeDraftPractitioners
     );
   }
   /**
@@ -20271,7 +20327,11 @@ var ProcedureService = class extends BaseService {
    * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn("[ProcedureService] practitionerService not available - skipping filtering");
+      }
       return procedures;
     }
     try {
@@ -21366,6 +21426,7 @@ var ProcedureService = class extends BaseService {
   async getProceduresByFilters(filters) {
     try {
       console.log("[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies");
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners);
       if (filters.location && filters.radiusInKm) {
         console.log("[PROCEDURE_SERVICE] Executing geo query:", {
           location: filters.location,
@@ -21455,7 +21516,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21496,7 +21559,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21577,7 +21642,9 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21609,7 +21676,9 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures`);
         if (procedures.length < (filters.pagination || 10)) {
@@ -21940,17 +22009,21 @@ var ProcedureService = class extends BaseService {
   async getProceduresForMap() {
     const proceduresRef = collection33(this.db, PROCEDURES_COLLECTION);
     const snapshot = await getDocs33(proceduresRef);
-    const proceduresForMap = snapshot.docs.map((doc47) => {
+    let procedures = snapshot.docs.map((doc47) => ({
+      id: doc47.id,
+      ...doc47.data()
+    }));
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    const proceduresForMap = procedures.map((procedure) => {
       var _a, _b, _c, _d, _e, _f, _g, _h;
-      const data = doc47.data();
       return {
-        id: doc47.id,
-        name: data.name,
-        clinicId: (_a = data.clinicInfo) == null ? void 0 : _a.id,
-        clinicName: (_b = data.clinicInfo) == null ? void 0 : _b.name,
-        address: ((_d = (_c = data.clinicInfo) == null ? void 0 : _c.location) == null ? void 0 : _d.address) || "",
-        latitude: (_f = (_e = data.clinicInfo) == null ? void 0 : _e.location) == null ? void 0 : _f.latitude,
-        longitude: (_h = (_g = data.clinicInfo) == null ? void 0 : _g.location) == null ? void 0 : _h.longitude
+        id: procedure.id,
+        name: procedure.name,
+        clinicId: (_a = procedure.clinicInfo) == null ? void 0 : _a.id,
+        clinicName: (_b = procedure.clinicInfo) == null ? void 0 : _b.name,
+        address: ((_d = (_c = procedure.clinicInfo) == null ? void 0 : _c.location) == null ? void 0 : _d.address) || "",
+        latitude: (_f = (_e = procedure.clinicInfo) == null ? void 0 : _e.location) == null ? void 0 : _f.latitude,
+        longitude: (_h = (_g = procedure.clinicInfo) == null ? void 0 : _g.location) == null ? void 0 : _h.longitude
       };
     });
     return proceduresForMap;
@@ -21987,10 +22060,12 @@ var ProcedureService = class extends BaseService {
       orderBy18("name", "asc")
     );
     const querySnapshot = await getDocs33(proceduresQuery);
-    return querySnapshot.docs.map((doc47) => ({
+    let procedures = querySnapshot.docs.map((doc47) => ({
       id: doc47.id,
       ...doc47.data()
     }));
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    return procedures;
   }
 };
 

package/package.json

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

package/src/services/clinic/clinic.service.ts

@@ -468,16 +468,18 @@ export class ClinicService extends BaseService {
 
   /**
    * Dohvata kliniku po ID-u
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinic(clinicId: string): Promise<Clinic | null> {
-    return ClinicUtils.getClinic(this.db, clinicId);
+  async getClinic(clinicId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic | null> {
+    return ClinicUtils.getClinic(this.db, clinicId, excludeDraftPractitioners);
   }
 
   /**
    * Dohvata sve klinike u grupi
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinicsByGroup(groupId: string): Promise<Clinic[]> {
-    return ClinicUtils.getClinicsByGroup(this.db, groupId);
+  async getClinicsByGroup(groupId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic[]> {
+    return ClinicUtils.getClinicsByGroup(this.db, groupId, excludeDraftPractitioners);
   }
 
   /**
@@ -624,29 +626,32 @@ export class ClinicService extends BaseService {
     return clinic;
   }
 
-  async getClinicById(clinicId: string): Promise<Clinic | null> {
-    return ClinicUtils.getClinicById(this.db, clinicId);
+  async getClinicById(clinicId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic | null> {
+    return ClinicUtils.getClinicById(this.db, clinicId, excludeDraftPractitioners);
   }
 
   async getAllClinics(
     pagination?: number,
-    lastDoc?: any
+    lastDoc?: any,
+    excludeDraftPractitioners: boolean = false
   ): Promise<{ clinics: Clinic[]; lastDoc: any }> {
-    return ClinicUtils.getAllClinics(this.db, pagination, lastDoc);
+    return ClinicUtils.getAllClinics(this.db, pagination, lastDoc, excludeDraftPractitioners);
   }
 
   async getAllClinicsInRange(
     center: { latitude: number; longitude: number },
     rangeInKm: number,
     pagination?: number,
-    lastDoc?: any
+    lastDoc?: any,
+    excludeDraftPractitioners: boolean = false
   ): Promise<{ clinics: (Clinic & { distance: number })[]; lastDoc: any }> {
     return ClinicUtils.getAllClinicsInRange(
       this.db,
       center,
       rangeInKm,
       pagination,
-      lastDoc
+      lastDoc,
+      excludeDraftPractitioners
     );
   }
 

package/src/services/clinic/utils/clinic.utils.ts

@@ -24,7 +24,9 @@ import {
   ClinicGroup,
   ClinicBranchSetupData,
   ClinicLocation,
+  DoctorInfo,
 } from "../../../types/clinic";
+import { PractitionerStatus } from "../../../types/practitioner";
 import {
   geohashForLocation,
   distanceBetween,
@@ -384,15 +386,84 @@ export async function createClinic(
  * @param clinicId - ID of the clinic to get
  * @returns The clinic or null if not found
  */
+/**
+ * Filters out draft/inactive practitioners from doctorsInfo array
+ * @param doctorsInfo Array of doctor info objects
+ * @returns Filtered array excluding draft or inactive practitioners
+ */
+function filterDoctorsInfo(doctorsInfo: DoctorInfo[]): DoctorInfo[] {
+  if (!doctorsInfo || doctorsInfo.length === 0) {
+    return [];
+  }
+
+  return doctorsInfo.filter((doctor) => {
+    // Filter out if status is DRAFT
+    if (doctor.status === PractitionerStatus.DRAFT) {
+      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+
+    // Filter out if isActive is explicitly false
+    if (doctor.isActive === false) {
+      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+
+    // Include if status is ACTIVE or undefined (backward compatibility) and isActive is true or undefined
+    return true;
+  });
+}
+
+/**
+ * Filters embedded arrays in a Clinic object to exclude draft/inactive practitioners
+ * @param clinic Clinic object to filter
+ * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
+ * @returns Clinic object with filtered embedded arrays
+ */
+export function filterClinicEmbeddedArrays(clinic: Clinic, excludeDraftPractitioners: boolean = false): Clinic {
+  if (!clinic) {
+    return clinic;
+  }
+
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
+
+  // If excluding drafts is disabled (default), return clinic as-is (for admin views)
+  if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
+    return clinic;
+  }
+
+  const filteredClinic = { ...clinic };
+
+  // Filter doctorsInfo array
+  if (filteredClinic.doctorsInfo && filteredClinic.doctorsInfo.length > 0) {
+    const originalLength = filteredClinic.doctorsInfo.length;
+    filteredClinic.doctorsInfo = filterDoctorsInfo(filteredClinic.doctorsInfo);
+    if (filteredClinic.doctorsInfo.length !== originalLength) {
+      console.log(
+        `[CLINIC_UTILS] Filtered ${originalLength - filteredClinic.doctorsInfo.length} draft/inactive doctors from clinic ${clinic.id}`
+      );
+    }
+  }
+
+  // Note: proceduresInfo doesn't have embedded status/isActive, so we rely on
+  // Cloud Functions to not include procedures from draft/inactive practitioners.
+  // If needed, we could add additional filtering here by checking practitioner status.
+
+  return filteredClinic;
+}
+
 export async function getClinic(
   db: Firestore,
-  clinicId: string
+  clinicId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic | null> {
   const docRef = doc(db, CLINICS_COLLECTION, clinicId);
   const docSnap = await getDoc(docRef);
 
   if (docSnap.exists()) {
-    return docSnap.data() as Clinic;
+    const clinicData = docSnap.data() as Clinic;
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
   }
 
   return null;
@@ -406,7 +477,8 @@ export async function getClinic(
  */
 export async function getClinicsByGroup(
   db: Firestore,
-  groupId: string
+  groupId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic[]> {
   const q = query(
     collection(db, CLINICS_COLLECTION),
@@ -415,7 +487,10 @@ export async function getClinicsByGroup(
   );
 
   const querySnapshot = await getDocs(q);
-  return querySnapshot.docs.map((doc) => doc.data() as Clinic);
+  return querySnapshot.docs.map((doc) => {
+    const clinicData = doc.data() as Clinic;
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
+  });
 }
 
 /**
@@ -789,7 +864,8 @@ export async function getActiveClinicsByAdmin(
  */
 export async function getClinicById(
   db: Firestore,
-  clinicId: string
+  clinicId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic | null> {
   try {
     const clinicRef = doc(db, CLINICS_COLLECTION, clinicId);
@@ -800,10 +876,11 @@ export async function getClinicById(
     }
 
     const clinicData = clinicSnapshot.data() as Clinic;
-    return {
+    const clinicWithId = {
       ...clinicData,
       id: clinicSnapshot.id,
     };
+    return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
   } catch (error) {
     console.error("[CLINIC_UTILS] Error getting clinic by ID:", error);
     throw error;
@@ -821,7 +898,8 @@ export async function getClinicById(
 export async function getAllClinics(
   db: Firestore,
   pagination?: number,
-  lastDoc?: any
+  lastDoc?: any,
+  excludeDraftPractitioners: boolean = false
 ): Promise<{ clinics: Clinic[]; lastDoc: any }> {
   try {
     const clinicsCollection = collection(db, CLINICS_COLLECTION);
@@ -845,10 +923,11 @@ export async function getAllClinics(
 
     const clinics = clinicsSnapshot.docs.map((doc) => {
       const data = doc.data() as Clinic;
-      return {
+      const clinicWithId = {
         ...data,
         id: doc.id,
       };
+      return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
     });
 
     return {
@@ -876,7 +955,8 @@ export async function getAllClinicsInRange(
   center: { latitude: number; longitude: number },
   rangeInKm: number,
   pagination?: number,
-  lastDoc?: any
+  lastDoc?: any,
+  excludeDraftPractitioners: boolean = false
 ): Promise<{ clinics: (Clinic & { distance: number })[]; lastDoc: any }> {
   const bounds = geohashQueryBounds(
     [center.latitude, center.longitude],
@@ -907,8 +987,9 @@ export async function getAllClinicsInRange(
       const distanceInKm = distance / 1000;
 
       if (distanceInKm <= rangeInKm) {
+        const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
-          ...clinic,
+          ...filteredClinic,
           distance: distanceInKm,
         });
       }

package/src/services/clinic/utils/filter.utils.ts

@@ -12,6 +12,7 @@ import {
 } from 'firebase/firestore';
 import { Clinic, ClinicTag, CLINICS_COLLECTION } from '../../../types/clinic';
 import { geohashQueryBounds, distanceBetween } from 'geofire-common';
+import { filterClinicEmbeddedArrays } from './clinic.utils';
 
 /**
  * Get clinics based on multiple filtering criteria with fallback strategies
@@ -36,6 +37,7 @@ export async function getClinicsByFilters(
     pagination?: number;
     lastDoc?: any;
     isActive?: boolean;
+    excludeDraftPractitioners?: boolean; // If true, filters out draft/inactive practitioners. If false (default), returns all
   },
 ): Promise<{
   clinics: (Clinic & { distance?: number })[];
@@ -94,6 +96,11 @@ export async function getClinicsByFilters(
         }
         let clinics = Array.from(uniqueMap.values());
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply all remaining filters and compute exact distance + sorting
         clinics = applyInMemoryFilters(clinics, filters);
 
@@ -162,6 +169,11 @@ export async function getClinicsByFilters(
         const querySnapshot = await getDocs(q);
         let clinics = querySnapshot.docs.map((doc) => ({ ...doc.data(), id: doc.id } as Clinic));
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply in-memory filters
         clinics = applyInMemoryFilters(clinics, filters);
 
@@ -205,6 +217,11 @@ export async function getClinicsByFilters(
         const querySnapshot = await getDocs(q);
         let clinics = querySnapshot.docs.map((doc) => ({ ...doc.data(), id: doc.id } as Clinic));
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply in-memory filters
         clinics = applyInMemoryFilters(clinics, filters);
 

package/src/services/procedure/procedure.service.ts

@@ -105,7 +105,11 @@ export class ProcedureService extends BaseService {
   private async filterDraftPractitionerProcedures(
     procedures: Procedure[]
   ): Promise<Procedure[]> {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn('[ProcedureService] practitionerService not available - skipping filtering');
+      }
       return procedures;
     }
 
@@ -1533,12 +1537,14 @@ export class ProcedureService extends BaseService {
     isActive?: boolean;
     practitionerId?: string;
     clinicId?: string;
+    excludeDraftPractitioners?: boolean;
   }): Promise<{
     procedures: (Procedure & { distance?: number })[];
     lastDoc: any;
   }> {
     try {
       console.log('[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies');
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners)
 
       // Geo query debug i validacija
       if (filters.location && filters.radiusInKm) {
@@ -1652,8 +1658,10 @@ export class ProcedureService extends BaseService {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
           
-          // Filter out procedures from draft practitioners
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          // Filter out procedures from draft practitioners if requested
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           
           const lastDoc =
             querySnapshot.docs.length > 0
@@ -1713,7 +1721,9 @@ export class ProcedureService extends BaseService {
           }
           
           // Filter out procedures from draft practitioners
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if(filters.excludeDraftPractitioners){
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           
           const lastDoc =
             querySnapshot.docs.length > 0
@@ -1826,7 +1836,9 @@ export class ProcedureService extends BaseService {
         procedures = this.applyInMemoryFilters(procedures, filters);
         
         // Filter out procedures from draft practitioners
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         
         console.log('[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):', {
           procedureCount: procedures.length,
@@ -1870,7 +1882,9 @@ export class ProcedureService extends BaseService {
         procedures = this.applyInMemoryFilters(procedures, filters);
         
         // Filter out procedures from draft practitioners
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
 
         const lastDoc =
           querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -2300,18 +2314,23 @@ export class ProcedureService extends BaseService {
   > {
     const proceduresRef = collection(this.db, PROCEDURES_COLLECTION);
     const snapshot = await getDocs(proceduresRef);
-    const proceduresForMap = snapshot.docs.map(doc => {
-      const data = doc.data();
-      return {
-        id: doc.id,
-        name: data.name,
-        clinicId: data.clinicInfo?.id,
-        clinicName: data.clinicInfo?.name,
-        address: data.clinicInfo?.location?.address || '',
-        latitude: data.clinicInfo?.location?.latitude,
-        longitude: data.clinicInfo?.location?.longitude,
-      };
-    });
+    let procedures = snapshot.docs.map(doc => ({
+      id: doc.id,
+      ...doc.data(),
+    } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+
+    const proceduresForMap = procedures.map(procedure => ({
+      id: procedure.id,
+      name: procedure.name,
+      clinicId: procedure.clinicInfo?.id,
+      clinicName: procedure.clinicInfo?.name,
+      address: procedure.clinicInfo?.location?.address || '',
+      latitude: procedure.clinicInfo?.location?.latitude,
+      longitude: procedure.clinicInfo?.location?.longitude,
+    }));
     return proceduresForMap;
   }
 
@@ -2363,9 +2382,14 @@ export class ProcedureService extends BaseService {
 
     const querySnapshot = await getDocs(proceduresQuery);
     
-    return querySnapshot.docs.map(doc => ({
+    let procedures = querySnapshot.docs.map(doc => ({
       id: doc.id,
       ...doc.data(),
     } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    
+    return procedures;
   }
 }