@blackcode_sa/metaestetics-api 1.15.6 → 1.15.7

package/dist/index.js

@@ -13924,25 +13924,52 @@ var PractitionerService = class extends BaseService {
           constraints.push((0, import_firestore36.where)("fullNameLower", ">=", searchTerm));
           constraints.push((0, import_firestore36.where)("fullNameLower", "<=", searchTerm + "\uF8FF"));
           constraints.push((0, import_firestore36.orderBy)("fullNameLower"));
-          if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push((0, import_firestore36.startAfter)(...filters.lastDoc));
-            } else {
-              constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
+          if (filters.location && filters.radiusInKm) {
+            if (filters.lastDoc) {
+              if (typeof filters.lastDoc.data === "function") {
+                constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
+              } else if (Array.isArray(filters.lastDoc)) {
+                constraints.push((0, import_firestore36.startAfter)(...filters.lastDoc));
+              } else {
+                constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
+              }
+            }
+            constraints.push((0, import_firestore36.limit)((filters.pagination || 10) * 2));
+          } else {
+            if (filters.lastDoc) {
+              if (typeof filters.lastDoc.data === "function") {
+                constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
+              } else if (Array.isArray(filters.lastDoc)) {
+                constraints.push((0, import_firestore36.startAfter)(...filters.lastDoc));
+              } else {
+                constraints.push((0, import_firestore36.startAfter)(filters.lastDoc));
+              }
             }
+            constraints.push((0, import_firestore36.limit)(filters.pagination || 10));
           }
-          constraints.push((0, import_firestore36.limit)(filters.pagination || 10));
           const q = (0, import_firestore36.query)(
             (0, import_firestore36.collection)(this.db, PRACTITIONERS_COLLECTION),
             ...constraints
           );
           const querySnapshot = await (0, import_firestore36.getDocs)(q);
-          const practitioners = querySnapshot.docs.map(
+          let practitioners = querySnapshot.docs.map(
             (doc51) => ({ ...doc51.data(), id: doc51.id })
           );
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          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 distanceInKm = (0, import_geofire_common2.distanceBetween)(
+                  [location.latitude, location.longitude],
+                  [clinic.location.latitude, clinic.location.longitude]
+                );
+                return distanceInKm <= radiusInKm;
+              });
+            });
+          }
           console.log(
             `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
           );
@@ -14012,11 +14039,10 @@ var PractitionerService = class extends BaseService {
           practitioners = practitioners.filter((practitioner) => {
             const clinics = practitioner.clinicsInfo || [];
             return clinics.some((clinic) => {
-              const distance = (0, import_geofire_common2.distanceBetween)(
+              const distanceInKm = (0, import_geofire_common2.distanceBetween)(
                 [location.latitude, location.longitude],
                 [clinic.location.latitude, clinic.location.longitude]
               );
-              const distanceInKm = distance / 1e3;
               return distanceInKm <= radiusInKm;
             });
           });
@@ -14215,11 +14241,10 @@ var PractitionerService = class extends BaseService {
       filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const clinics = practitioner.clinicsInfo || [];
         return clinics.some((clinic) => {
-          const distance = (0, import_geofire_common2.distanceBetween)(
+          const distanceInKm = (0, import_geofire_common2.distanceBetween)(
             [location.latitude, location.longitude],
             [clinic.location.latitude, clinic.location.longitude]
           );
-          const distanceInKm = distance / 1e3;
           return distanceInKm <= radiusInKm;
         });
       });
@@ -15965,7 +15990,7 @@ async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc,
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       );
-      const distanceInKm = distance / 1e3;
+      const distanceInKm = distance;
       if (distanceInKm <= rangeInKm) {
         const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
@@ -16084,7 +16109,7 @@ async function findClinicsInRadius(db, center, radiusInKm, filters) {
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       );
-      const distanceInKm = distance / 1e3;
+      const distanceInKm = distance;
       if (distanceInKm <= radiusInKm) {
         matchingDocs.push(clinic);
       }
@@ -16406,7 +16431,7 @@ function applyInMemoryFilters(clinics, filters) {
       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)`
       );
