@blackcode_sa/metaestetics-api 1.8.13 → 1.8.15

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

@@ -899,146 +899,302 @@ 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));
         }
-        // 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.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) {
+          constraints.push(where("treatmentBenefits", "array-contains-any", filters.treatmentBenefits));
+        }
+
+        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));
+            }
+          }
+          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 };
           }
-          paginated = allDocs.slice(startIndex, startIndex + filters.pagination);
+          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);
+        }
+      }
+
+      // 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));
+
+        // Poboljšan client-side name filtering
+        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}`);
+        }
+
+        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 };
         }
-        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 };
+        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));
+
+        // Poboljšan client-side name filtering
+        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}`);
+        }
+
+        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 };
+    }
+  }
+
+  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 geo filtering
+        procedures = procedures.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
+          
+          // Add distance to procedure object
+          (procedure as any).distance = distance;
+          
+          return distance <= radiusInKm;
+        });
+
+        // Sort by distance
+        procedures.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
+        
+        // Limit to pagination size
+        procedures = procedures.slice(0, filters.pagination || 10);
+        
+        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 });
     }
   }
 

package/src/admin/scripts/migrateProcedures.js

@@ -1,23 +0,0 @@
-const admin = require("firebase-admin");
-const serviceAccount = require("./serviceAccountKey.json");
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-  projectId: "metaestetics"
-});
-
-const db = admin.firestore();
-
-async function migrateProcedures() {
-  const snapshot = await db.collection("procedures").get();
-  for (const doc of snapshot.docs) {
-    const data = doc.data();
-    if (!data.nameLower && data.name) {
-      await doc.ref.update({ nameLower: data.name.toLowerCase() });
-      console.log(`Updated ${doc.id}`);
-    }
-  }
-  console.log("Migration complete!");
-}
-
-migrateProcedures(); 

package/src/admin/scripts/serviceAccountKey.json

@@ -1,13 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "metaestetics",
-  "private_key_id": "e2dccd35845667bdebcea99959ca40a52f54d27f",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7yzLPjlr/6pSA\ns3Og/2kuwdAfoBr8+M2HoVlydy/WXm73u29i9ps+ilvUBB90PRkidBCaBmqOwjdV\n0MEgUWF+7Zi3PLbfuFGX929uzpAEWuNR3ZqiyrtqsnGycNw0tdccH/RM4pTgDrLP\nETyN6HlnKIcaPgpU/qKXasOYEv8UlMRuSAFG6ZjsMr15fHzECgHNUqDwHz4u1aN3\nNDwYAnucVIpCQqKjwp6nxtSO8WSLKP5P/E3J2Dob1EYEPf8UvhXwtWVXXI/rbIQe\nfnQopHSLesvw2poks9hCQXNsLNptCRG3hj1asNZ6HutMPWqQPAKss/FpkkF6/RNu\niOnWOzf/AgMBAAECggEAFnQpUx/WSZsmvmy2ep2PWgPaeq2ODIlDKeBk7YbKtXr9\nEanbm52Y2lV4vVTw3dkgVDpEceYqf39BVoVrUg3o9mA6Tk54Hy/OsbjoHfucxKiJ\nXZR9lNFgr1U+uvM7oSHM4pP/heHhoxie0Jti/iS5v1fdL4oTei4oCqq9UEWVMkSS\n52yoBH7oeH15WVp2B3KEVU7cAI5MeFXQxQ8idFfqqShhR5uQnwx8uR38b9vaq+Cy\nK5zV+dStsphVq3/gEsjmFkYe7BgpMQyHkw7kmNuISDYdy/W1G6t0kUNn5LzhJ88E\nICr1FttaNQDeBE4VgnC3Daj1hBOQyrbGszbgxmklgQKBgQDm1f3uyLwmVTsTF3sE\nsggTYsmz9AppI778IuWjhiegfmbWI5YsgGl9c9XOcBCZ+2vI7rIDeFneRxBX4TrT\nAPcT+z8AG5PiJuyOa7Nny+tNzplfPf/2X2MrQXaYvWihPWDZtXmqYY3p/Z8wkYhA\n1C/2vMLyKiP/Md7mtSBXmjgnrwKBgQDQRAQL69osb07mJDNoln+FWyQhJQoVQFSw\npPBkcic0d1gglW7ne2O43mOUG7t3EQBPgXg8xXMiv4dqz1PQpVJp4CewCklbAh/C\nfFmhWCUvgG21Sc3t0hpvsPLN3xeqVOUeB5FNhf5t+j4HqTGClD98Plks0iXVnfFO\nPmNYK764sQKBgD4W+UKtQ86bxlQQUMqmiH2OaOq6jcJSFyEC0fn2L9p/pXGcCNzX\nfYh9C9mHUy/X7NoTOlasnJ+pRcAdmREAhXUec4e340NFbQOx/IPC2fwHwkFYD+1Z\nIveTmC7lY6tbMx3cLmmh6+Ywjg0mWBv39x7LDzTMGPqfk3FC7vwhQ1GJAoGARpoY\nKRZuYsvlGl3BU75ZQpMQH3BYB7ZEP5HasKKGKeIfbQRbkXuh5cT2SvpPxeBsk4dX\nhHqHOotlU88vIbc5xgyoR6RlE8YXkC3pkKm6CW1nQ6LefbXRInYBCcuMUUDwXwq/\ntmErTIsdxikUUKkDEJJuVqRzEQS3DghWU0iZIjECgYEA5PMdyGMZJQVTzP/QjSjC\no5uEDGOAjg/wMGFfXRbKBcJZ1yoqUuSOKuuacyNborfTj3RTckl9uO/I68wnFk5p\nRNNndYQXWAmjSvPBKnRuE+eSE1eDPmpZPPBgJqwbSxUfWMprY7yEWpKF2oEbkzpD\nrUkzrniMVABYZnj8CoNV3DM=\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-5nsyj@metaestetics.iam.gserviceaccount.com",
-  "client_id": "114278988963249785723",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-5nsyj%40metaestetics.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}