@blackcode_sa/metaestetics-api 1.13.8 → 1.13.10

package/dist/index.d.mts

@@ -6697,9 +6697,17 @@ declare class ProcedureService extends BaseService {
     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
+     * Filters out procedures that should not be visible to patients:
+     * 1. Procedures with no practitioner (missing practitionerId)
+     * 2. Procedures where practitioner doesn't exist
+     * 3. Procedures from draft practitioners
+     * 4. Procedures from inactive practitioners (isActive === false)
+     *
+     * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+     * the procedure is filtered out.
+     *
      * @param procedures - Array of procedures to filter
-     * @returns Filtered array of procedures (excluding those from draft practitioners)
+     * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
      */
     private filterDraftPractitionerProcedures;
     /**

package/dist/index.d.ts

@@ -6697,9 +6697,17 @@ declare class ProcedureService extends BaseService {
     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
+     * Filters out procedures that should not be visible to patients:
+     * 1. Procedures with no practitioner (missing practitionerId)
+     * 2. Procedures where practitioner doesn't exist
+     * 3. Procedures from draft practitioners
+     * 4. Procedures from inactive practitioners (isActive === false)
+     *
+     * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+     * the procedure is filtered out.
+     *
      * @param procedures - Array of procedures to filter
-     * @returns Filtered array of procedures (excluding those from draft practitioners)
+     * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
      */
     private filterDraftPractitionerProcedures;
     /**

package/dist/index.js

@@ -20022,44 +20022,82 @@ var ProcedureService = class extends BaseService {
     this.practitionerService = practitionerService;
   }
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
     if (!this.practitionerService || procedures.length === 0) {
       return procedures;
     }
     try {
+      const proceduresWithPractitioner = procedures.filter(
+        (p) => p.practitionerId && p.practitionerId.trim() !== ""
+      );
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
       const practitionerPromises = practitionerIds.map(
         (id) => this.practitionerService.getPractitioner(id).catch(() => null)
       );
       const practitioners = await Promise.all(practitionerPromises);
-      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      const practitionerMap = /* @__PURE__ */ new Map();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== "draft" /* DRAFT */;
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+        if (practitioner.status === "draft" /* DRAFT */) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+        return true;
       });
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ${noPractitionerCount} with no practitionerId, ${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
       return filteredProcedures;
     } catch (error) {
       console.error(
-        "[ProcedureService] Error filtering draft practitioner procedures:",
+        "[ProcedureService] Error filtering practitioner procedures:",
         error
       );
       return procedures;
@@ -20769,7 +20807,8 @@ var ProcedureService = class extends BaseService {
       (0, import_firestore58.where)("isActive", "==", true)
     );
     const snapshot = await (0, import_firestore58.getDocs)(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
   /**
    * Gets all procedures for a practitioner
@@ -21172,6 +21211,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 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {

package/dist/index.mjs

@@ -20258,44 +20258,82 @@ var ProcedureService = class extends BaseService {
     this.practitionerService = practitionerService;
   }
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
     if (!this.practitionerService || procedures.length === 0) {
       return procedures;
     }
     try {
+      const proceduresWithPractitioner = procedures.filter(
+        (p) => p.practitionerId && p.practitionerId.trim() !== ""
+      );
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
       const practitionerPromises = practitionerIds.map(
         (id) => this.practitionerService.getPractitioner(id).catch(() => null)
       );
       const practitioners = await Promise.all(practitionerPromises);
-      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      const practitionerMap = /* @__PURE__ */ new Map();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== "draft" /* DRAFT */;
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+        if (practitioner.status === "draft" /* DRAFT */) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+        return true;
       });
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ${noPractitionerCount} with no practitionerId, ${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
       return filteredProcedures;
     } catch (error) {
       console.error(
-        "[ProcedureService] Error filtering draft practitioner procedures:",
+        "[ProcedureService] Error filtering practitioner procedures:",
         error
       );
       return procedures;
@@ -21005,7 +21043,8 @@ var ProcedureService = class extends BaseService {
       where33("isActive", "==", true)
     );
     const snapshot = await getDocs33(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
   /**
    * Gets all procedures for a practitioner
@@ -21408,6 +21447,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 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {

package/package.json

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

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

@@ -90,9 +90,17 @@ export class ProcedureService extends BaseService {
   }
 
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   private async filterDraftPractitionerProcedures(
     procedures: Procedure[]
@@ -102,13 +110,25 @@ export class ProcedureService extends BaseService {
     }
 
     try {
+      // First, filter out procedures with no practitionerId
+      const proceduresWithPractitioner = procedures.filter((p) => 
+        p.practitionerId && p.practitionerId.trim() !== ''
+      );
+
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
+
       // Get unique practitioner IDs from procedures
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
 
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
 
       // Fetch all practitioners in parallel
@@ -117,32 +137,64 @@ export class ProcedureService extends BaseService {
       );
       const practitioners = await Promise.all(practitionerPromises);
 
-      // Create a map of practitioner ID to status
-      const practitionerStatusMap = new Map<string, PractitionerStatus>();
+      // Create a map of practitioner ID to practitioner data
+      const practitionerMap = new Map<string, Practitioner>();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
 
-      // Filter out procedures from draft practitioners
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== PractitionerStatus.DRAFT;
+      // Filter out procedures that:
+      // 1. Have no practitionerId (already filtered above, but double-check)
+      // 2. Have a practitioner that doesn't exist
+      // 3. Have a practitioner with DRAFT status
+      // 4. Have a practitioner that is not active (isActive === false)
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        // Check if practitioner exists
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+
+        // Check if practitioner is DRAFT
+        if (practitioner.status === PractitionerStatus.DRAFT) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+
+        // Check if practitioner is active (must be true to show procedure)
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+
+        return true;
       });
 
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${
-            procedures.length - filteredProcedures.length
-          } procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ` +
+          `${noPractitionerCount} with no practitionerId, ` +
+          `${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
 
       return filteredProcedures;
     } catch (error) {
       console.error(
-        '[ProcedureService] Error filtering draft practitioner procedures:',
+        '[ProcedureService] Error filtering practitioner procedures:',
         error
       );
       // On error, return original procedures to avoid breaking functionality
@@ -1062,7 +1114,10 @@ export class ProcedureService extends BaseService {
       where('isActive', '==', true),
     );
     const snapshot = await getDocs(q);
-    return snapshot.docs.map(doc => doc.data() as Procedure);
+    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
+    
+    // Filter out procedures from draft practitioners
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
 
   /**
@@ -1591,6 +1646,9 @@ export class ProcedureService extends BaseService {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
           
+          // Filter out procedures from draft practitioners
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          
           const lastDoc =
             querySnapshot.docs.length > 0
               ? querySnapshot.docs[querySnapshot.docs.length - 1]