@blackcode_sa/metaestetics-api 1.13.5 → 1.13.8

package/dist/index.d.ts

@@ -6693,7 +6693,15 @@ declare class ProcedureService extends BaseService {
     private technologyService;
     private productService;
     private mediaService;
+    private practitionerService?;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, categoryService: CategoryService, subcategoryService: SubcategoryService, technologyService: TechnologyService, productService: ProductService, mediaService: MediaService);
+    setPractitionerService(practitionerService: PractitionerService): void;
+    /**
+     * Filters out procedures from draft practitioners
+     * @param procedures - Array of procedures to filter
+     * @returns Filtered array of procedures (excluding those from draft practitioners)
+     */
+    private filterDraftPractitionerProcedures;
     /**
      * Process media resource (string URL or File object)
      * @param media String URL or File object
@@ -6782,9 +6790,10 @@ declare class ProcedureService extends BaseService {
      * Gets all procedures for a practitioner
      * @param practitionerId - The ID of the practitioner
      * @param clinicBranchId - Optional clinic branch ID to filter by
+     * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status
      * @returns List of procedures
      */
-    getProceduresByPractitioner(practitionerId: string, clinicBranchId?: string): Promise<Procedure[]>;
+    getProceduresByPractitioner(practitionerId: string, clinicBranchId?: string, excludeDraftPractitioners?: boolean): Promise<Procedure[]>;
     /**
      * Gets all inactive procedures for a practitioner
      * @param practitionerId - The ID of the practitioner
@@ -6825,9 +6834,10 @@ declare class ProcedureService extends BaseService {
      *
      * @param pagination - Optional number of procedures per page (0 or undefined returns all)
      * @param lastDoc - Optional last document for pagination (if continuing from a previous page)
+     * @param excludeDraftPractitioners - Whether to exclude procedures from draft practitioners (default: true)
      * @returns Object containing procedures array and the last document for pagination
      */
