@blackcode_sa/metaestetics-api 1.8.14 → 1.8.16

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

@@ -899,146 +899,369 @@ export class ProcedureService extends BaseService {
     lastDoc: any;
   }> {
     try {
-      // Determine if we're doing a geo query or a regular query
-      const isGeoQuery =
-        filters.location && filters.radiusInKm && filters.radiusInKm > 0;
-
-      // Initialize base constraints
-      const constraints: QueryConstraint[] = [];
-
-      // Add active status filter (default to active if not specified)
-      if (filters.isActive !== undefined) {
-        constraints.push(where("isActive", "==", filters.isActive));
-      } else {
-        constraints.push(where("isActive", "==", true));
+      console.log("[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies");
+
+      // Geo query debug i validacija
+      if (filters.location && filters.radiusInKm) {
+        console.log('[PROCEDURE_SERVICE] Executing geo query:', {
+          location: filters.location,
+          radius: filters.radiusInKm,
+          serviceName: 'ProcedureService'
+        });
+        
+        // Validacija location podataka
+        if (!filters.location.latitude || !filters.location.longitude) {
+          console.warn('[PROCEDURE_SERVICE] Invalid location data:', filters.location);
+          filters.location = undefined;
+          filters.radiusInKm = undefined;
+        }
       }
 
-      // Filter by procedure family if specified
-      if (filters.procedureFamily) {
-        constraints.push(where("family", "==", filters.procedureFamily));
-      }
-      if (filters.procedureCategory) {
-        constraints.push(where("category.id", "==", filters.procedureCategory));
-      }
-      if (filters.procedureSubcategory) {
-        constraints.push(where("subcategory.id", "==", filters.procedureSubcategory));
-      }
-      if (filters.procedureTechnology) {
-        constraints.push(where("technology.id", "==", filters.procedureTechnology));
-      }
-      if (filters.minPrice !== undefined) {
-        constraints.push(where("price", ">=", filters.minPrice));
-      }
-      if (filters.maxPrice !== undefined) {
-        constraints.push(where("price", "<=", filters.maxPrice));
-      }
-      if (filters.minRating !== undefined) {
-        constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
-      }
-      if (filters.maxRating !== undefined) {
-        constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
-      }
-      if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
-        // Firestore ne podržava array-contains-all, koristi array-contains-any
-        constraints.push(where("treatmentBenefits", "array-contains-any", filters.treatmentBenefits));
-      }
-      // Text search by name (case-sensitive, Firestore limitation)
-      let useNameLower = false;
-      let searchTerm = "";
-      if (filters.nameSearch && filters.nameSearch.trim() !== "") {
-        searchTerm = filters.nameSearch.trim().toLowerCase();
-        useNameLower = true;
-        constraints.push(where("nameLower", ">=", searchTerm));
-        constraints.push(where("nameLower", "<=", searchTerm + "\uf8ff"));
-        constraints.push(orderBy("nameLower"));
-      } else {
-        constraints.push(orderBy("nameLower"));
+      // Handle geo queries separately (they work differently)
+      const isGeoQuery = filters.location && filters.radiusInKm && filters.radiusInKm > 0;
+      if (isGeoQuery) {
+        return this.handleGeoQuery(filters);
       }
-      if (filters.lastDoc) {
-        // Firestore pagination: support both QueryDocumentSnapshot and value arrays
-        if (typeof filters.lastDoc.data === "function") {
-          // QueryDocumentSnapshot
-          constraints.push(startAfter(filters.lastDoc));
-        } else if (Array.isArray(filters.lastDoc)) {
-          // Array of values for multiple orderBy fields
-          constraints.push(startAfter(...filters.lastDoc));
+
+      // Base constraints (used in all strategies)
+      const getBaseConstraints = () => {
+        const constraints: QueryConstraint[] = [];
+        
+        // Active status filter
+        if (filters.isActive !== undefined) {
+          constraints.push(where("isActive", "==", filters.isActive));
         } else {
-          // Single value
-          constraints.push(startAfter(filters.lastDoc));
+          constraints.push(where("isActive", "==", true));
         }
-      }
-      if (filters.pagination && filters.pagination > 0) {
-        constraints.push(limit(filters.pagination));
-      }
 
-      // Geo-query: special handling
-      if (isGeoQuery) {
-        // For geo queries, use geohash bounds and add all other constraints
-        const center = filters.location!;
-        const radiusInKm = filters.radiusInKm!;
-        const bounds = geohashQueryBounds(
-          [center.latitude, center.longitude],
-          radiusInKm * 1000 // Convert to meters
-        );
-        let allDocs: (Procedure & { distance: number })[] = [];
-        for (const bound of bounds) {
-          const geoConstraints = [
-            ...constraints.filter(c => !(c as any).fieldPath || (c as any).fieldPath !== "name"), // Remove name orderBy for geo
-            where("clinicInfo.location.geohash", ">=", bound[0]),
-            where("clinicInfo.location.geohash", "<=", bound[1]),
-            orderBy("clinicInfo.location.geohash"),
-          ];
-          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...geoConstraints);
-          const querySnapshot = await getDocs(q);
-          for (const doc of querySnapshot.docs) {
-            const procedure = { ...doc.data(), id: doc.id } as Procedure;
-            const distance = distanceBetween(
-              [center.latitude, center.longitude],
-              [procedure.clinicInfo.location.latitude, procedure.clinicInfo.location.longitude]
-            );
-            const distanceInKm = distance / 1000;
-            if (distanceInKm <= radiusInKm) {
-              allDocs.push({ ...procedure, distance: distanceInKm });
-            }
-          }
+        // Filter constraints
+        if (filters.procedureFamily) {
+          constraints.push(where("family", "==", filters.procedureFamily));
+        }
+        if (filters.procedureCategory) {
+          constraints.push(where("category.id", "==", filters.procedureCategory));
+        }
+        if (filters.procedureSubcategory) {
+          constraints.push(where("subcategory.id", "==", filters.procedureSubcategory));
         }
-        // Sort by distance
-        allDocs.sort((a, b) => a.distance - b.distance);
-        // Paginate
-        let paginated = allDocs;
-        if (filters.pagination && filters.pagination > 0) {
-          let startIndex = 0;
+        if (filters.procedureTechnology) {
+          constraints.push(where("technology.id", "==", filters.procedureTechnology));
+        }
+        if (filters.minPrice !== undefined) {
+          constraints.push(where("price", ">=", filters.minPrice));
+        }
+        if (filters.maxPrice !== undefined) {
+          constraints.push(where("price", "<=", filters.maxPrice));
+        }
+        if (filters.minRating !== undefined) {
+          constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
+        }
+        if (filters.maxRating !== undefined) {
+          constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
+        }
+        if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+          const benefitsToMatch = filters.treatmentBenefits;
+          constraints.push(where("treatmentBenefits", "array-contains-any", benefitsToMatch));
+        }
+
+        return constraints;
+      };
+
+      // Strategy 1: Try nameLower search if nameSearch exists
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        try {
+          console.log("[PROCEDURE_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"));
+
           if (filters.lastDoc) {
-            const lastDocIndex = allDocs.findIndex(p => p.id === filters.lastDoc.id);
-            if (lastDocIndex !== -1) startIndex = lastDocIndex + 1;
+            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));
+            }
           }
-          paginated = allDocs.slice(startIndex, startIndex + filters.pagination);
+          constraints.push(limit(filters.pagination || 10));
+
+          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+          const querySnapshot = await getDocs(q);
+          const procedures = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Procedure));
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          
+          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
+          
+          // Fix Load More - ako je broj rezultata manji od pagination, nema više
+          if (procedures.length < (filters.pagination || 10)) {
+            return { procedures, lastDoc: null };
+          }
+          return { procedures, lastDoc };
+        } catch (error) {
+          console.log("[PROCEDURE_SERVICE] Strategy 1 failed:", error);
         }