@@ -24119,7 +24144,7 @@ var ProcedureService = class extends BaseService {
         const distance = (0, import_geofire_common8.distanceBetween)(
           [location.latitude, location.longitude],
           [clinicLocation.latitude, clinicLocation.longitude]
-        ) / 1e3;
+        );
         procedure.distance = distance;
         return distance <= radiusInKm;
       });

package/dist/index.mjs

@@ -13945,25 +13945,52 @@ var PractitionerService = class extends BaseService {
           constraints.push(where13("fullNameLower", ">=", searchTerm));
           constraints.push(where13("fullNameLower", "<=", searchTerm + "\uF8FF"));
           constraints.push(orderBy4("fullNameLower"));
-          if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push(startAfter6(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push(startAfter6(...filters.lastDoc));
-            } else {
-              constraints.push(startAfter6(filters.lastDoc));
+          if (filters.location && filters.radiusInKm) {
+            if (filters.lastDoc) {
+              if (typeof filters.lastDoc.data === "function") {
+                constraints.push(startAfter6(filters.lastDoc));
+              } else if (Array.isArray(filters.lastDoc)) {
+                constraints.push(startAfter6(...filters.lastDoc));
+              } else {
+                constraints.push(startAfter6(filters.lastDoc));
+              }
+            }
+            constraints.push(limit7((filters.pagination || 10) * 2));
+          } else {
+            if (filters.lastDoc) {
+              if (typeof filters.lastDoc.data === "function") {
+                constraints.push(startAfter6(filters.lastDoc));
+              } else if (Array.isArray(filters.lastDoc)) {
+                constraints.push(startAfter6(...filters.lastDoc));
+              } else {
+                constraints.push(startAfter6(filters.lastDoc));
+              }
             }
+            constraints.push(limit7(filters.pagination || 10));
           }
-          constraints.push(limit7(filters.pagination || 10));
           const q = query13(
             collection13(this.db, PRACTITIONERS_COLLECTION),
             ...constraints
           );
           const querySnapshot = await getDocs13(q);
-          const practitioners = querySnapshot.docs.map(
+          let practitioners = querySnapshot.docs.map(
             (doc51) => ({ ...doc51.data(), id: doc51.id })
           );
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          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 distanceInKm = distanceBetween(
+                  [location.latitude, location.longitude],
+                  [clinic.location.latitude, clinic.location.longitude]
+                );
+                return distanceInKm <= radiusInKm;
+              });
+            });
+          }
           console.log(
             `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
           );
@@ -14033,11 +14060,10 @@ var PractitionerService = class extends BaseService {
           practitioners = practitioners.filter((practitioner) => {
             const clinics = practitioner.clinicsInfo || [];
             return clinics.some((clinic) => {
-              const distance = distanceBetween(
+              const distanceInKm = distanceBetween(
                 [location.latitude, location.longitude],
                 [clinic.location.latitude, clinic.location.longitude]
               );
-              const distanceInKm = distance / 1e3;
               return distanceInKm <= radiusInKm;
             });
           });
@@ -14236,11 +14262,10 @@ var PractitionerService = class extends BaseService {
       filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const clinics = practitioner.clinicsInfo || [];
         return clinics.some((clinic) => {
-          const distance = distanceBetween(
+          const distanceInKm = distanceBetween(
             [location.latitude, location.longitude],
             [clinic.location.latitude, clinic.location.longitude]
           );
-          const distanceInKm = distance / 1e3;
           return distanceInKm <= radiusInKm;
         });
       });
@@ -16037,7 +16062,7 @@ async function getAllClinicsInRange(db, center, rangeInKm, pagination, lastDoc,
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       );
-      const distanceInKm = distance / 1e3;
+      const distanceInKm = distance;
       if (distanceInKm <= rangeInKm) {
         const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
@@ -16161,7 +16186,7 @@ async function findClinicsInRadius(db, center, radiusInKm, filters) {
         [center.latitude, center.longitude],
         [clinic.location.latitude, clinic.location.longitude]
       );
-      const distanceInKm = distance / 1e3;
+      const distanceInKm = distance;
       if (distanceInKm <= radiusInKm) {
         matchingDocs.push(clinic);
       }
@@ -16491,7 +16516,7 @@ function applyInMemoryFilters(clinics, filters) {
       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)`
       );
