@blackcode_sa/metaestetics-api 1.8.16 → 1.8.17

package/dist/index.js

@@ -8710,15 +8710,6 @@ async function getClinicsByFilters(db, filters) {
       if (filters.tags && filters.tags.length > 0) {
         constraints.push((0, import_firestore26.where)("tags", "array-contains", filters.tags[0]));
       }
-      if (filters.procedureTechnology) {
-        constraints.push((0, import_firestore26.where)("servicesInfo.technology", "==", filters.procedureTechnology));
-      } else if (filters.procedureSubcategory) {
-        constraints.push((0, import_firestore26.where)("servicesInfo.subCategory", "==", filters.procedureSubcategory));
-      } else if (filters.procedureCategory) {
-        constraints.push((0, import_firestore26.where)("servicesInfo.category", "==", filters.procedureCategory));
-      } else if (filters.procedureFamily) {
-        constraints.push((0, import_firestore26.where)("servicesInfo.procedureFamily", "==", filters.procedureFamily));
-      }
       if (filters.minRating !== void 0) {
         constraints.push((0, import_firestore26.where)("reviewInfo.averageRating", ">=", filters.minRating));
       }
@@ -8808,15 +8799,6 @@ async function getClinicsByFilters(db, filters) {
       const q = (0, import_firestore26.query)((0, import_firestore26.collection)(db, CLINICS_COLLECTION), ...constraints);
       const querySnapshot = await (0, import_firestore26.getDocs)(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`);
@@ -8837,15 +8819,6 @@ async function getClinicsByFilters(db, filters) {
       const q = (0, import_firestore26.query)((0, import_firestore26.collection)(db, CLINICS_COLLECTION), ...constraints);
       const querySnapshot = await (0, import_firestore26.getDocs)(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`);
@@ -8864,21 +8837,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 = (0, import_geofire_common6.distanceBetween)(
         [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

package/dist/index.mjs

@@ -8812,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));
       }
@@ -8910,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`);
@@ -8939,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`);
@@ -8966,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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.8.16",
+  "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 })[];
 }