@blackcode_sa/metaestetics-api 1.5.30 → 1.5.32

package/package.json

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

package/src/admin/index.ts

@@ -8,7 +8,11 @@ import { UserRole } from "../types";
 // Import types needed by admin consumers (like Cloud Functions)
 import { Clinic, ClinicLocation } from "../types/clinic";
 import { ClinicInfo } from "../types/profile";
-import { Practitioner, PractitionerToken } from "../types/practitioner";
+import {
+  Practitioner,
+  PractitionerToken,
+  PractitionerTokenStatus,
+} from "../types/practitioner";
 import { DoctorInfo } from "../types/clinic";
 import { Procedure, ProcedureSummaryInfo } from "../types/procedure";
 import { PatientProfile } from "../types/patient";
@@ -36,7 +40,11 @@ export type {
 // Re-export types needed by cloud functions
 export type { Clinic, ClinicLocation } from "../types/clinic";
 export type { ClinicInfo } from "../types/profile";
-export type { Practitioner, PractitionerToken } from "../types/practitioner";
+export type {
+  Practitioner,
+  PractitionerToken,
+  PractitionerTokenStatus,
+} from "../types/practitioner";
 export type { DoctorInfo } from "../types/clinic";
 export type { Procedure, ProcedureSummaryInfo } from "../types/procedure";
 export type { PatientProfile as Patient } from "../types/patient";

package/src/index.ts

@@ -26,6 +26,7 @@ export {
 } from "./services/documentation-templates";
 export { CalendarServiceV2 } from "./services/calendar/calendar-refactored.service";
 export { SyncedCalendarsService } from "./services/calendar/synced-calendars.service";
+export { ReviewService } from "./services/reviews/reviews.service";
 
 // Backoffice services
 export { BrandService } from "./backoffice/services/brand.service";
@@ -259,6 +260,10 @@ export {
 export { Contraindication } from "./backoffice/types/static/contraindication.types";
 export { ProcedureFamily } from "./backoffice/types/static/procedure-family.types";
 export { TreatmentBenefit } from "./backoffice/types/static/treatment-benefit.types";
+export {
+  RequirementType,
+  TimeUnit,
+} from "./backoffice/types/requirement.types";
 
 // Documentation Templates types
 export type {

package/src/services/calendar/utils/appointment.utils.ts

@@ -1,4 +1,4 @@
-import { Firestore, Timestamp } from "firebase/firestore";
+import { Firestore, Timestamp } from 'firebase/firestore';
 import {
   CalendarEvent,
   CalendarEventStatus,
@@ -7,23 +7,23 @@ import {
   CalendarSyncStatus,
   CreateCalendarEventData,
   UpdateCalendarEventData,
-} from "../../../types/calendar";
+} from '../../../types/calendar';
 import {
   createClinicCalendarEventUtil,
   updateClinicCalendarEventUtil,
   deleteClinicCalendarEventUtil,
   checkAutoConfirmAppointmentsUtil,
-} from "./clinic.utils";
+} from './clinic.utils';
 import {
   createPatientCalendarEventUtil,
   updatePatientCalendarEventUtil,
   deletePatientCalendarEventUtil,
-} from "./patient.utils";
+} from './patient.utils';
 import {
   createPractitionerCalendarEventUtil,
   updatePractitionerCalendarEventUtil,
   deletePractitionerCalendarEventUtil,
-} from "./practitioner.utils";
+} from './practitioner.utils';
 
 /**
  * Creates an appointment across all relevant calendars (practitioner, patient, clinic)
@@ -42,14 +42,14 @@ export async function createAppointmentUtil(
   patientId: string,
   eventData: Omit<
     CreateCalendarEventData,
-    | "id"
-    | "createdAt"
-    | "updatedAt"
-    | "clinicBranchId"
-    | "practitionerProfileId"
-    | "patientProfileId"
+    | 'id'
+    | 'createdAt'
+    | 'updatedAt'
+    | 'clinicBranchId'
+    | 'practitionerProfileId'
+    | 'patientProfileId'
   >,
-  generateId: () => string
+  generateId: () => string,
 ): Promise<CalendarEvent> {
   // TODO: Add validation for appointment data
   // - Check if all entities exist
@@ -64,15 +64,10 @@ export async function createAppointmentUtil(
   const autoConfirm = await checkAutoConfirmAppointmentsUtil(db, clinicId);
 
   // Set the initial status based on auto-confirm setting
-  const initialStatus = autoConfirm
-    ? CalendarEventStatus.CONFIRMED
-    : CalendarEventStatus.PENDING;
+  const initialStatus = autoConfirm ? CalendarEventStatus.CONFIRMED : CalendarEventStatus.PENDING;
 
   // Prepare the event data with all required IDs
-  const appointmentData: Omit<
-    CreateCalendarEventData,
-    "id" | "createdAt" | "updatedAt"
-  > = {
+  const appointmentData: Omit<CreateCalendarEventData, 'id' | 'createdAt' | 'updatedAt'> = {
     ...eventData,
     clinicBranchId: clinicId,
     practitionerProfileId: practitionerId,
@@ -86,29 +81,25 @@ export async function createAppointmentUtil(
     db,
     clinicId,
     appointmentData,
-    () => eventId // Use the same ID for all calendars
+    () => eventId, // Use the same ID for all calendars
   );
 
   const practitionerPromise = createPractitionerCalendarEventUtil(
     db,
     practitionerId,
     appointmentData,
-    () => eventId // Use the same ID for all calendars
+    () => eventId, // Use the same ID for all calendars
   );
 
   const patientPromise = createPatientCalendarEventUtil(
     db,
     patientId,
     appointmentData,
-    () => eventId // Use the same ID for all calendars
+    () => eventId, // Use the same ID for all calendars
   );
 
   // Wait for all operations to complete
-  const [clinicEvent] = await Promise.all([
-    clinicPromise,
-    practitionerPromise,
-    patientPromise,
-  ]);
+  const [clinicEvent] = await Promise.all([clinicPromise, practitionerPromise, patientPromise]);
 
   // Return the event from the clinic calendar
   return clinicEvent;
@@ -130,7 +121,7 @@ export async function updateAppointmentUtil(
   practitionerId: string,
   patientId: string,
   eventId: string,
-  updateData: Omit<UpdateCalendarEventData, "updatedAt">
+  updateData: Omit<UpdateCalendarEventData, 'updatedAt'>,
 ): Promise<CalendarEvent> {
   // TODO: Add validation for update data
   // - Check if event exists in all calendars
@@ -138,33 +129,19 @@ export async function updateAppointmentUtil(
   // - Check for overlapping events
 
   // Update the event in all three calendars
-  const clinicPromise = updateClinicCalendarEventUtil(
-    db,
-    clinicId,
-    eventId,
-    updateData
-  );
+  const clinicPromise = updateClinicCalendarEventUtil(db, clinicId, eventId, updateData);
 
   const practitionerPromise = updatePractitionerCalendarEventUtil(
     db,
     practitionerId,
     eventId,
-    updateData
+    updateData,
   );
 
-  const patientPromise = updatePatientCalendarEventUtil(
-    db,
-    patientId,
-    eventId,
-    updateData
-  );
+  const patientPromise = updatePatientCalendarEventUtil(db, patientId, eventId, updateData);
 
   // Wait for all operations to complete
-  const [clinicEvent] = await Promise.all([
-    clinicPromise,
-    practitionerPromise,
-    patientPromise,
-  ]);
+  const [clinicEvent] = await Promise.all([clinicPromise, practitionerPromise, patientPromise]);
 
   // Return the event from the clinic calendar
   return clinicEvent;
@@ -183,16 +160,12 @@ export async function deleteAppointmentUtil(
   clinicId: string,
   practitionerId: string,
   patientId: string,
-  eventId: string
+  eventId: string,
 ): Promise<void> {
   // Delete the event from all three calendars
   const clinicPromise = deleteClinicCalendarEventUtil(db, clinicId, eventId);
 
-  const practitionerPromise = deletePractitionerCalendarEventUtil(
-    db,
-    practitionerId,
-    eventId
-  );
+  const practitionerPromise = deletePractitionerCalendarEventUtil(db, practitionerId, eventId);
 
   const patientPromise = deletePatientCalendarEventUtil(db, patientId, eventId);
 
@@ -214,16 +187,11 @@ export async function confirmAppointmentUtil(
   clinicId: string,
   practitionerId: string,
   patientId: string,
-  eventId: string
+  eventId: string,
 ): Promise<CalendarEvent> {
-  return updateAppointmentUtil(
-    db,
-    clinicId,
-    practitionerId,
-    patientId,
-    eventId,
-    { status: CalendarEventStatus.CONFIRMED }
-  );
+  return updateAppointmentUtil(db, clinicId, practitionerId, patientId, eventId, {
+    status: CalendarEventStatus.CONFIRMED,
+  });
 }
 
 /**
@@ -240,16 +208,11 @@ export async function rejectAppointmentUtil(
   clinicId: string,
   practitionerId: string,
   patientId: string,
-  eventId: string
+  eventId: string,
 ): Promise<CalendarEvent> {
-  return updateAppointmentUtil(
-    db,
-    clinicId,
-    practitionerId,
-    patientId,
-    eventId,
-    { status: CalendarEventStatus.REJECTED }
-  );
+  return updateAppointmentUtil(db, clinicId, practitionerId, patientId, eventId, {
+    status: CalendarEventStatus.REJECTED,
+  });
 }
 
 /**
@@ -266,16 +229,11 @@ export async function cancelAppointmentUtil(
   clinicId: string,
   practitionerId: string,
   patientId: string,
-  eventId: string
+  eventId: string,
 ): Promise<CalendarEvent> {
-  return updateAppointmentUtil(
-    db,
-    clinicId,
-    practitionerId,
-    patientId,
-    eventId,
-    { status: CalendarEventStatus.CANCELED }
-  );
+  return updateAppointmentUtil(db, clinicId, practitionerId, patientId, eventId, {
+    status: CalendarEventStatus.CANCELED,
+  });
 }
 
 /**
@@ -294,21 +252,14 @@ export async function rescheduleAppointmentUtil(
   practitionerId: string,
   patientId: string,
   eventId: string,
-  newEventTime: CalendarEventTime
+  newEventTime: CalendarEventTime,
 ): Promise<CalendarEvent> {
   // TODO: Add validation for new event time
   // - Validate event time (start < end)
   // - Check for overlapping events
 
-  return updateAppointmentUtil(
-    db,
-    clinicId,
-    practitionerId,
-    patientId,
-    eventId,
-    {
-      status: CalendarEventStatus.RESCHEDULED,
-      eventTime: newEventTime,
-    }
-  );
+  return updateAppointmentUtil(db, clinicId, practitionerId, patientId, eventId, {
+    status: CalendarEventStatus.RESCHEDULED,
+    eventTime: newEventTime,
+  });
 }

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

@@ -426,6 +426,12 @@ export class ClinicService extends BaseService {
     );
   }
 
+  /**
+   * Get clinics based on multiple filtering criteria
+   *
+   * @param filters - Various filters to apply
+   * @returns Filtered clinics and the last document for pagination
+   */
   async getClinicsByFilters(filters: {
     center?: { latitude: number; longitude: number };
     radiusInKm?: number;

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

@@ -95,7 +95,7 @@ export async function getClinicsByFilters(
   }
 
   // Add ordering to make pagination consistent
-  constraints.push(orderBy(documentId()));
+  constraints.push(orderBy("location.geohash"));
 
   let clinicsResult: (Clinic & { distance?: number })[] = [];
   let lastVisibleDoc = null;
@@ -227,6 +227,32 @@ export async function getClinicsByFilters(
     // Apply filters that couldn't be applied in the query
     let filteredClinics = clinics;
 
+    // Calculate distance for each clinic if center coordinates are provided
+    if (filters.center) {
+      const center = filters.center;
+      const clinicsWithDistance: (Clinic & { distance: number })[] = [];
+
+      filteredClinics.forEach((clinic) => {
+        const distance = distanceBetween(
+          [center.latitude, center.longitude],
+          [clinic.location.latitude, clinic.location.longitude]
+        );
+
+        clinicsWithDistance.push({
+          ...clinic,
+          distance: distance / 1000, // Convert to kilometers
+        });
+      });
+
+      // Replace filtered clinics with the version that includes distances
+      filteredClinics = clinicsWithDistance;
+
+      // Sort by distance - use type assertion to fix type error
+      (filteredClinics as (Clinic & { distance: number })[]).sort(
+        (a, b) => a.distance - b.distance
+      );
+    }
+
     // Filter by multiple tags if more than one tag was specified
     if (filters.tags && filters.tags.length > 1) {
       filteredClinics = filteredClinics.filter((clinic) => {

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

@@ -612,7 +612,7 @@ export class ProcedureService extends BaseService {
       }
 
       // Add ordering to make pagination consistent
-      constraints.push(orderBy(documentId()));
+      constraints.push(orderBy("clinicInfo.location.geohash"));
 
       // Add pagination if specified
       if (filters.pagination && filters.pagination > 0 && filters.lastDoc) {
@@ -743,16 +743,54 @@ export class ProcedureService extends BaseService {
           return { ...doc.data(), id: doc.id } as Procedure;
         });
 
-        // Apply filters that couldn't be applied in the query
-        let filteredProcedures = this.applyInMemoryFilters(procedures, filters);
+        // Calculate distance for each procedure if location is provided
+        if (filters.location) {
+          const center = filters.location;
+          const proceduresWithDistance: (Procedure & { distance: number })[] =
+            [];
+
+          procedures.forEach((procedure) => {
+            const distance = distanceBetween(
+              [center.latitude, center.longitude],
+              [
+                procedure.clinicInfo.location.latitude,
+                procedure.clinicInfo.location.longitude,
+              ]
+            );
+
+            proceduresWithDistance.push({
+              ...procedure,
+              distance: distance / 1000, // Convert to kilometers
+            });
+          });
+
+          // Replace procedures with version that includes distances
+          let filteredProcedures = proceduresWithDistance;
+
+          // Apply in-memory filters
+          filteredProcedures = this.applyInMemoryFilters(
+            filteredProcedures,
+            filters
+          );
+
+          // Sort by distance
+          filteredProcedures.sort((a, b) => a.distance - b.distance);
+
+          proceduresResult = filteredProcedures;
+        } else {
+          // Apply filters that couldn't be applied in the query
+          let filteredProcedures = this.applyInMemoryFilters(
+            procedures,
+            filters
+          );
+          proceduresResult = filteredProcedures;
+        }
 
         // Set last document for pagination
         lastVisibleDoc =
           querySnapshot.docs.length > 0
             ? querySnapshot.docs[querySnapshot.docs.length - 1]
             : null;
-
-        proceduresResult = filteredProcedures;
       }
 
       return {