@@ -24354,7 +24379,7 @@ var ProcedureService = class extends BaseService {
         const distance = distanceBetween6(
           [location.latitude, location.longitude],
           [clinicLocation.latitude, clinicLocation.longitude]
-        ) / 1e3;
+        );
         procedure.distance = distance;
         return distance <= radiusInKm;
       });

package/package.json

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

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

@@ -977,8 +977,7 @@ export async function getAllClinicsInRange(
         [clinic.location.latitude, clinic.location.longitude]
       );
 
-      // Convert to kilometers
-      const distanceInKm = distance / 1000;
+      const distanceInKm = distance; // distanceBetween already returns km
 
       if (distanceInKm <= rangeInKm) {
         const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);

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

@@ -434,11 +434,10 @@ function applyInMemoryFilters(clinics: Clinic[], filters: any): (Clinic & { dist
         return false;
       }
 
-      const distance =
-        distanceBetween(
-          [filters.center.latitude, filters.center.longitude],
-          [clinic.location.latitude, clinic.location.longitude],
-        ) / 1000; // Convert to km
+      const distance = distanceBetween(
+        [filters.center.latitude, filters.center.longitude],
+        [clinic.location.latitude, clinic.location.longitude],
+      ); // Already returns km
 
       console.log(
         `[CLINIC_SERVICE] Clinic ${clinic.name}: distance ${distance.toFixed(2)}km (limit: ${

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

@@ -60,8 +60,7 @@ export async function findClinicsInRadius(
         [clinic.location.latitude, clinic.location.longitude]
       );
 
-      // Konvertujemo u kilometre
-      const distanceInKm = distance / 1000;
+      const distanceInKm = distance; // distanceBetween already returns km
 
       if (distanceInKm <= radiusInKm) {
         matchingDocs.push(clinic);

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

@@ -1563,23 +1563,37 @@ export class PractitionerService extends BaseService {
           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));
+          if (filters.location && filters.radiusInKm) {
+            // Fetch more results when geo filtering will reduce count
+            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) * 2));
+          } else {
+            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));
           }
-          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(
+          let practitioners = querySnapshot.docs.map(
             (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
           );
           const lastDoc =
@@ -1587,6 +1601,22 @@ export class PractitionerService extends BaseService {
               ? querySnapshot.docs[querySnapshot.docs.length - 1]
               : null;
 
+          // Apply geo filter if location is provided (in-memory, same as Strategy 2)
+          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 distanceInKm = distanceBetween(
+                  [location.latitude, location.longitude],
+                  [clinic.location.latitude, clinic.location.longitude]
+                ); // Already returns km
+                return distanceInKm <= radiusInKm;
+              });
+            });
+          }
+
           console.log(
             `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
           );
@@ -1672,11 +1702,10 @@ export class PractitionerService extends BaseService {
           practitioners = practitioners.filter((practitioner) => {
             const clinics = practitioner.clinicsInfo || [];
             return clinics.some((clinic) => {
-              const distance = distanceBetween(
+              const distanceInKm = distanceBetween(
                 [location.latitude, location.longitude],
                 [clinic.location.latitude, clinic.location.longitude]
-              );
-              const distanceInKm = distance / 1000;
+              ); // Already returns km
               return distanceInKm <= radiusInKm;
             });
           });
@@ -1936,11 +1965,10 @@ export class PractitionerService extends BaseService {
       filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const clinics = practitioner.clinicsInfo || [];
         return clinics.some((clinic) => {
-          const distance = distanceBetween(
+          const distanceInKm = distanceBetween(
             [location.latitude, location.longitude],
             [clinic.location.latitude, clinic.location.longitude]
-          );
-          const distanceInKm = distance / 1000;
+          ); // Already returns km
           return distanceInKm <= radiusInKm;
         });
       });

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

@@ -2174,11 +2174,10 @@ export class ProcedureService extends BaseService {
           return false;
         }
 
-        const distance =
-          distanceBetween(
-            [location.latitude, location.longitude],
-            [clinicLocation.latitude, clinicLocation.longitude],
-          ) / 1000; // Convert to km
+        const distance = distanceBetween(
+          [location.latitude, location.longitude],
+          [clinicLocation.latitude, clinicLocation.longitude],
+        ); // Already returns km
 
         // Attach distance for frontend sorting/display
         (procedure as any).distance = distance;