-        const lastVisibleDoc = paginated.length > 0 ? paginated[paginated.length - 1] : null;
-        return { procedures: paginated, lastDoc: lastVisibleDoc };
-      } else {
-        // Regular query
-        let q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-        let querySnapshot = await getDocs(q);
-        // Fallback na name ako nema rezultata i koristi se nameLower
-        if (useNameLower && querySnapshot.empty && searchTerm) {
-          // Ukloni poslednja 3 constraints (nameLower >=, nameLower <=, orderBy nameLower)
-          constraints.pop();
-          constraints.pop();
-          constraints.pop();
+      }
+
+      // Strategy 2: Try name field search as fallback
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        try {
+          console.log("[PROCEDURE_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"));
-          q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-          querySnapshot = await getDocs(q);
+
+          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 || 10));
+
+          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+          const querySnapshot = await getDocs(q);
+          const procedures = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Procedure));
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          
+          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
+          
+          // Fix Load More - ako je broj rezultata manji od pagination, nema više
+          if (procedures.length < (filters.pagination || 10)) {
+            return { procedures, lastDoc: null };
+          }
+          return { procedures, lastDoc };
+        } catch (error) {
+          console.log("[PROCEDURE_SERVICE] Strategy 2 failed:", error);
         }
-        const procedures = querySnapshot.docs.map((doc) => ({ ...doc.data(), id: doc.id } as Procedure));
-        const lastVisibleDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        return { procedures, lastDoc: lastVisibleDoc };
       }