-    getAllProcedures(pagination?: number, lastDoc?: any): Promise<{
+    getAllProcedures(pagination?: number, lastDoc?: any, excludeDraftPractitioners?: boolean): Promise<{
         procedures: Procedure[];
         lastDoc: any;
     }>;
@@ -6924,7 +6934,7 @@ declare class PractitionerService extends BaseService {
     private mediaService;
     private procedureService?;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, clinicService?: ClinicService, procedureService?: ProcedureService);
-    private getClinicService;
+    getClinicService(): ClinicService;
     private getProcedureService;
     setClinicService(clinicService: ClinicService): void;
     setProcedureService(procedureService: ProcedureService): void;
@@ -6992,6 +7002,19 @@ declare class PractitionerService extends BaseService {
      * Dohvata zdravstvenog radnika po User ID-u
      */
     getPractitionerByUserRef(userRef: string): Promise<Practitioner | null>;
+    /**
+     * Finds a draft practitioner profile by email address
+     * Used to detect if a draft profile exists when a doctor registers without a token
+     *
+     * @param email - Email address to search for
+     * @returns Draft practitioner profile if found, null otherwise
+     *
+     * @remarks
+     * Requires Firestore composite index on:
+     * - Collection: practitioners
+     * - Fields: basicInfo.email (Ascending), status (Ascending), userRef (Ascending)
+     */
+    findDraftPractitionerByEmail(email: string): Promise<Practitioner | null>;
     /**
      * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
      */

package/dist/index.js

@@ -7319,11 +7319,12 @@ var userSchema = import_zod4.z.object({
 
 // src/errors/auth.errors.ts
 var AuthError = class extends Error {
-  constructor(message, code, status = 400) {
+  constructor(message, code, status = 400, metadata) {
     super(message);
     this.code = code;
     this.status = status;
     this.name = "AuthError";
+    this.metadata = metadata;
   }
 };
 var AUTH_ERRORS = {
@@ -7502,6 +7503,12 @@ var AUTH_ERRORS = {
     "Lozinka je previ\u0161e slaba. Molimo koristite ja\u010Du lozinku.",
     "AUTH/WEAK_PASSWORD",
     400
+  ),
+  // Draft profile exists error
+  DRAFT_PROFILE_EXISTS: new AuthError(
+    "A draft practitioner profile exists for this email. Please use your invitation code to claim it, or contact support if you don't have one.",
+    "AUTH/DRAFT_PROFILE_EXISTS",
+    409
   )
 };
 
@@ -11546,6 +11553,52 @@ var PractitionerService = class extends BaseService {
     }
     return querySnapshot.docs[0].data();
   }
+  /**
+   * Finds a draft practitioner profile by email address
+   * Used to detect if a draft profile exists when a doctor registers without a token
+   * 
+   * @param email - Email address to search for
+   * @returns Draft practitioner profile if found, null otherwise
+   * 
+   * @remarks
+   * Requires Firestore composite index on:
+   * - Collection: practitioners
+   * - Fields: basicInfo.email (Ascending), status (Ascending), userRef (Ascending)
+   */
+  async findDraftPractitionerByEmail(email) {
+    try {
+      const normalizedEmail = email.toLowerCase().trim();
+      console.log("[PRACTITIONER] Searching for draft practitioner by email", {
+        email: normalizedEmail
+      });
+      const q = (0, import_firestore32.query)(
+        (0, import_firestore32.collection)(this.db, PRACTITIONERS_COLLECTION),
+        (0, import_firestore32.where)("basicInfo.email", "==", normalizedEmail),
+        (0, import_firestore32.where)("status", "==", "draft" /* DRAFT */),
+        (0, import_firestore32.where)("userRef", "==", ""),
+        (0, import_firestore32.limit)(1)
+      );
+      const querySnapshot = await (0, import_firestore32.getDocs)(q);
+      if (querySnapshot.empty) {
+        console.log("[PRACTITIONER] No draft practitioner found for email", {
+          email: normalizedEmail
+        });
+        return null;
+      }
+      const draftPractitioner = querySnapshot.docs[0].data();
+      console.log("[PRACTITIONER] Draft practitioner found", {
+        email: normalizedEmail,
+        practitionerId: draftPractitioner.id
+      });
+      return draftPractitioner;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER] Error finding draft practitioner by email:",
+        error
+      );
+      return null;
+    }
+  }
   /**
    * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
    */
@@ -15290,7 +15343,49 @@ var AuthService = class extends BaseService {
           }
           practitioner = claimedPractitioner;
         } else {
-          console.log("[AUTH] Creating new practitioner profile");
+          console.log("[AUTH] Checking for existing draft practitioner profile", {
+            email: data.email
+          });
+          const draftPractitioner = await practitionerService.findDraftPractitionerByEmail(
+            data.email
+          );
+          if (draftPractitioner) {
+            console.log("[AUTH] Draft practitioner profile found", {
+              practitionerId: draftPractitioner.id,
+              email: data.email,
+              clinics: draftPractitioner.clinics
+            });
+            let clinicNames = [];
+            if (draftPractitioner.clinicsInfo && draftPractitioner.clinicsInfo.length > 0) {
+              clinicNames = draftPractitioner.clinicsInfo.map((clinic) => clinic.name).filter((name) => !!name);
+            } else if (draftPractitioner.clinics && draftPractitioner.clinics.length > 0) {
+              console.log("[AUTH] clinicsInfo missing, fetching clinic names from clinic IDs");
+              const clinicService = practitionerService.getClinicService();
+              const clinicNamePromises = draftPractitioner.clinics.map(async (clinicId) => {
+                try {
+                  const clinic = await clinicService.getClinic(clinicId);
+                  return (clinic == null ? void 0 : clinic.name) || null;
+                } catch (error) {
+                  console.error(`[AUTH] Error fetching clinic ${clinicId}:`, error);
+                  return null;
+                }
+              });
+              const names = await Promise.all(clinicNamePromises);
+              clinicNames = names.filter((name) => !!name);
+            }
+            await cleanupFirebaseUser(firebaseUser);
+            throw new AuthError(
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.message,
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.code,
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.status,
+              {
+                clinicNames,
+                clinics: draftPractitioner.clinics,
+                clinicsInfo: draftPractitioner.clinicsInfo
+              }
+            );
+          }
+          console.log("[AUTH] No draft profile found, creating new practitioner profile");
           const practitionerData = buildPractitionerData(data, firebaseUser.uid);
           practitioner = await practitionerService.createPractitioner(practitionerData);
         }
@@ -19923,6 +20018,53 @@ var ProcedureService = class extends BaseService {
     this.productService = productService;
     this.mediaService = mediaService;
   }
+  setPractitionerService(practitionerService) {
+    this.practitionerService = practitionerService;
+  }
+  /**
+   * Filters out procedures from draft practitioners
+   * @param procedures - Array of procedures to filter
+   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   */
+  async filterDraftPractitionerProcedures(procedures) {
+    if (!this.practitionerService || procedures.length === 0) {
+      return procedures;
+    }
+    try {
+      const practitionerIds = Array.from(
+        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+      );
+      if (practitionerIds.length === 0) {
+        return procedures;
+      }
+      const practitionerPromises = practitionerIds.map(
+        (id) => this.practitionerService.getPractitioner(id).catch(() => null)
+      );
+      const practitioners = await Promise.all(practitionerPromises);
+      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      practitioners.forEach((practitioner, index) => {
+        if (practitioner) {
+          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+        }
+      });
+      const filteredProcedures = procedures.filter((procedure) => {
+        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
+        return practitionerStatus !== "draft" /* DRAFT */;
+      });
+      if (filteredProcedures.length !== procedures.length) {
+        console.log(
+          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+        );
+      }
+      return filteredProcedures;
+    } catch (error) {
+      console.error(
+        "[ProcedureService] Error filtering draft practitioner procedures:",
+        error
+      );
+      return procedures;
+    }
+  }
   /**
    * Process media resource (string URL or File object)
    * @param media String URL or File object
@@ -20633,9 +20775,10 @@ var ProcedureService = class extends BaseService {
    * Gets all procedures for a practitioner
    * @param practitionerId - The ID of the practitioner
    * @param clinicBranchId - Optional clinic branch ID to filter by
+   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status
    * @returns List of procedures
    */
-  async getProceduresByPractitioner(practitionerId, clinicBranchId) {
+  async getProceduresByPractitioner(practitionerId, clinicBranchId, excludeDraftPractitioners = true) {
     const constraints = [
       (0, import_firestore58.where)("practitionerId", "==", practitionerId),
       (0, import_firestore58.where)("isActive", "==", true)
@@ -20648,7 +20791,19 @@ var ProcedureService = class extends BaseService {
       ...constraints
     );
     const snapshot = await (0, import_firestore58.getDocs)(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    if (excludeDraftPractitioners && this.practitionerService) {
+      try {
+        const practitioner = await this.practitionerService.getPractitioner(practitionerId);
+        if (practitioner && practitioner.status === "draft" /* DRAFT */) {
+          console.log(`[ProcedureService] Excluding procedures for draft practitioner ${practitionerId}`);
+          return [];
+        }
+      } catch (error) {
+        console.error(`[ProcedureService] Error checking practitioner status for ${practitionerId}:`, error);
+      }
+    }
+    return procedures;
   }
   /**
    * Gets all inactive procedures for a practitioner
@@ -20857,9 +21012,10 @@ var ProcedureService = class extends BaseService {
    *
    * @param pagination - Optional number of procedures per page (0 or undefined returns all)
    * @param lastDoc - Optional last document for pagination (if continuing from a previous page)
+   * @param excludeDraftPractitioners - Whether to exclude procedures from draft practitioners (default: true)
    * @returns Object containing procedures array and the last document for pagination
    */
-  async getAllProcedures(pagination, lastDoc) {
+  async getAllProcedures(pagination, lastDoc, excludeDraftPractitioners = true) {
     try {
       const proceduresCollection = (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = (0, import_firestore58.query)(proceduresCollection);
@@ -20881,7 +21037,7 @@ var ProcedureService = class extends BaseService {
       }
       const proceduresSnapshot = await (0, import_firestore58.getDocs)(proceduresQuery);
       const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
-      const procedures = proceduresSnapshot.docs.map((doc47) => {
+      let procedures = proceduresSnapshot.docs.map((doc47) => {
         const data = doc47.data();
         return {
           ...data,
@@ -20889,6 +21045,9 @@ var ProcedureService = class extends BaseService {
           // Ensure ID is present
         };
       });
+      if (excludeDraftPractitioners) {
+        procedures = await this.filterDraftPractitionerProcedures(procedures);
+      }
       return {
         procedures,
         lastDoc: lastVisible
@@ -21053,6 +21212,7 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
+          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)) {
@@ -21133,6 +21293,7 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
+        procedures = await this.filterDraftPractitionerProcedures(procedures);
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21164,6 +21325,7 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
+        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)) {

package/dist/index.mjs

@@ -7225,11 +7225,12 @@ var userSchema = z4.object({
 
 // src/errors/auth.errors.ts
 var AuthError = class extends Error {
-  constructor(message, code, status = 400) {
+  constructor(message, code, status = 400, metadata) {
     super(message);
     this.code = code;
     this.status = status;
     this.name = "AuthError";
+    this.metadata = metadata;
   }
 };
 var AUTH_ERRORS = {
@@ -7408,6 +7409,12 @@ var AUTH_ERRORS = {
     "Lozinka je previ\u0161e slaba. Molimo koristite ja\u010Du lozinku.",
     "AUTH/WEAK_PASSWORD",
     400
+  ),
+  // Draft profile exists error
+  DRAFT_PROFILE_EXISTS: new AuthError(
+    "A draft practitioner profile exists for this email. Please use your invitation code to claim it, or contact support if you don't have one.",
+    "AUTH/DRAFT_PROFILE_EXISTS",
+    409
   )
 };
 
@@ -11569,6 +11576,52 @@ var PractitionerService = class extends BaseService {
     }
     return querySnapshot.docs[0].data();
   }
+  /**
+   * Finds a draft practitioner profile by email address
+   * Used to detect if a draft profile exists when a doctor registers without a token
+   * 
+   * @param email - Email address to search for
+   * @returns Draft practitioner profile if found, null otherwise
+   * 
+   * @remarks
+   * Requires Firestore composite index on:
+   * - Collection: practitioners
+   * - Fields: basicInfo.email (Ascending), status (Ascending), userRef (Ascending)
+   */
+  async findDraftPractitionerByEmail(email) {
+    try {
+      const normalizedEmail = email.toLowerCase().trim();
+      console.log("[PRACTITIONER] Searching for draft practitioner by email", {
+        email: normalizedEmail
+      });
+      const q = query13(
+        collection13(this.db, PRACTITIONERS_COLLECTION),
+        where13("basicInfo.email", "==", normalizedEmail),
+        where13("status", "==", "draft" /* DRAFT */),
+        where13("userRef", "==", ""),
+        limit7(1)
+      );
+      const querySnapshot = await getDocs13(q);
+      if (querySnapshot.empty) {
+        console.log("[PRACTITIONER] No draft practitioner found for email", {
+          email: normalizedEmail
+        });
+        return null;
+      }
+      const draftPractitioner = querySnapshot.docs[0].data();
+      console.log("[PRACTITIONER] Draft practitioner found", {
+        email: normalizedEmail,
+        practitionerId: draftPractitioner.id
+      });
+      return draftPractitioner;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER] Error finding draft practitioner by email:",
+        error
+      );
+      return null;
+    }
+  }
   /**
    * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
    */
@@ -15377,7 +15430,49 @@ var AuthService = class extends BaseService {
           }
           practitioner = claimedPractitioner;
         } else {
-          console.log("[AUTH] Creating new practitioner profile");
+          console.log("[AUTH] Checking for existing draft practitioner profile", {
+            email: data.email
+          });
+          const draftPractitioner = await practitionerService.findDraftPractitionerByEmail(
+            data.email
+          );
+          if (draftPractitioner) {
+            console.log("[AUTH] Draft practitioner profile found", {
+              practitionerId: draftPractitioner.id,
+              email: data.email,
+              clinics: draftPractitioner.clinics
+            });
+            let clinicNames = [];
+            if (draftPractitioner.clinicsInfo && draftPractitioner.clinicsInfo.length > 0) {
+              clinicNames = draftPractitioner.clinicsInfo.map((clinic) => clinic.name).filter((name) => !!name);
+            } else if (draftPractitioner.clinics && draftPractitioner.clinics.length > 0) {
+              console.log("[AUTH] clinicsInfo missing, fetching clinic names from clinic IDs");
+              const clinicService = practitionerService.getClinicService();
+              const clinicNamePromises = draftPractitioner.clinics.map(async (clinicId) => {
+                try {
+                  const clinic = await clinicService.getClinic(clinicId);
+                  return (clinic == null ? void 0 : clinic.name) || null;
+                } catch (error) {
+                  console.error(`[AUTH] Error fetching clinic ${clinicId}:`, error);
+                  return null;
+                }
+              });
+              const names = await Promise.all(clinicNamePromises);
+              clinicNames = names.filter((name) => !!name);
+            }
+            await cleanupFirebaseUser(firebaseUser);
+            throw new AuthError(
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.message,
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.code,
+              AUTH_ERRORS.DRAFT_PROFILE_EXISTS.status,
+              {
+                clinicNames,
+                clinics: draftPractitioner.clinics,
+                clinicsInfo: draftPractitioner.clinicsInfo
+              }
+            );
+          }
+          console.log("[AUTH] No draft profile found, creating new practitioner profile");
           const practitionerData = buildPractitionerData(data, firebaseUser.uid);
           practitioner = await practitionerService.createPractitioner(practitionerData);
         }
@@ -20159,6 +20254,53 @@ var ProcedureService = class extends BaseService {
     this.productService = productService;
     this.mediaService = mediaService;
   }
+  setPractitionerService(practitionerService) {
+    this.practitionerService = practitionerService;
+  }
+  /**
+   * Filters out procedures from draft practitioners
+   * @param procedures - Array of procedures to filter
+   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   */
+  async filterDraftPractitionerProcedures(procedures) {
+    if (!this.practitionerService || procedures.length === 0) {
+      return procedures;
+    }
+    try {
+      const practitionerIds = Array.from(
+        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+      );
+      if (practitionerIds.length === 0) {
+        return procedures;
+      }
+      const practitionerPromises = practitionerIds.map(
+        (id) => this.practitionerService.getPractitioner(id).catch(() => null)
+      );
+      const practitioners = await Promise.all(practitionerPromises);
+      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      practitioners.forEach((practitioner, index) => {
+        if (practitioner) {
+          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+        }
+      });
+      const filteredProcedures = procedures.filter((procedure) => {
+        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
+        return practitionerStatus !== "draft" /* DRAFT */;
+      });
+      if (filteredProcedures.length !== procedures.length) {
+        console.log(
+          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+        );
+      }
+      return filteredProcedures;
+    } catch (error) {
+      console.error(
+        "[ProcedureService] Error filtering draft practitioner procedures:",
+        error
+      );
+      return procedures;
+    }
+  }
   /**
    * Process media resource (string URL or File object)
    * @param media String URL or File object
@@ -20869,9 +21011,10 @@ var ProcedureService = class extends BaseService {
    * Gets all procedures for a practitioner
    * @param practitionerId - The ID of the practitioner
    * @param clinicBranchId - Optional clinic branch ID to filter by
+   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status
    * @returns List of procedures
    */
-  async getProceduresByPractitioner(practitionerId, clinicBranchId) {
+  async getProceduresByPractitioner(practitionerId, clinicBranchId, excludeDraftPractitioners = true) {
     const constraints = [
       where33("practitionerId", "==", practitionerId),
       where33("isActive", "==", true)
@@ -20884,7 +21027,19 @@ var ProcedureService = class extends BaseService {
       ...constraints
     );
     const snapshot = await getDocs33(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    if (excludeDraftPractitioners && this.practitionerService) {
+      try {
+        const practitioner = await this.practitionerService.getPractitioner(practitionerId);
+        if (practitioner && practitioner.status === "draft" /* DRAFT */) {
+          console.log(`[ProcedureService] Excluding procedures for draft practitioner ${practitionerId}`);
+          return [];
+        }
+      } catch (error) {
+        console.error(`[ProcedureService] Error checking practitioner status for ${practitionerId}:`, error);
+      }
+    }
+    return procedures;
   }
   /**
    * Gets all inactive procedures for a practitioner
@@ -21093,9 +21248,10 @@ var ProcedureService = class extends BaseService {
    *
    * @param pagination - Optional number of procedures per page (0 or undefined returns all)
    * @param lastDoc - Optional last document for pagination (if continuing from a previous page)
+   * @param excludeDraftPractitioners - Whether to exclude procedures from draft practitioners (default: true)
    * @returns Object containing procedures array and the last document for pagination
    */
-  async getAllProcedures(pagination, lastDoc) {
+  async getAllProcedures(pagination, lastDoc, excludeDraftPractitioners = true) {
     try {
       const proceduresCollection = collection33(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = query33(proceduresCollection);
@@ -21117,7 +21273,7 @@ var ProcedureService = class extends BaseService {
       }
       const proceduresSnapshot = await getDocs33(proceduresQuery);
       const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
-      const procedures = proceduresSnapshot.docs.map((doc47) => {
+      let procedures = proceduresSnapshot.docs.map((doc47) => {
         const data = doc47.data();
         return {
           ...data,
@@ -21125,6 +21281,9 @@ var ProcedureService = class extends BaseService {
           // Ensure ID is present
         };
       });
+      if (excludeDraftPractitioners) {
+        procedures = await this.filterDraftPractitionerProcedures(procedures);
+      }
       return {
         procedures,
         lastDoc: lastVisible
@@ -21289,6 +21448,7 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
+          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)) {
@@ -21369,6 +21529,7 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
+        procedures = await this.filterDraftPractitionerProcedures(procedures);
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21400,6 +21561,7 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
+        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)) {