@blackcode_sa/metaestetics-api 1.8.15 → 1.8.17

package/dist/index.mjs

@@ -6935,8 +6935,9 @@ var PractitionerService = class extends BaseService {
         }
         constraints.push(where10("isActive", "==", true));
         if (filters.certifications && filters.certifications.length > 0) {
+          const certificationsToMatch = filters.certifications;
           constraints.push(
-            where10("certification.specialties", "array-contains-any", filters.certifications)
+            where10("certification.specialties", "array-contains-any", certificationsToMatch)
           );
         }
         if (filters.minRating !== void 0) {
@@ -6979,18 +6980,7 @@ var PractitionerService = class extends BaseService {
           });
           practitioners = practitioners.slice(0, filters.pagination || 10);
         }
-        if (filters.nameSearch && filters.nameSearch.trim()) {
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          practitioners = practitioners.filter((practitioner) => {
-            var _a, _b;
-            const firstName = (((_a = practitioner.basicInfo) == null ? void 0 : _a.firstName) || "").toLowerCase();
-            const lastName = (((_b = practitioner.basicInfo) == null ? void 0 : _b.lastName) || "").toLowerCase();
-            const fullName = `${firstName} ${lastName}`.trim();
-            const fullNameLower = practitioner.fullNameLower || "";
-            return firstName.includes(searchTerm) || lastName.includes(searchTerm) || fullName.includes(searchTerm) || fullNameLower.includes(searchTerm);
-          });
-          console.log(`[PRACTITIONER_SERVICE] Applied name filter, results: ${practitioners.length}`);
-        }
+        practitioners = this.applyInMemoryFilters(practitioners, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`);
         if (practitioners.length < (filters.pagination || 10)) {
@@ -7010,18 +7000,7 @@ var PractitionerService = class extends BaseService {
         const q = query10(collection10(this.db, PRACTITIONERS_COLLECTION), ...constraints);
         const querySnapshot = await getDocs10(q);
         let practitioners = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-        if (filters.nameSearch && filters.nameSearch.trim()) {
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          practitioners = practitioners.filter((practitioner) => {
-            var _a, _b;
-            const firstName = (((_a = practitioner.basicInfo) == null ? void 0 : _a.firstName) || "").toLowerCase();
-            const lastName = (((_b = practitioner.basicInfo) == null ? void 0 : _b.lastName) || "").toLowerCase();
-            const fullName = `${firstName} ${lastName}`.trim();
-            const fullNameLower = practitioner.fullNameLower || "";
-            return firstName.includes(searchTerm) || lastName.includes(searchTerm) || fullName.includes(searchTerm) || fullNameLower.includes(searchTerm);
-          });
-          console.log(`[PRACTITIONER_SERVICE] Applied name filter, results: ${practitioners.length}`);
-        }
+        practitioners = this.applyInMemoryFilters(practitioners, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`);
         if (practitioners.length < (filters.pagination || 10)) {
@@ -7038,6 +7017,98 @@ var PractitionerService = class extends BaseService {
       return { practitioners: [], lastDoc: null };
     }
   }