+
+      // Strategy 3: orderBy createdAt with client-side filtering
+      try {
+        console.log("[PROCEDURE_SERVICE] Strategy 3: Using createdAt orderBy 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 || 10));
+
+        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let procedures = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Procedure));
+
+        // Apply all client-side filters using centralized function
+        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`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (procedures.length < (filters.pagination || 10)) {
+          return { procedures, lastDoc: null };
+        }
+        return { procedures, lastDoc };
+      } catch (error) {
+        console.log("[PROCEDURE_SERVICE] Strategy 3 failed:", error);
+      }
+
+      // Strategy 4: Minimal query fallback
+      try {
+        console.log("[PROCEDURE_SERVICE] Strategy 4: Minimal query fallback");
+        const constraints: QueryConstraint[] = [
+          where("isActive", "==", true),
+          orderBy("createdAt", "desc"),
+          limit(filters.pagination || 10)
+        ];
+
+        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let procedures = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Procedure));
+
+        // Apply all client-side filters using centralized function
+        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`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (procedures.length < (filters.pagination || 10)) {
+          return { procedures, lastDoc: null };
+        }
+        return { procedures, lastDoc };
+      } catch (error) {
+        console.log("[PROCEDURE_SERVICE] Strategy 4 failed:", error);
+      }
+
+      // All strategies failed
+      console.log("[PROCEDURE_SERVICE] All strategies failed, returning empty result");
+      return { procedures: [], lastDoc: null };
+
     } catch (error) {
       console.error("[PROCEDURE_SERVICE] Error filtering procedures:", error);
-      throw error;
+      return { procedures: [], lastDoc: null };
+    }
+  }
+
+  /**
+   * Applies in-memory filters to procedures array
+   * Used when Firestore queries fail or for complex filtering
+   */
+  private applyInMemoryFilters(procedures: Procedure[], filters: any): (Procedure & { distance?: number })[] {
+    let filteredProcedures = [...procedures]; // Create copy to avoid mutating original
+
+    // Name search filter
+    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}`);
+    }
+
+    // Price filtering
+    if (filters.minPrice !== undefined || filters.maxPrice !== undefined) {
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const price = procedure.price || 0;
+        if (filters.minPrice !== undefined && price < filters.minPrice) return false;
+        if (filters.maxPrice !== undefined && price > filters.maxPrice) return false;
+        return true;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied price filter (${filters.minPrice}-${filters.maxPrice}), results: ${filteredProcedures.length}`);
+    }
+
+    // Rating filtering
+    if (filters.minRating !== undefined || filters.maxRating !== undefined) {
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const rating = procedure.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(`[PROCEDURE_SERVICE] Applied rating filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Treatment benefits filtering
+    if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+      const benefitsToMatch = filters.treatmentBenefits;
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const procedureBenefits = procedure.treatmentBenefits || [];
+        return benefitsToMatch.some((benefit: any) => procedureBenefits.includes(benefit));
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied benefits filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Procedure family filtering
+    if (filters.procedureFamily) {
+      filteredProcedures = filteredProcedures.filter(procedure => procedure.family === filters.procedureFamily);
+      console.log(`[PROCEDURE_SERVICE] Applied family filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Category filtering
+    if (filters.procedureCategory) {
+      filteredProcedures = filteredProcedures.filter(procedure => procedure.category?.id === filters.procedureCategory);
+      console.log(`[PROCEDURE_SERVICE] Applied category filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Subcategory filtering
+    if (filters.procedureSubcategory) {
+      filteredProcedures = filteredProcedures.filter(procedure => procedure.subcategory?.id === filters.procedureSubcategory);
+      console.log(`[PROCEDURE_SERVICE] Applied subcategory filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Technology filtering
+    if (filters.procedureTechnology) {
+      filteredProcedures = filteredProcedures.filter(procedure => procedure.technology?.id === filters.procedureTechnology);
+      console.log(`[PROCEDURE_SERVICE] Applied technology filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Geo-radius filter
+    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const clinicLocation = procedure.clinicInfo?.location;
+        if (!clinicLocation?.latitude || !clinicLocation?.longitude) {
+          return false;
+        }
+        
+        const distance = distanceBetween(
+          [location.latitude, location.longitude],
+          [clinicLocation.latitude, clinicLocation.longitude]
+        ) / 1000; // Convert to km
+        
+        // Attach distance for frontend sorting/display
+        (procedure as any).distance = distance;
+        
+        return distance <= radiusInKm;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied geo filter, results: ${filteredProcedures.length}`);
+      
+      // Sort by distance when geo filtering is applied
+      filteredProcedures.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
+    }
+
+    return filteredProcedures as (Procedure & { distance?: number })[];
+  }
+
+  private handleGeoQuery(filters: any): Promise<{ procedures: (Procedure & { distance?: number })[]; lastDoc: any }> {
+    console.log('[PROCEDURE_SERVICE] Executing geo query with enhanced debugging');
+    
+    try {
+      // Enhanced geo query implementation with proper debugging
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      
+      console.log('[PROCEDURE_SERVICE] Geo query parameters:', {
+        latitude: location.latitude,
+        longitude: location.longitude,
+        radiusInKm: radiusInKm,
+        pagination: filters.pagination || 10
+      });
+
+      // For now, return a basic query and apply geo filtering
+      // This can be enhanced with proper geohash bounds later
+      const constraints: QueryConstraint[] = [
+        where("isActive", "==", true),
+        orderBy("createdAt", "desc"),
+        limit((filters.pagination || 10) * 3) // Get more results for geo filtering
+      ];
+
+      const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+      
+      return getDocs(q).then(querySnapshot => {
+        let procedures = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Procedure));
+        
+        // Apply all filters using centralized function (includes geo filtering)
+        procedures = this.applyInMemoryFilters(procedures, filters);
+        
+        console.log(`[PROCEDURE_SERVICE] Geo query success: ${procedures.length} procedures within ${radiusInKm}km`);
+        
+        // Fix Load More for geo queries
+        const lastDoc = procedures.length < (filters.pagination || 10) ? null : querySnapshot.docs[querySnapshot.docs.length - 1];
+        
+        return { procedures, lastDoc };
+      });
+      
+    } catch (error) {
+      console.error('[PROCEDURE_SERVICE] Geo query failed:', error);
+      return Promise.resolve({ procedures: [], lastDoc: null });
     }
   }