@blackcode_sa/metaestetics-api 1.8.13 → 1.8.15

package/src/services/practitioner/practitioner.service.ts

@@ -726,7 +726,7 @@ export class PractitionerService extends BaseService {
       const currentPractitioner = practitionerDoc.data() as Practitioner;
 
       // Process basicInfo if it's being updated to handle profile photo uploads
-      let processedData = { ...validData };
+      let processedData: UpdatePractitionerData & { fullNameLower?: string } = { ...validData };
       if (validData.basicInfo) {
         processedData.basicInfo = await this.processBasicInfo(
           validData.basicInfo as PractitionerBasicInfo & {
@@ -734,10 +734,12 @@ export class PractitionerService extends BaseService {
           },
           practitionerId
         );
+        // Always update fullNameLower when basicInfo changes
+        processedData.fullNameLower = `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
       }
 
       // Prepare update data
-      const updateData = {
+      const updateData: any = {
         ...processedData,
         updatedAt: serverTimestamp(),
       };
@@ -1041,101 +1043,212 @@ export class PractitionerService extends BaseService {
     includeDraftPractitioners?: boolean;
   }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
     try {
-      // 1. Prepare Firestore constraints
-      const constraints: any[] = [];
-      if (!filters.includeDraftPractitioners) {
-        constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
-      }
-      constraints.push(where("isActive", "==", true));
-
-      // Certifications
-      if (filters.certifications && filters.certifications.length > 0) {
-        constraints.push(
-          where(
-            "certification.certifications",
-            "array-contains-any",
-            filters.certifications
-          )
-        );
+      console.log("[PRACTITIONER_SERVICE] Starting practitioner filtering with fallback strategies");
+
+      // Geo query debug i validacija
+      if (filters.location && filters.radiusInKm) {
+        console.log('[PRACTITIONER_SERVICE] Executing geo query:', {
+          location: filters.location,
+          radius: filters.radiusInKm,
+          serviceName: 'PractitionerService'
+        });
+        
+        // Validacija location podataka
+        if (!filters.location.latitude || !filters.location.longitude) {
+          console.warn('[PRACTITIONER_SERVICE] Invalid location data:', filters.location);
+          filters.location = undefined;
+          filters.radiusInKm = undefined;
+        }
       }
 
-      // Text search by fullNameLower
+      // Strategy 1: Try fullNameLower search if nameSearch exists
       if (filters.nameSearch && filters.nameSearch.trim()) {
-        const searchTerm = filters.nameSearch.trim().toLowerCase();
-        constraints.push(where("fullNameLower", ">=", searchTerm));
-        constraints.push(where("fullNameLower", "<=", searchTerm + "\uf8ff"));
+        try {
+          console.log("[PRACTITIONER_SERVICE] Strategy 1: Trying fullNameLower search");
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          const constraints: any[] = [];
+          
+          if (!filters.includeDraftPractitioners) {
+            constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
+          }
+          constraints.push(where("isActive", "==", true));
+          constraints.push(where("fullNameLower", ">=", searchTerm));
+          constraints.push(where("fullNameLower", "<=", searchTerm + "\uf8ff"));
+          constraints.push(orderBy("fullNameLower"));
+
+          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, PRACTITIONERS_COLLECTION), ...constraints);
+          const querySnapshot = await getDocs(q);
+          const practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          
+          console.log(`[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`);
+          
+          // Fix Load More - ako je broj rezultata manji od pagination, nema više
+          if (practitioners.length < (filters.pagination || 10)) {
+            return { practitioners, lastDoc: null };
+          }
+          return { practitioners, lastDoc };
+        } catch (error) {
+          console.log("[PRACTITIONER_SERVICE] Strategy 1 failed:", error);
+        }
       }
 
-      // Procedure filters (if mapped to fields)
-      if (filters.procedureTechnology) {
-        constraints.push(where("proceduresInfo.technologyName", "==", filters.procedureTechnology));
-      } else if (filters.procedureSubcategory) {
-        constraints.push(where("proceduresInfo.subcategoryName", "==", filters.procedureSubcategory));
-      } else if (filters.procedureCategory) {
-        constraints.push(where("proceduresInfo.categoryName", "==", filters.procedureCategory));
-      } else if (filters.procedureFamily) {
-        constraints.push(where("proceduresInfo.family", "==", filters.procedureFamily));
-      }
+      // Strategy 2: Basic query with createdAt ordering (no name search)
+      try {
+        console.log("[PRACTITIONER_SERVICE] Strategy 2: Basic query with createdAt ordering");
+        const constraints: any[] = [];
+        
+        if (!filters.includeDraftPractitioners) {
+          constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
+        }
+        constraints.push(where("isActive", "==", true));
 
-      // Rating filters
-      if (filters.minRating !== undefined) {
-        constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
-      }
-      if (filters.maxRating !== undefined) {
-        constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
-      }
+        // Add other filters that work well with Firestore
+        if (filters.certifications && filters.certifications.length > 0) {
+          constraints.push(
+            where("certification.specialties", "array-contains-any", filters.certifications)
+          );
+        }
+
+        if (filters.minRating !== undefined) {
+          constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
+        }
+        if (filters.maxRating !== undefined) {
+          constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
+        }
+
+        constraints.push(orderBy("createdAt", "desc"));
 
-      // Pagination and ordering
-      constraints.push(orderBy("fullNameLower"));
-      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));
+        // Pagination sa createdAt - poboljšano za geo queries
+        if (filters.location && filters.radiusInKm) {
+          // Ne koristiti lastDoc za geo queries, već preuzmi više rezultata
+          constraints.push(limit((filters.pagination || 10) * 2)); // Dvostruko više za geo filter
         } else {
-          constraints.push(startAfter(filters.lastDoc));
+          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, PRACTITIONERS_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+
+        // Apply geo filter if needed (this is the only in-memory filter we keep)
+        if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+          const location = filters.location;
+          const radiusInKm = filters.radiusInKm;
+          practitioners = practitioners.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 / 1000;
+              return distanceInKm <= radiusInKm;
+            });
+          });
+          
+          // Ograniči na pagination broj nakon geo filtera
+          practitioners = practitioners.slice(0, filters.pagination || 10);
+        }
+
+        // Apply client-side name filtering if needed
+        if (filters.nameSearch && filters.nameSearch.trim()) {
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          practitioners = practitioners.filter(practitioner => {
+            const firstName = (practitioner.basicInfo?.firstName || '').toLowerCase();
+            const lastName = (practitioner.basicInfo?.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}`);
+        }
+
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        console.log(`[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (practitioners.length < (filters.pagination || 10)) {
+          return { practitioners, lastDoc: null };
         }
+        return { practitioners, lastDoc };
+      } catch (error) {
+        console.log("[PRACTITIONER_SERVICE] Strategy 2 failed:", error);
       }
-      constraints.push(limit(filters.pagination || 5));
 
-      // 2. Firestore query
-      const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
-      const querySnapshot = await getDocs(q);
-      let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
-
-      // 3. In-memory filter ONLY for geo-radius (if needed)
-      if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
-        const location = filters.location;
-        const radiusInKm = filters.radiusInKm;
-        practitioners = practitioners.filter((practitioner) => {
-          // Use the aggregated clinicsInfo to check if any clinic is within range
-          const clinics = practitioner.clinicsInfo || [];
-          return clinics.some((clinic) => {
-            // Calculate distance
-            const distance = distanceBetween(
-              [location.latitude, location.longitude],
-              [clinic.location.latitude, clinic.location.longitude]
-            );
-            // Convert to kilometers
-            const distanceInKm = distance / 1000;
-            // Check if within radius
-            return distanceInKm <= radiusInKm;
+      // Strategy 3: Minimal query fallback
+      try {
+        console.log("[PRACTITIONER_SERVICE] Strategy 3: Minimal query fallback");
+        const constraints: any[] = [
+          where("isActive", "==", true),
+          orderBy("createdAt", "desc"),
+          limit(filters.pagination || 10)
+        ];
+
+        const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+
+        // Apply client-side name filtering if needed
+        if (filters.nameSearch && filters.nameSearch.trim()) {
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          practitioners = practitioners.filter(practitioner => {
+            const firstName = (practitioner.basicInfo?.firstName || '').toLowerCase();
+            const lastName = (practitioner.basicInfo?.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}`);
+        }
+
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        console.log(`[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`);
+        
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (practitioners.length < (filters.pagination || 10)) {
+          return { practitioners, lastDoc: null };
+        }
+        return { practitioners, lastDoc };
+      } catch (error) {
+        console.log("[PRACTITIONER_SERVICE] Strategy 3 failed:", error);
       }
 
-      // 4. Return results and lastDoc
-      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-      return {
-        practitioners,
-        lastDoc,
-      };
+      // All strategies failed
+      console.log("[PRACTITIONER_SERVICE] All strategies failed, returning empty result");
+      return { practitioners: [], lastDoc: null };
+
     } catch (error) {
-      console.error(
-        "[PRACTITIONER_SERVICE] Error filtering practitioners:",
-        error
-      );
-      throw error;
+      console.error("[PRACTITIONER_SERVICE] Error filtering practitioners:", error);
+      return { practitioners: [], lastDoc: null };
     }
   }