+  /**
+   * Applies in-memory filters to practitioners array
+   * Used when Firestore queries fail or for complex filtering
+   */
+  applyInMemoryFilters(practitioners, filters) {
+    let filteredPractitioners = [...practitioners];
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      const searchTerm = filters.nameSearch.trim().toLowerCase();
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        var _a, _b;
+        const firstName = (((_a = practitioner.basicInfo) == null ? void 0 : _a.firstName) || "").toLowerCase();
+        const lastName = (((_b = practitioner.basicInfo) == null ? void 0 : _b.lastName) || "").toLowerCase();
+        const fullName = `${firstName} ${lastName}`.trim();
+        const fullNameLower = practitioner.fullNameLower || "";
+        return firstName.includes(searchTerm) || lastName.includes(searchTerm) || fullName.includes(searchTerm) || fullNameLower.includes(searchTerm);
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied name filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.certifications && filters.certifications.length > 0) {
+      const certificationsToMatch = filters.certifications;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        var _a;
+        const practitionerCerts = ((_a = practitioner.certification) == null ? void 0 : _a.specialties) || [];
+        return certificationsToMatch.some((cert) => practitionerCerts.includes(cert));
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied certifications filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.specialties && filters.specialties.length > 0) {
+      const specialtiesToMatch = filters.specialties;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        var _a;
+        const practitionerSpecs = ((_a = practitioner.certification) == null ? void 0 : _a.specialties) || [];
+        return specialtiesToMatch.some((spec) => practitionerSpecs.includes(spec));
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied specialties filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.minRating !== void 0 || filters.maxRating !== void 0) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        var _a;
+        const rating = ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0;
+        if (filters.minRating !== void 0 && rating < filters.minRating) return false;
+        if (filters.maxRating !== void 0 && rating > filters.maxRating) return false;
+        return true;
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied rating filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.procedureFamily) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some((proc) => proc.family === filters.procedureFamily);
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied procedure family filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.procedureCategory) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some((proc) => proc.categoryName === filters.procedureCategory);
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied procedure category filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.procedureSubcategory) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some((proc) => proc.subcategoryName === filters.procedureSubcategory);
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied procedure subcategory filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.procedureTechnology) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some((proc) => proc.technologyName === filters.procedureTechnology);
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied procedure technology filter, results: ${filteredPractitioners.length}`);
+    }
+    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const clinics = practitioner.clinicsInfo || [];
+        return clinics.some((clinic) => {
+          const distance = distanceBetween(
+            [location.latitude, location.longitude],
+            [clinic.location.latitude, clinic.location.longitude]
+          );
+          const distanceInKm = distance / 1e3;
+          return distanceInKm <= radiusInKm;
+        });
+      });
+      console.log(`[PRACTITIONER_SERVICE] Applied geo filter, results: ${filteredPractitioners.length}`);
+    }
+    return filteredPractitioners;
+  }
   /**
    * Enables free consultation for a practitioner in a specific clinic
    * Creates a free consultation procedure with hardcoded parameters
@@ -8741,15 +8812,6 @@ async function getClinicsByFilters(db, filters) {
       if (filters.tags && filters.tags.length > 0) {
         constraints.push(where15("tags", "array-contains", filters.tags[0]));
       }
-      if (filters.procedureTechnology) {
-        constraints.push(where15("servicesInfo.technology", "==", filters.procedureTechnology));
-      } else if (filters.procedureSubcategory) {
-        constraints.push(where15("servicesInfo.subCategory", "==", filters.procedureSubcategory));
-      } else if (filters.procedureCategory) {
-        constraints.push(where15("servicesInfo.category", "==", filters.procedureCategory));
-      } else if (filters.procedureFamily) {
-        constraints.push(where15("servicesInfo.procedureFamily", "==", filters.procedureFamily));
-      }
       if (filters.minRating !== void 0) {
         constraints.push(where15("reviewInfo.averageRating", ">=", filters.minRating));
       }
@@ -8839,15 +8901,6 @@ async function getClinicsByFilters(db, filters) {
       const q = query15(collection15(db, CLINICS_COLLECTION), ...constraints);
       const querySnapshot = await getDocs15(q);
       let clinics = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        const searchTerm = filters.nameSearch.trim().toLowerCase();
-        clinics = clinics.filter((clinic) => {
-          const name = (clinic.name || "").toLowerCase();
-          const nameLower = clinic.nameLower || "";
-          return name.includes(searchTerm) || nameLower.includes(searchTerm);
-        });
-        console.log(`[CLINIC_SERVICE] Applied name filter, results: ${clinics.length}`);
-      }
       clinics = applyInMemoryFilters(clinics, filters);
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
       console.log(`[CLINIC_SERVICE] Strategy 3 success: ${clinics.length} clinics`);
@@ -8868,15 +8921,6 @@ async function getClinicsByFilters(db, filters) {
       const q = query15(collection15(db, CLINICS_COLLECTION), ...constraints);
       const querySnapshot = await getDocs15(q);
       let clinics = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        const searchTerm = filters.nameSearch.trim().toLowerCase();
-        clinics = clinics.filter((clinic) => {
-          const name = (clinic.name || "").toLowerCase();
-          const nameLower = clinic.nameLower || "";
-          return name.includes(searchTerm) || nameLower.includes(searchTerm);
-        });
-        console.log(`[CLINIC_SERVICE] Applied name filter, results: ${clinics.length}`);
-      }
       clinics = applyInMemoryFilters(clinics, filters);
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
       console.log(`[CLINIC_SERVICE] Strategy 4 success: ${clinics.length} clinics`);
@@ -8895,21 +8939,96 @@ async function getClinicsByFilters(db, filters) {
   }
 }
 function applyInMemoryFilters(clinics, filters) {
+  let filteredClinics = [...clinics];
+  console.log(`[CLINIC_SERVICE] Applying in-memory filters - input: ${filteredClinics.length} clinics`);
   if (filters.tags && filters.tags.length > 1) {
-    clinics = clinics.filter((clinic) => filters.tags.every((tag) => clinic.tags.includes(tag)));
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(
+      (clinic) => filters.tags.every((tag) => clinic.tags.includes(tag))
+    );
+    console.log(`[CLINIC_SERVICE] Applied multi-tag filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.tags && filters.tags.length === 1) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(
+      (clinic) => clinic.tags.includes(filters.tags[0])
+    );
+    console.log(`[CLINIC_SERVICE] Applied single-tag filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.minRating !== void 0 || filters.maxRating !== void 0) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      var _a;
+      const rating = ((_a = clinic.reviewInfo) == null ? void 0 : _a.averageRating) || 0;
+      if (filters.minRating !== void 0 && rating < filters.minRating) return false;
+      if (filters.maxRating !== void 0 && rating > filters.maxRating) return false;
+      return true;
+    });
+    console.log(`[CLINIC_SERVICE] Applied rating filter (${filters.minRating}-${filters.maxRating}): ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.nameSearch && filters.nameSearch.trim()) {
+    const initialCount = filteredClinics.length;
+    const searchTerm = filters.nameSearch.trim().toLowerCase();
+    filteredClinics = filteredClinics.filter((clinic) => {
+      const name = (clinic.name || "").toLowerCase();
+      const nameLower = clinic.nameLower || "";
+      return name.includes(searchTerm) || nameLower.includes(searchTerm);
+    });
+    console.log(`[CLINIC_SERVICE] Applied name search filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.procedureFamily) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some((proc) => proc.family === filters.procedureFamily);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure family filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.procedureCategory) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some((proc) => proc.categoryName === filters.procedureCategory);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure category filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.procedureSubcategory) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some((proc) => proc.subcategoryName === filters.procedureSubcategory);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure subcategory filter: ${initialCount} \u2192 ${filteredClinics.length}`);
+  }
+  if (filters.procedureTechnology) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some((proc) => proc.technologyName === filters.procedureTechnology);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure technology filter: ${initialCount} \u2192 ${filteredClinics.length}`);
   }
   if (filters.center && filters.radiusInKm) {
-    clinics = clinics.filter((clinic) => {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter((clinic) => {
+      var _a, _b;
+      if (!((_a = clinic.location) == null ? void 0 : _a.latitude) || !((_b = clinic.location) == null ? void 0 : _b.longitude)) {
+        console.log(`[CLINIC_SERVICE] Clinic ${clinic.id} missing location data`);
+        return false;
+      }
       const distance = distanceBetween4(
         [filters.center.latitude, filters.center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       ) / 1e3;
+      console.log(`[CLINIC_SERVICE] Clinic ${clinic.name}: distance ${distance.toFixed(2)}km (limit: ${filters.radiusInKm}km)`);
       clinic.distance = distance;
       return distance <= filters.radiusInKm;
     });
-    clinics.sort((a, b) => (a.distance || 0) - (b.distance || 0));
+    console.log(`[CLINIC_SERVICE] Applied geo filter (${filters.radiusInKm}km): ${initialCount} \u2192 ${filteredClinics.length}`);
+    filteredClinics.sort((a, b) => (a.distance || 0) - (b.distance || 0));
   }
-  return clinics;
+  console.log(`[CLINIC_SERVICE] Final filtered result: ${filteredClinics.length} clinics`);
+  return filteredClinics;
 }
 
 // src/services/clinic/clinic.service.ts
@@ -15424,7 +15543,8 @@ var ProcedureService = class extends BaseService {
           constraints.push(where29("reviewInfo.averageRating", "<=", filters.maxRating));
         }
         if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
-          constraints.push(where29("treatmentBenefits", "array-contains-any", filters.treatmentBenefits));
+          const benefitsToMatch = filters.treatmentBenefits;
+          constraints.push(where29("treatmentBenefits", "array-contains-any", benefitsToMatch));
         }
         return constraints;
       };
@@ -15507,15 +15627,7 @@ var ProcedureService = class extends BaseService {
         const q = query29(collection29(this.db, PROCEDURES_COLLECTION), ...constraints);
         const querySnapshot = await getDocs29(q);
         let procedures = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-        if (filters.nameSearch && filters.nameSearch.trim()) {
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          procedures = procedures.filter((procedure) => {
-            const name = (procedure.name || "").toLowerCase();
-            const nameLower = procedure.nameLower || "";
-            return name.includes(searchTerm) || nameLower.includes(searchTerm);
-          });
-          console.log(`[PROCEDURE_SERVICE] Applied name filter, results: ${procedures.length}`);
-        }
+        procedures = this.applyInMemoryFilters(procedures, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures`);
         if (procedures.length < (filters.pagination || 10)) {
@@ -15535,15 +15647,7 @@ var ProcedureService = class extends BaseService {
         const q = query29(collection29(this.db, PROCEDURES_COLLECTION), ...constraints);
         const querySnapshot = await getDocs29(q);
         let procedures = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-        if (filters.nameSearch && filters.nameSearch.trim()) {
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          procedures = procedures.filter((procedure) => {
-            const name = (procedure.name || "").toLowerCase();
-            const nameLower = procedure.nameLower || "";
-            return name.includes(searchTerm) || nameLower.includes(searchTerm);
-          });
-          console.log(`[PROCEDURE_SERVICE] Applied name filter, results: ${procedures.length}`);
-        }
+        procedures = this.applyInMemoryFilters(procedures, filters);
         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)) {
@@ -15560,6 +15664,94 @@ var ProcedureService = class extends BaseService {
       return { procedures: [], lastDoc: null };
     }
   }
