@blackcode_sa/metaestetics-api 1.8.12 → 1.8.14

package/dist/index.mjs

@@ -6257,6 +6257,7 @@ var PractitionerService = class extends BaseService {
         trustworthiness: 0,
         recommendationPercentage: 0
       };
+      const fullNameLower = `${validData.basicInfo.firstName} ${validData.basicInfo.lastName}`.toLowerCase();
       const practitioner = {
         id: practitionerId,
         userRef: validData.userRef,
@@ -6264,6 +6265,8 @@ var PractitionerService = class extends BaseService {
           validData.basicInfo,
           practitionerId
         ),
+        fullNameLower,
+        // Ensure this is present
         certification: validData.certification,
         clinics: validData.clinics || [],
         clinicWorkingHours: validData.clinicWorkingHours || [],
@@ -6359,6 +6362,7 @@ var PractitionerService = class extends BaseService {
       }
       const finalClinicsInfo = validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0 ? validatedData.clinicsInfo : clinicsInfo;
       const proceduresInfo = [];
+      const fullNameLowerDraft = `${validatedData.basicInfo.firstName} ${validatedData.basicInfo.lastName}`.toLowerCase();
       const practitionerData = {
         id: practitionerId,
         userRef: "",
@@ -6367,6 +6371,8 @@ var PractitionerService = class extends BaseService {
           validatedData.basicInfo,
           practitionerId
         ),
+        fullNameLower: fullNameLowerDraft,
+        // Ensure this is present
         certification: validatedData.certification,
         clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
@@ -6645,6 +6651,7 @@ var PractitionerService = class extends BaseService {
           validData.basicInfo,
           practitionerId
         );
+        processedData.fullNameLower = `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
       }
       const updateData = {
         ...processedData,
@@ -6872,10 +6879,6 @@ var PractitionerService = class extends BaseService {
    */
   async getPractitionersByFilters(filters) {
     try {
-      console.log(
-        "[PRACTITIONER_SERVICE] Starting practitioner filtering with criteria:",
-        filters
-      );
       const constraints = [];
       if (!filters.includeDraftPractitioners) {
         constraints.push(where10("status", "==", "active" /* ACTIVE */));
@@ -6890,60 +6893,40 @@ var PractitionerService = class extends BaseService {
           )
         );
       }
-      constraints.push(orderBy4("basicInfo.lastName", "asc"));
-      constraints.push(orderBy4("basicInfo.firstName", "asc"));
-      if (filters.pagination && filters.pagination > 0) {
-        if (filters.lastDoc) {
-          constraints.push(startAfter6(filters.lastDoc));
-        }
-        constraints.push(limit7(filters.pagination));
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        const searchTerm = filters.nameSearch.trim().toLowerCase();
+        constraints.push(where10("fullNameLower", ">=", searchTerm));
+        constraints.push(where10("fullNameLower", "<=", searchTerm + "\uF8FF"));
       }
-      const q = query10(
-        collection10(this.db, PRACTITIONERS_COLLECTION),
-        ...constraints
-      );
-      const querySnapshot = await getDocs10(q);
-      console.log(
-        `[PRACTITIONER_SERVICE] Found ${querySnapshot.docs.length} practitioners with base query`
-      );
-      let practitioners = querySnapshot.docs.map((doc37) => {
-        return { ...doc37.data(), id: doc37.id };
-      });
-      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-      if (filters.nameSearch && filters.nameSearch.trim() !== "") {
-        const searchTerm = filters.nameSearch.toLowerCase().trim();
-        practitioners = practitioners.filter((practitioner) => {
-          const fullName = `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`.toLowerCase();
-          return fullName.includes(searchTerm);
-        });
+      if (filters.procedureTechnology) {
+        constraints.push(where10("proceduresInfo.technologyName", "==", filters.procedureTechnology));
+      } else if (filters.procedureSubcategory) {
+        constraints.push(where10("proceduresInfo.subcategoryName", "==", filters.procedureSubcategory));
+      } else if (filters.procedureCategory) {
+        constraints.push(where10("proceduresInfo.categoryName", "==", filters.procedureCategory));
+      } else if (filters.procedureFamily) {
+        constraints.push(where10("proceduresInfo.family", "==", filters.procedureFamily));
       }
-      if (filters.specialties && filters.specialties.length > 0) {
-        practitioners = practitioners.filter((practitioner) => {
-          return filters.specialties.every(
-            (specialty) => practitioner.certification.specialties.includes(specialty)
-          );
-        });
+      if (filters.minRating !== void 0) {
+        constraints.push(where10("reviewInfo.averageRating", ">=", filters.minRating));
       }
-      if (filters.procedureTechnology || filters.procedureSubcategory || filters.procedureCategory || filters.procedureFamily) {
-        practitioners = practitioners.filter((practitioner) => {
-          const procedures = practitioner.proceduresInfo || [];
-          return procedures.some((procedure) => {
-            if (filters.procedureTechnology) {
-              return procedure.technologyName === filters.procedureTechnology;
-            }
-            if (filters.procedureSubcategory) {
-              return procedure.subcategoryName === filters.procedureSubcategory;
-            }
-            if (filters.procedureCategory) {
-              return procedure.categoryName === filters.procedureCategory;
-            }
-            if (filters.procedureFamily) {
-              return procedure.family === filters.procedureFamily;
-            }
-            return false;
-          });
-        });
+      if (filters.maxRating !== void 0) {
+        constraints.push(where10("reviewInfo.averageRating", "<=", filters.maxRating));
+      }
+      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));
+        }
       }
+      constraints.push(limit7(filters.pagination || 5));
+      const q = query10(collection10(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+      const querySnapshot = await getDocs10(q);
+      let practitioners = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
       if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
         const location = filters.location;
         const radiusInKm = filters.radiusInKm;
@@ -6959,22 +6942,7 @@ var PractitionerService = class extends BaseService {
           });
         });
       }
-      if (filters.minRating !== void 0) {
-        practitioners = practitioners.filter(
-          (p) => p.reviewInfo.averageRating >= filters.minRating
-        );
-      }
-      if (filters.maxRating !== void 0) {
-        practitioners = practitioners.filter(
-          (p) => p.reviewInfo.averageRating <= filters.maxRating
-        );
-      }
-      console.log(
-        `[PRACTITIONER_SERVICE] Filtered to ${practitioners.length} practitioners`
-      );
-      if (filters.pagination && filters.pagination > 0) {
-        practitioners = practitioners.slice(0, filters.pagination);
-      }
+      const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
       return {
         practitioners,
         lastDoc
@@ -8190,8 +8158,10 @@ var ClinicGroupService = class extends BaseService {
 
 // src/services/clinic/clinic.service.ts
 import {
+  collection as collection16,
   doc as doc15,
   getDoc as getDoc18,
+  getDocs as getDocs16,
   updateDoc as updateDoc15,
   serverTimestamp as serverTimestamp14,
   writeBatch as writeBatch4,
@@ -8665,170 +8635,66 @@ import {
   limit as limit9,
   orderBy as orderBy5
 } from "firebase/firestore";
-import { geohashQueryBounds as geohashQueryBounds3, distanceBetween as distanceBetween4 } from "geofire-common";
+import { distanceBetween as distanceBetween4 } from "geofire-common";
 async function getClinicsByFilters(db, filters) {
-  console.log(
-    "[FILTER_UTILS] Starting clinic filtering with criteria:",
-    filters
-  );
-  const isGeoQuery = filters.center && filters.radiusInKm && filters.radiusInKm > 0;
+  var _a;
   const constraints = [];
-  if (filters.isActive !== void 0) {
-    constraints.push(where15("isActive", "==", filters.isActive));
-  } else {
-    constraints.push(where15("isActive", "==", true));
-  }
+  constraints.push(where15("isActive", "==", (_a = filters.isActive) != null ? _a : true));
   if (filters.tags && filters.tags.length > 0) {
     constraints.push(where15("tags", "array-contains", filters.tags[0]));
   }
   if (filters.procedureTechnology) {
-    constraints.push(
-      where15("servicesInfo.technology", "==", filters.procedureTechnology)
-    );
+    constraints.push(where15("servicesInfo.technology", "==", filters.procedureTechnology));
   } else if (filters.procedureSubcategory) {
-    constraints.push(
-      where15("servicesInfo.subCategory", "==", filters.procedureSubcategory)
-    );
+    constraints.push(where15("servicesInfo.subCategory", "==", filters.procedureSubcategory));
   } else if (filters.procedureCategory) {
-    constraints.push(
-      where15("servicesInfo.category", "==", filters.procedureCategory)
-    );
+    constraints.push(where15("servicesInfo.category", "==", filters.procedureCategory));
   } else if (filters.procedureFamily) {
-    constraints.push(
-      where15("servicesInfo.procedureFamily", "==", filters.procedureFamily)
-    );
-  }
-  if (filters.pagination && filters.pagination > 0 && filters.lastDoc) {
-    constraints.push(startAfter8(filters.lastDoc));
-    constraints.push(limit9(filters.pagination));
-  } else if (filters.pagination && filters.pagination > 0) {
-    constraints.push(limit9(filters.pagination));
-  }
-  constraints.push(orderBy5("location.geohash"));
-  let clinicsResult = [];
-  let lastVisibleDoc = null;
-  if (isGeoQuery) {
-    const center = filters.center;
-    const radiusInKm = filters.radiusInKm;
-    const bounds = geohashQueryBounds3(
-      [center.latitude, center.longitude],
-      radiusInKm * 1e3
-      // Convert to meters
-    );
-    const matchingClinics = [];
-    for (const bound of bounds) {
-      const geoConstraints = [
-        ...constraints,
-        where15("location.geohash", ">=", bound[0]),
-        where15("location.geohash", "<=", bound[1])
-      ];
-      const q = query15(collection15(db, CLINICS_COLLECTION), ...geoConstraints);
-      const querySnapshot = await getDocs15(q);
-      console.log(
-        `[FILTER_UTILS] Found ${querySnapshot.docs.length} clinics in geo bound`
-      );
-      for (const doc37 of querySnapshot.docs) {
-        const clinic = { ...doc37.data(), id: doc37.id };
-        const distance = distanceBetween4(
-          [center.latitude, center.longitude],
-          [clinic.location.latitude, clinic.location.longitude]
-        );
-        const distanceInKm = distance / 1e3;
-        if (distanceInKm <= radiusInKm) {
-          matchingClinics.push({
-            ...clinic,
-            distance: distanceInKm
-          });
-        }
-      }
-    }
-    let filteredClinics = matchingClinics;
-    if (filters.tags && filters.tags.length > 1) {
-      filteredClinics = filteredClinics.filter((clinic) => {
-        return filters.tags.every((tag) => clinic.tags.includes(tag));
-      });
-    }
-    if (filters.minRating !== void 0) {
-      filteredClinics = filteredClinics.filter(
-        (clinic) => clinic.reviewInfo.averageRating >= filters.minRating
-      );
-    }
-    if (filters.maxRating !== void 0) {
-      filteredClinics = filteredClinics.filter(
-        (clinic) => clinic.reviewInfo.averageRating <= filters.maxRating
-      );
-    }
-    filteredClinics.sort((a, b) => a.distance - b.distance);
-    if (filters.pagination && filters.pagination > 0) {
-      let startIndex = 0;
-      if (filters.lastDoc) {
-        const lastDocIndex = filteredClinics.findIndex(
-          (clinic) => clinic.id === filters.lastDoc.id
-        );
-        if (lastDocIndex !== -1) {
-          startIndex = lastDocIndex + 1;
-        }
-      }
-      const paginatedClinics = filteredClinics.slice(
-        startIndex,
-        startIndex + filters.pagination
-      );
-      lastVisibleDoc = paginatedClinics.length > 0 ? paginatedClinics[paginatedClinics.length - 1] : null;
-      clinicsResult = paginatedClinics;
+    constraints.push(where15("servicesInfo.procedureFamily", "==", filters.procedureFamily));
+  }
+  let useNameLower = false;
+  let searchTerm = "";
+  if (filters.nameSearch && filters.nameSearch.trim()) {
+    searchTerm = filters.nameSearch.trim().toLowerCase();
+    constraints.push(where15("nameLower", ">=", searchTerm));
+    constraints.push(where15("nameLower", "<=", searchTerm + "\uF8FF"));
+    useNameLower = true;
+  }
+  if (filters.minRating !== void 0) {
+    constraints.push(where15("reviewInfo.averageRating", ">=", filters.minRating));
+  }
+  if (filters.maxRating !== void 0) {
+    constraints.push(where15("reviewInfo.averageRating", "<=", filters.maxRating));
+  }
+  constraints.push(orderBy5("nameLower"));
+  if (filters.lastDoc) {
+    if (typeof filters.lastDoc.data === "function") {
+      constraints.push(startAfter8(filters.lastDoc));
+    } else if (Array.isArray(filters.lastDoc)) {
+      constraints.push(startAfter8(...filters.lastDoc));
     } else {
-      clinicsResult = filteredClinics;
+      constraints.push(startAfter8(filters.lastDoc));
     }
-  } else {
-    const q = query15(collection15(db, CLINICS_COLLECTION), ...constraints);
-    const querySnapshot = await getDocs15(q);
-    console.log(
-      `[FILTER_UTILS] Found ${querySnapshot.docs.length} clinics with regular query`
-    );
-    const clinics = querySnapshot.docs.map((doc37) => {
-      return { ...doc37.data(), id: doc37.id };
+  }
+  constraints.push(limit9(filters.pagination || 5));
+  const q = query15(collection15(db, CLINICS_COLLECTION), ...constraints);
+  const querySnapshot = await getDocs15(q);
+  let clinics = querySnapshot.docs.map((doc37) => ({ ...doc37.data(), id: doc37.id }));
+  if (filters.tags && filters.tags.length > 1) {
+    clinics = clinics.filter((clinic) => filters.tags.every((tag) => clinic.tags.includes(tag)));
+  }
+  if (filters.center && filters.radiusInKm) {
+    clinics = clinics.filter((clinic) => {
+      const distance = distanceBetween4(
+        [filters.center.latitude, filters.center.longitude],
+        [clinic.location.latitude, clinic.location.longitude]
+      ) / 1e3;
+      clinic.distance = distance;
+      return distance <= filters.radiusInKm;
     });
-    let filteredClinics = clinics;
-    if (filters.center) {
-      const center = filters.center;
-      const clinicsWithDistance = [];
-      filteredClinics.forEach((clinic) => {
-        const distance = distanceBetween4(
-          [center.latitude, center.longitude],
-          [clinic.location.latitude, clinic.location.longitude]
-        );
-        clinicsWithDistance.push({
-          ...clinic,
-          distance: distance / 1e3
-          // Convert to kilometers
-        });
-      });
-      filteredClinics = clinicsWithDistance;
-      filteredClinics.sort(
-        (a, b) => a.distance - b.distance
-      );
-    }
-    if (filters.tags && filters.tags.length > 1) {
-      filteredClinics = filteredClinics.filter((clinic) => {
-        return filters.tags.every((tag) => clinic.tags.includes(tag));
-      });
-    }
-    if (filters.minRating !== void 0) {
-      filteredClinics = filteredClinics.filter(
-        (clinic) => clinic.reviewInfo.averageRating >= filters.minRating
-      );
-    }
-    if (filters.maxRating !== void 0) {
-      filteredClinics = filteredClinics.filter(
-        (clinic) => clinic.reviewInfo.averageRating <= filters.maxRating
-      );
-    }
-    lastVisibleDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-    clinicsResult = filteredClinics;
   }
-  return {
-    clinics: clinicsResult,
-    lastDoc: lastVisibleDoc
-  };
+  const lastVisibleDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+  return { clinics, lastDoc: lastVisibleDoc };
 }
 
 // src/services/clinic/clinic.service.ts
@@ -8964,6 +8830,8 @@ var ClinicService = class extends BaseService {
         id: clinicId,
         clinicGroupId: validatedData.clinicGroupId,
         name: validatedData.name,
+        nameLower: validatedData.name.toLowerCase(),
+        // Add this line
         description: validatedData.description,
         location: { ...location, geohash: hash },
         contactInfo: validatedData.contactInfo,
@@ -9064,6 +8932,9 @@ var ClinicService = class extends BaseService {
           updatePayload[field] = validatedData[field];
         }
       }
+      if (validatedData.name) {
+        updatePayload.nameLower = validatedData.name.toLowerCase();
+      }
       if (validatedData.location) {
         const loc = validatedData.location;
         updatePayload.location = {
@@ -9239,6 +9110,27 @@ var ClinicService = class extends BaseService {
   async getClinicsByFilters(filters) {
     return getClinicsByFilters(this.db, filters);
   }
+  /**
+   * Gets all clinics with minimal info for map display (id, name, address, latitude, longitude)
+   * This is optimized for mobile map usage to reduce payload size.
+   * @returns Array of minimal clinic info for map
+   */
+  async getClinicsForMap() {
+    const clinicsRef = collection16(this.db, CLINICS_COLLECTION);
+    const snapshot = await getDocs16(clinicsRef);
+    const clinicsForMap = snapshot.docs.map((doc37) => {
+      var _a, _b, _c;
+      const data = doc37.data();
+      return {
+        id: doc37.id,
+        name: data.name,
+        address: ((_a = data.location) == null ? void 0 : _a.address) || "",
+        latitude: (_b = data.location) == null ? void 0 : _b.latitude,
+        longitude: (_c = data.location) == null ? void 0 : _c.longitude
+      };
+    });
+    return clinicsForMap;
+  }
 };
 
 // src/services/auth/utils/firebase.utils.ts
@@ -15087,7 +14979,7 @@ var ProcedureService = class extends BaseService {
     }
     let finalCategoryId = existingProcedure.category.id;
     if (validatedData.name) {
-      updatedProcedureData.nameLower = validatedData.nameLower || validatedData.name.toLowerCase();
+      updatedProcedureData.nameLower = validatedData.name.toLowerCase();
     }
     if (validatedData.categoryId) {
       const category = await this.categoryService.getById(
@@ -15314,7 +15206,13 @@ var ProcedureService = class extends BaseService {
         constraints.push(orderBy17("nameLower"));
       }
       if (filters.lastDoc) {
-        constraints.push(startAfter13(filters.lastDoc));
+        if (typeof filters.lastDoc.data === "function") {
+          constraints.push(startAfter13(filters.lastDoc));
+        } else if (Array.isArray(filters.lastDoc)) {
+          constraints.push(startAfter13(...filters.lastDoc));
+        } else {
+          constraints.push(startAfter13(filters.lastDoc));
+        }
       }
       if (filters.pagination && filters.pagination > 0) {
         constraints.push(limit15(filters.pagination));
@@ -15493,6 +15391,29 @@ var ProcedureService = class extends BaseService {
     const savedDoc = await getDoc32(procedureRef);
     return savedDoc.data();
   }
+  /**
+   * Gets all procedures with minimal info for map display (id, name, clinicId, clinicName, address, latitude, longitude)
+   * This is optimized for mobile map usage to reduce payload size.
+   * @returns Array of minimal procedure info for map
+   */
+  async getProceduresForMap() {
+    const proceduresRef = collection29(this.db, PROCEDURES_COLLECTION);
+    const snapshot = await getDocs29(proceduresRef);
+    const proceduresForMap = snapshot.docs.map((doc37) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      const data = doc37.data();
+      return {
+        id: doc37.id,
+        name: data.name,
+        clinicId: (_a = data.clinicInfo) == null ? void 0 : _a.id,
+        clinicName: (_b = data.clinicInfo) == null ? void 0 : _b.name,
+        address: ((_d = (_c = data.clinicInfo) == null ? void 0 : _c.location) == null ? void 0 : _d.address) || "",
+        latitude: (_f = (_e = data.clinicInfo) == null ? void 0 : _e.location) == null ? void 0 : _f.latitude,
+        longitude: (_h = (_g = data.clinicInfo) == null ? void 0 : _g.location) == null ? void 0 : _h.longitude
+      };
+    });
+    return proceduresForMap;
+  }
 };
 
 // src/services/reviews/reviews.service.ts

package/package.json

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

package/src/services/clinic/clinic.service.ts

@@ -244,6 +244,7 @@ export class ClinicService extends BaseService {
         id: clinicId,
         clinicGroupId: validatedData.clinicGroupId,
         name: validatedData.name,
+        nameLower: validatedData.name.toLowerCase(), // Add this line
         description: validatedData.description,
         location: { ...location, geohash: hash },
         contactInfo: validatedData.contactInfo,
@@ -384,6 +385,11 @@ export class ClinicService extends BaseService {
         }
       }
 
+      // Always update nameLower if name is changed
+      if (validatedData.name) {
+        updatePayload.nameLower = validatedData.name.toLowerCase();
+      }
+
       // Handle location update with geohash
       if (validatedData.location) {
         const loc = validatedData.location;
@@ -646,4 +652,31 @@ export class ClinicService extends BaseService {
   }> {
     return FilterUtils.getClinicsByFilters(this.db, filters);
   }
+
+  /**
+   * Gets all clinics with minimal info for map display (id, name, address, latitude, longitude)
+   * This is optimized for mobile map usage to reduce payload size.
+   * @returns Array of minimal clinic info for map
+   */
+  async getClinicsForMap(): Promise<{
+    id: string;
+    name: string;
+    address: string;
+    latitude: number | undefined;
+    longitude: number | undefined;
+  }[]> {
+    const clinicsRef = collection(this.db, CLINICS_COLLECTION);
+    const snapshot = await getDocs(clinicsRef);
+    const clinicsForMap = snapshot.docs.map(doc => {
+      const data = doc.data();
+      return {
+        id: doc.id,
+        name: data.name,
+        address: data.location?.address || '',
+        latitude: data.location?.latitude,
+        longitude: data.location?.longitude,
+      };
+    });
+    return clinicsForMap;
+  }
 }