@blackcode_sa/metaestetics-api 1.8.14 → 1.8.16

package/package.json

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

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

@@ -14,7 +14,7 @@ import { Clinic, ClinicTag, CLINICS_COLLECTION } from "../../../types/clinic";
 import { geohashQueryBounds, distanceBetween } from "geofire-common";
 
 /**
- * Get clinics based on multiple filtering criteria
+ * Get clinics based on multiple filtering criteria with fallback strategies
  *
  * @param db - Firestore database instance
  * @param filters - Various filters to apply
@@ -41,79 +41,264 @@ export async function getClinicsByFilters(
   clinics: (Clinic & { distance?: number })[];
   lastDoc: any;
 }> {
-  // 1. Prepare Firestore constraints
-  const constraints: QueryConstraint[] = [];
-  constraints.push(where("isActive", "==", filters.isActive ?? true));
+  try {
+    console.log("[CLINIC_SERVICE] Starting clinic filtering with multiple strategies");
+    
+    // Geo query debug i validacija
+    if (filters.center && filters.radiusInKm) {
+      console.log('[CLINIC_SERVICE] Executing geo query:', {
+        center: filters.center,
+        radius: filters.radiusInKm,
+        serviceName: 'ClinicService'
+      });
+      
+      // Validacija location podataka
+      if (!filters.center.latitude || !filters.center.longitude) {
+        console.warn('[CLINIC_SERVICE] Invalid location data:', filters.center);
+        filters.center = undefined;
+        filters.radiusInKm = undefined;
+      }
+    }
 
-  // Tag (only first, Firestore limitation)
-  if (filters.tags && filters.tags.length > 0) {
-    constraints.push(where("tags", "array-contains", filters.tags[0]));
-  }
+    // Base constraints function (used in all strategies)
+    const getBaseConstraints = () => {
+      const constraints: QueryConstraint[] = [];
+      constraints.push(where("isActive", "==", filters.isActive ?? true));
+      
+      // Tag (only first, due to Firestore limitation)
+      if (filters.tags && filters.tags.length > 0) {
+        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));
+      }
+      if (filters.maxRating !== undefined) {
+        constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
+      }
+      
+      return constraints;
+    };
 
-  // Procedure filters (most specific)
-  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));
-  }
+    // Strategy 1: Try nameLower search if nameSearch exists
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      try {
+        console.log("[CLINIC_SERVICE] Strategy 1: Trying nameLower search");
+        const searchTerm = filters.nameSearch.trim().toLowerCase();
+        const constraints = getBaseConstraints();
+        constraints.push(where("nameLower", ">=", searchTerm));
+        constraints.push(where("nameLower", "<=", searchTerm + "\uf8ff"));
+        constraints.push(orderBy("nameLower"));
 
-  // Text search by nameLower
-  let useNameLower = false;
-  let searchTerm = "";
-  if (filters.nameSearch && filters.nameSearch.trim()) {
-    searchTerm = filters.nameSearch.trim().toLowerCase();
-    constraints.push(where("nameLower", ">=", searchTerm));
-    constraints.push(where("nameLower", "<=", searchTerm + "\uf8ff"));
-    useNameLower = true;
-  }
+        if (filters.lastDoc) {
+          if (typeof filters.lastDoc.data === "function") {
+            constraints.push(startAfter(filters.lastDoc));
+          } else if (Array.isArray(filters.lastDoc)) {
+            constraints.push(startAfter(...filters.lastDoc));
+          } else {
+            constraints.push(startAfter(filters.lastDoc));
+          }
+        }
+        constraints.push(limit(filters.pagination || 5));
 
-  // Rating filters
-  if (filters.minRating !== undefined) {
-    constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
-  }
-  if (filters.maxRating !== undefined) {
-    constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
-  }
+        const q = query(collection(db, CLINICS_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let clinics = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Clinic));
+        
+        // Apply in-memory filters
+        clinics = applyInMemoryFilters(clinics, filters);
+        
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        
+        console.log(`[CLINIC_SERVICE] Strategy 1 success: ${clinics.length} clinics`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (clinics.length < (filters.pagination || 5)) {
+          return { clinics, lastDoc: null };
+        }
+        return { clinics, lastDoc };
+      } catch (error) {
+        console.log("[CLINIC_SERVICE] Strategy 1 failed:", error);
+      }
+    }
 
-  // Pagination and ordering
-  constraints.push(orderBy("nameLower"));
-  if (filters.lastDoc) {
-    if (typeof filters.lastDoc.data === "function") {
-      constraints.push(startAfter(filters.lastDoc));
-    } else if (Array.isArray(filters.lastDoc)) {
-      constraints.push(startAfter(...filters.lastDoc));
-    } else {
-      constraints.push(startAfter(filters.lastDoc));
+    // Strategy 2: Try name field search as fallback
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      try {
+        console.log("[CLINIC_SERVICE] Strategy 2: Trying name field search");
+        const searchTerm = filters.nameSearch.trim().toLowerCase();
+        const constraints = getBaseConstraints();
+        constraints.push(where("name", ">=", searchTerm));
+        constraints.push(where("name", "<=", searchTerm + "\uf8ff"));
+        constraints.push(orderBy("name"));
+
+        if (filters.lastDoc) {
+          if (typeof filters.lastDoc.data === "function") {
+            constraints.push(startAfter(filters.lastDoc));
+          } else if (Array.isArray(filters.lastDoc)) {
+            constraints.push(startAfter(...filters.lastDoc));
+          } else {
+            constraints.push(startAfter(filters.lastDoc));
+          }
+        }
+        constraints.push(limit(filters.pagination || 5));
+
+        const q = query(collection(db, CLINICS_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let clinics = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Clinic));
+        
+        // Apply in-memory filters
+        clinics = applyInMemoryFilters(clinics, filters);
+        
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        
+        console.log(`[CLINIC_SERVICE] Strategy 2 success: ${clinics.length} clinics`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (clinics.length < (filters.pagination || 5)) {
+          return { clinics, lastDoc: null };
+        }
+        return { clinics, lastDoc };
+      } catch (error) {
+        console.log("[CLINIC_SERVICE] Strategy 2 failed:", error);
+      }
     }
-  }
-  constraints.push(limit(filters.pagination || 5));
 
-  // 2. Firestore query
-  const q = query(collection(db, CLINICS_COLLECTION), ...constraints);
-  const querySnapshot = await getDocs(q);
-  let clinics = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Clinic));
+    // Strategy 3: createdAt ordering with client-side name filtering
+    try {
+      console.log("[CLINIC_SERVICE] Strategy 3: Using createdAt ordering with client-side filtering");
+      const constraints = getBaseConstraints();
+      constraints.push(orderBy("createdAt", "desc"));
+
+      if (filters.lastDoc) {
+        if (typeof filters.lastDoc.data === "function") {
+          constraints.push(startAfter(filters.lastDoc));
+        } else if (Array.isArray(filters.lastDoc)) {
+          constraints.push(startAfter(...filters.lastDoc));
+        } else {
+          constraints.push(startAfter(filters.lastDoc));
+        }
+      }
+      constraints.push(limit(filters.pagination || 5));
 
-  // 3. In-memory filters for multi-tag and geo-radius
+      const q = query(collection(db, CLINICS_COLLECTION), ...constraints);
+      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
+      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`);
+      
+      // Fix Load More - ako je broj rezultata manji od pagination, nema više
+      if (clinics.length < (filters.pagination || 5)) {
+        return { clinics, lastDoc: null };
+      }
+      return { clinics, lastDoc };
+    } catch (error) {
+      console.log("[CLINIC_SERVICE] Strategy 3 failed:", error);
+    }
+
+    // Strategy 4: Minimal fallback query
+    try {
+      console.log("[CLINIC_SERVICE] Strategy 4: Minimal fallback");
+      const constraints: QueryConstraint[] = [
+        where("isActive", "==", true),
+        orderBy("createdAt", "desc"),
+        limit(filters.pagination || 5)
+      ];
+
+      const q = query(collection(db, CLINICS_COLLECTION), ...constraints);
+      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
+      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`);
+      
+      // Fix Load More - ako je broj rezultata manji od pagination, nema više
+      if (clinics.length < (filters.pagination || 5)) {
+        return { clinics, lastDoc: null };
+      }
+      return { clinics, lastDoc };
+    } catch (error) {
+      console.log("[CLINIC_SERVICE] Strategy 4 failed:", error);
+    }
+
+    // All strategies failed
+    console.log("[CLINIC_SERVICE] All strategies failed, returning empty result");
+    return { clinics: [], lastDoc: null };
+
+  } catch (error) {
+    console.error("[CLINIC_SERVICE] Error filtering clinics:", error);
+    return { clinics: [], lastDoc: null };
+  }
+}
+
+/**
+ * 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)
   if (filters.tags && filters.tags.length > 1) {
-    clinics = clinics.filter(clinic => filters.tags!.every(tag => clinic.tags.includes(tag)));
+    clinics = clinics.filter(clinic => filters.tags!.every((tag: ClinicTag) => clinic.tags.includes(tag)));
   }
+  
+  // Geo-radius filter
   if (filters.center && filters.radiusInKm) {
     clinics = clinics.filter(clinic => {
       const distance = distanceBetween(
         [filters.center!.latitude, filters.center!.longitude],
         [clinic.location.latitude, clinic.location.longitude]
-      ) / 1000;
-      // Optionally attach distance for frontend
+      ) / 1000; // Convert to km
+      
+      // Attach distance for frontend sorting/display
       (clinic as any).distance = distance;
       return distance <= filters.radiusInKm!;
     });
+    
+    // Sort by distance when geo filtering is applied
+    clinics.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
   }
-
-  // 4. Return results and lastDoc
-  const lastVisibleDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-  return { clinics, lastDoc: lastVisibleDoc };
+  
+  return clinics as (Clinic & { distance?: number })[];
 }