+  /**
+   * Applies in-memory filters to procedures array
+   * Used when Firestore queries fail or for complex filtering
+   */
+  applyInMemoryFilters(procedures, filters) {
+    let filteredProcedures = [...procedures];
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      const searchTerm = filters.nameSearch.trim().toLowerCase();
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        const name = (procedure.name || "").toLowerCase();
+        const nameLower = procedure.nameLower || "";
+        return name.includes(searchTerm) || nameLower.includes(searchTerm);
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied name filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.minPrice !== void 0 || filters.maxPrice !== void 0) {
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        const price = procedure.price || 0;
+        if (filters.minPrice !== void 0 && price < filters.minPrice) return false;
+        if (filters.maxPrice !== void 0 && price > filters.maxPrice) return false;
+        return true;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied price filter (${filters.minPrice}-${filters.maxPrice}), results: ${filteredProcedures.length}`);
+    }
+    if (filters.minRating !== void 0 || filters.maxRating !== void 0) {
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        var _a;
+        const rating = ((_a = procedure.reviewInfo) == null ? void 0 : _a.averageRating) || 0;
+        if (filters.minRating !== void 0 && rating < filters.minRating) return false;
+        if (filters.maxRating !== void 0 && rating > filters.maxRating) return false;
+        return true;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied rating filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+      const benefitsToMatch = filters.treatmentBenefits;
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        const procedureBenefits = procedure.treatmentBenefits || [];
+        return benefitsToMatch.some((benefit) => procedureBenefits.includes(benefit));
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied benefits filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.procedureFamily) {
+      filteredProcedures = filteredProcedures.filter((procedure) => procedure.family === filters.procedureFamily);
+      console.log(`[PROCEDURE_SERVICE] Applied family filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.procedureCategory) {
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        var _a;
+        return ((_a = procedure.category) == null ? void 0 : _a.id) === filters.procedureCategory;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied category filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.procedureSubcategory) {
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        var _a;
+        return ((_a = procedure.subcategory) == null ? void 0 : _a.id) === filters.procedureSubcategory;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied subcategory filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.procedureTechnology) {
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        var _a;
+        return ((_a = procedure.technology) == null ? void 0 : _a.id) === filters.procedureTechnology;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied technology filter, results: ${filteredProcedures.length}`);
+    }
+    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      filteredProcedures = filteredProcedures.filter((procedure) => {
+        var _a;
+        const clinicLocation = (_a = procedure.clinicInfo) == null ? void 0 : _a.location;
+        if (!(clinicLocation == null ? void 0 : clinicLocation.latitude) || !(clinicLocation == null ? void 0 : clinicLocation.longitude)) {
+          return false;
+        }
+        const distance = distanceBetween6(
+          [location.latitude, location.longitude],
+          [clinicLocation.latitude, clinicLocation.longitude]
+        ) / 1e3;
+        procedure.distance = distance;
+        return distance <= radiusInKm;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied geo filter, results: ${filteredProcedures.length}`);
+      filteredProcedures.sort((a, b) => (a.distance || 0) - (b.distance || 0));
+    }
+    return filteredProcedures;
+  }
   handleGeoQuery(filters) {
     console.log("[PROCEDURE_SERVICE] Executing geo query with enhanced debugging");
     try {
@@ -15580,21 +15772,7 @@ var ProcedureService = class extends BaseService {
       const q = query29(collection29(this.db, PROCEDURES_COLLECTION), ...constraints);
       return getDocs29(q).then((querySnapshot) => {
         let procedures = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
-        procedures = procedures.filter((procedure) => {
-          var _a;
-          const clinicLocation = (_a = procedure.clinicInfo) == null ? void 0 : _a.location;
-          if (!(clinicLocation == null ? void 0 : clinicLocation.latitude) || !(clinicLocation == null ? void 0 : clinicLocation.longitude)) {
-            return false;
-          }
-          const distance = distanceBetween6(
-            [location.latitude, location.longitude],
-            [clinicLocation.latitude, clinicLocation.longitude]
-          ) / 1e3;
-          procedure.distance = distance;
-          return distance <= radiusInKm;
-        });
-        procedures.sort((a, b) => (a.distance || 0) - (b.distance || 0));
-        procedures = procedures.slice(0, filters.pagination || 10);
+        procedures = this.applyInMemoryFilters(procedures, filters);
         console.log(`[PROCEDURE_SERVICE] Geo query success: ${procedures.length} procedures within ${radiusInKm}km`);
         const lastDoc = procedures.length < (filters.pagination || 10) ? null : querySnapshot.docs[querySnapshot.docs.length - 1];
         return { procedures, lastDoc };

package/package.json

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

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

@@ -70,17 +70,6 @@ export async function getClinicsByFilters(
         constraints.push(where("tags", "array-contains", filters.tags[0]));
       }
       
-      // Procedure filters (most specific first)
-      if (filters.procedureTechnology) {
-        constraints.push(where("servicesInfo.technology", "==", filters.procedureTechnology));
-      } else if (filters.procedureSubcategory) {
-        constraints.push(where("servicesInfo.subCategory", "==", filters.procedureSubcategory));
-      } else if (filters.procedureCategory) {
-        constraints.push(where("servicesInfo.category", "==", filters.procedureCategory));
-      } else if (filters.procedureFamily) {
-        constraints.push(where("servicesInfo.procedureFamily", "==", filters.procedureFamily));
-      }
-      
       // Rating filters
       if (filters.minRating !== undefined) {
         constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
@@ -197,18 +186,7 @@ export async function getClinicsByFilters(
       const querySnapshot = await getDocs(q);
       let clinics = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Clinic));
 
-      // Client-side name filtering
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        const searchTerm = filters.nameSearch.trim().toLowerCase();
-        clinics = clinics.filter(clinic => {
-          const name = (clinic.name || '').toLowerCase();
-          const nameLower = clinic.nameLower || '';
-          return name.includes(searchTerm) || nameLower.includes(searchTerm);
-        });
-        console.log(`[CLINIC_SERVICE] Applied name filter, results: ${clinics.length}`);
-      }
-
-      // Apply in-memory filters
+      // Apply in-memory filters (includes name search)
       clinics = applyInMemoryFilters(clinics, filters);
       
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -237,18 +215,7 @@ export async function getClinicsByFilters(
       const querySnapshot = await getDocs(q);
       let clinics = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Clinic));
 
-      // Client-side name filtering
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        const searchTerm = filters.nameSearch.trim().toLowerCase();
-        clinics = clinics.filter(clinic => {
-          const name = (clinic.name || '').toLowerCase();
-          const nameLower = clinic.nameLower || '';
-          return name.includes(searchTerm) || nameLower.includes(searchTerm);
-        });
-        console.log(`[CLINIC_SERVICE] Applied name filter, results: ${clinics.length}`);
-      }
-
-      // Apply in-memory filters
+      // Apply in-memory filters (includes name search)
       clinics = applyInMemoryFilters(clinics, filters);
       
       const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -278,27 +245,118 @@ export async function getClinicsByFilters(
  * Helper function to apply in-memory filters that Firestore doesn't support well
  */
 function applyInMemoryFilters(clinics: Clinic[], filters: any): (Clinic & { distance?: number })[] {
-  // Multi-tag filter (Firestore only supports single array-contains)
+  let filteredClinics = [...clinics]; // Kreiraj kopiju
+
+  console.log(`[CLINIC_SERVICE] Applying in-memory filters - input: ${filteredClinics.length} clinics`);
+  
+  // ✅ Multi-tag filter (postojeći kod)
   if (filters.tags && filters.tags.length > 1) {
-    clinics = clinics.filter(clinic => filters.tags!.every((tag: ClinicTag) => clinic.tags.includes(tag)));
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => 
+      filters.tags.every((tag: ClinicTag) => clinic.tags.includes(tag))
+    );
+    console.log(`[CLINIC_SERVICE] Applied multi-tag filter: ${initialCount} → ${filteredClinics.length}`);
   }
-  
-  // Geo-radius filter
+
+  // 🆕 DODAJTE: Single tag filter (za Strategy 4 fallback)
+  if (filters.tags && filters.tags.length === 1) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => 
+      clinic.tags.includes(filters.tags[0])
+    );
+    console.log(`[CLINIC_SERVICE] Applied single-tag filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Rating filter
+  if (filters.minRating !== undefined || filters.maxRating !== undefined) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      const rating = clinic.reviewInfo?.averageRating || 0;
+      if (filters.minRating !== undefined && rating < filters.minRating) return false;
+      if (filters.maxRating !== undefined && rating > filters.maxRating) return false;
+      return true;
+    });
+    console.log(`[CLINIC_SERVICE] Applied rating filter (${filters.minRating}-${filters.maxRating}): ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Name search filter
+  if (filters.nameSearch && filters.nameSearch.trim()) {
+    const initialCount = filteredClinics.length;
+    const searchTerm = filters.nameSearch.trim().toLowerCase();
+    filteredClinics = filteredClinics.filter(clinic => {
+      const name = (clinic.name || '').toLowerCase();
+      const nameLower = clinic.nameLower || '';
+      return name.includes(searchTerm) || nameLower.includes(searchTerm);
+    });
+    console.log(`[CLINIC_SERVICE] Applied name search filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Procedure family filtering
+  if (filters.procedureFamily) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some(proc => proc.family === filters.procedureFamily);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure family filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Procedure category filtering
+  if (filters.procedureCategory) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some(proc => proc.categoryName === filters.procedureCategory);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure category filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Procedure subcategory filtering
+  if (filters.procedureSubcategory) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some(proc => proc.subcategoryName === filters.procedureSubcategory);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure subcategory filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // 🆕 DODAJTE: Procedure technology filtering
+  if (filters.procedureTechnology) {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      const proceduresInfo = clinic.proceduresInfo || [];
+      return proceduresInfo.some(proc => proc.technologyName === filters.procedureTechnology);
+    });
+    console.log(`[CLINIC_SERVICE] Applied procedure technology filter: ${initialCount} → ${filteredClinics.length}`);
+  }
+
+  // ✅ Geo-radius filter (postojeći kod)
   if (filters.center && filters.radiusInKm) {
-    clinics = clinics.filter(clinic => {
+    const initialCount = filteredClinics.length;
+    filteredClinics = filteredClinics.filter(clinic => {
+      if (!clinic.location?.latitude || !clinic.location?.longitude) {
+        console.log(`[CLINIC_SERVICE] Clinic ${clinic.id} missing location data`);
+        return false;
+      }
+      
       const distance = distanceBetween(
-        [filters.center!.latitude, filters.center!.longitude],
+        [filters.center.latitude, filters.center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       ) / 1000; // Convert to km
       
+      console.log(`[CLINIC_SERVICE] Clinic ${clinic.name}: distance ${distance.toFixed(2)}km (limit: ${filters.radiusInKm}km)`);
+      
       // Attach distance for frontend sorting/display
       (clinic as any).distance = distance;
-      return distance <= filters.radiusInKm!;
+      return distance <= filters.radiusInKm;
     });
+    console.log(`[CLINIC_SERVICE] Applied geo filter (${filters.radiusInKm}km): ${initialCount} → ${filteredClinics.length}`);
     
     // Sort by distance when geo filtering is applied
-    clinics.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
+    filteredClinics.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
   }
-  
-  return clinics as (Clinic & { distance?: number })[];
+
+  console.log(`[CLINIC_SERVICE] Final filtered result: ${filteredClinics.length} clinics`);
+  return filteredClinics as (Clinic & { distance?: number })[];
 }