@blackcode_sa/metaestetics-api 1.13.13 → 1.13.14

package/dist/index.d.mts

@@ -6897,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

@@ -6897,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

@@ -13550,7 +13550,9 @@ 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 };
@@ -14046,6 +14048,7 @@ async function getClinicsByFilters(db, filters) {
         }
         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;
@@ -14101,6 +14104,7 @@ async function getClinicsByFilters(db, filters) {
         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;
@@ -14135,6 +14139,7 @@ async function getClinicsByFilters(db, filters) {
         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;
@@ -20086,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 {
@@ -21181,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,
@@ -21270,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)) {
@@ -21311,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)) {
@@ -21392,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
         });
@@ -21424,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)) {

package/dist/index.mjs

@@ -13624,7 +13624,9 @@ 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 };
@@ -14133,6 +14135,7 @@ async function getClinicsByFilters(db, filters) {
         }
         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;
@@ -14188,6 +14191,7 @@ async function getClinicsByFilters(db, filters) {
         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;
@@ -14222,6 +14226,7 @@ async function getClinicsByFilters(db, filters) {
         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;
@@ -20322,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 {
@@ -21417,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,
@@ -21506,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)) {
@@ -21547,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)) {
@@ -21628,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
         });
@@ -21660,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)) {

package/package.json

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

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

@@ -425,8 +425,11 @@ export function filterClinicEmbeddedArrays(clinic: Clinic, excludeDraftPractitio
     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;
   }
 

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

@@ -98,6 +98,7 @@ export async function getClinicsByFilters(
 
         // 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
@@ -170,6 +171,7 @@ export async function getClinicsByFilters(
 
         // 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
@@ -217,6 +219,7 @@ export async function getClinicsByFilters(
 
         // 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

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;