@blackcode_sa/metaestetics-api 1.5.29 → 1.5.31

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/README.md

@@ -0,0 +1,87 @@
+# Clinic Service
+
+This service manages clinic data within the Firestore database. It provides methods for creating, reading, updating, and managing clinics, their branches, and associated data like tags and administrators.
+
+**Note:** This service relies on helper functions defined in the `./utils` directory for specific operations like photo uploads, geo-queries, and data fetching. Cloud Functions handle data aggregation into related entities (Practitioners, Procedures, ClinicGroups).
+
+## `ClinicService` Class
+
+Extends `BaseService`.
+
+### Constructor
+
+```typescript
+constructor(
+  db: Firestore,
+  auth: Auth,
+  app: FirebaseApp,
+  clinicGroupService: ClinicGroupService,
+  clinicAdminService: ClinicAdminService
+)
+```
+
+Initializes the service with Firestore, Auth, App instances, and required dependency services (`ClinicGroupService`, `ClinicAdminService`).
+
+### Core Methods
+
+- **`createClinic(data: CreateClinicData, creatorAdminId: string): Promise<Clinic>`**
+  - Creates a new clinic document in Firestore.
+  - Validates input data using `createClinicSchema`.
+  - Verifies the `creatorAdminId` and their association with the specified `clinicGroupId`.
+  - Calculates the geohash for the clinic's location.
+  - Initializes default review information.
+  - Handles photo uploads for logo, cover photo, featured photos, and photos with tags using utility functions.
+  - Updates the creator admin's `clinicsManaged` list.
+  - **Aggregation Note:** Adding the clinic to the `ClinicGroup` is handled by Cloud Functions.
+- **`updateClinic(clinicId: string, data: Partial<Omit<Clinic, \"id\" | \"createdAt\" | \"clinicGroupId\">>, adminId: string): Promise<Clinic>`**
+  - Updates an existing clinic document.
+  - Fetches the current clinic data.
+  - Validates the partial update data against the `clinicSchema` after merging with existing data.
+  - Updates the geohash if the location is changed.
+  - Handles photo updates/uploads if necessary.
+  - **Aggregation Note:** Aggregation updates in related entities (Practitioners, Procedures, ClinicGroup) are handled by Cloud Functions.
+- **`deactivateClinic(clinicId: string, adminId: string): Promise<void>`**
+  - Sets the `isActive` flag of a clinic to `false`.
+  - Requires admin permission (verification logic might be in the calling function or assumed).
+  - **Aggregation Note:** Aggregation updates (e.g., removing from active lists, updating related entities) are handled by Cloud Functions.
+- **`getClinic(clinicId: string): Promise<Clinic | null>`**
+  - Retrieves a single clinic document by its ID using `ClinicUtils.getClinic`.
+- **`getClinicsByGroup(groupId: string): Promise<Clinic[]>`**
+  - Retrieves all clinic documents belonging to a specific `clinicGroupId` using `ClinicUtils.getClinicsByGroup`.
+- **`findClinicsInRadius(center: { latitude: number; longitude: number }, radiusInKm: number, filters?: { procedures?: string[]; tags?: ClinicTag[] }): Promise<Clinic[]>`**
+  - Finds active clinics within a specified radius using geohash queries.
+  - Leverages `SearchUtils.findClinicsInRadius`.
+  - Optionally filters results by procedure IDs (services) and tags.
+- **`addTags(clinicId: string, adminId: string, newTags: { tags?: ClinicTag[] }): Promise<Clinic>`**
+  - Adds specified tags to a clinic's `tags` array using `TagUtils.addTags`.
+  - Ensures the admin has permission. Prevents duplicates.
+- **`removeTags(clinicId: string, adminId: string, tagsToRemove: { tags?: ClinicTag[] }): Promise<Clinic>`**
+  - Removes specified tags from a clinic's `tags` array using `TagUtils.removeTags`.
+  - Ensures the admin has permission.
+- **`getClinicsByAdmin(adminId: string, options?: { isActive?: boolean; includeGroupClinics?: boolean }): Promise<Clinic[]>`**
+  - Retrieves clinics associated with a specific admin using `ClinicUtils.getClinicsByAdmin`.
+  - Handles options for filtering by `isActive` and including all group clinics for owners.
+- **`getActiveClinicsByAdmin(adminId: string): Promise<Clinic[]>`**
+  - Retrieves only the active clinics associated with a specific admin using `ClinicUtils.getActiveClinicsByAdmin`.
+- **`createClinicBranch(clinicGroupId: string, setupData: ClinicBranchSetupData, adminId: string): Promise<Clinic>`**
+  - Creates a new clinic (branch) within an existing `clinicGroupId`.
+  - Validates group existence. Uses `createClinic` internally.
+- **`getClinicById(clinicId: string): Promise<Clinic | null>`**
+  - Retrieves a single clinic document by its ID using `ClinicUtils.getClinicById`.
+- **`getAllClinics(pagination?: number, lastDoc?: any): Promise<{ clinics: Clinic[]; lastDoc: any }>`**
+  - Retrieves all clinics, ordered by ID, optionally with pagination, using `ClinicUtils.getAllClinics`.
+- **`getAllClinicsInRange(center: { latitude: number; longitude: number }, rangeInKm: number, pagination?: number, lastDoc?: any): Promise<{ clinics: (Clinic & { distance: number })[]; lastDoc: any }>`**
+  - Retrieves all clinics within a range, sorted by distance, optionally with pagination, using `ClinicUtils.getAllClinicsInRange`.
+- **`getClinicsByFilters(filters: { ... }): Promise<{ clinics: (Clinic & { distance?: number })[]; lastDoc: any }>`**
+  - Retrieves clinics based on complex filters (location, tags, procedures, rating, etc.).
+  - Uses `FilterUtils.getClinicsByFilters` for combined query and in-memory filtering.
+
+### Utility Functions (`./utils`)
+
+- **`clinic.utils.ts`**: Core fetching (`getClinic`, `getClinicsByGroup`, etc.), create/update/deactivate logic wrappers, admin checks.
+- **`filter.utils.ts`**: Complex filtering logic (`getClinicsByFilters`), including geo-queries.
+- **`clinic-group.utils.ts`**: Helpers for clinic group interactions (used by `ClinicGroupService`).
+- **`tag.utils.ts`**: Logic for adding/removing tags (`addTags`, `removeTags`).
+- **`photos.utils.ts`**: Firebase Storage interactions (`uploadPhoto`, `uploadMultiplePhotos`, `deletePhoto`).
+- **`admin.utils.ts`**: Helpers for clinic admin interactions (used by `ClinicAdminService`).
+- **`search.utils.ts`**: Geo-radius search logic (`findClinicsInRadius`).

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

@@ -29,9 +29,6 @@ import {
   ClinicBranchSetupData,
   CLINIC_ADMINS_COLLECTION,
   DoctorInfo,
-  // Remove incorrect imports below
-  // ProcedureSummaryInfo,
-  // ClinicInfo
 } from "../../types/clinic";
 // Correct imports
 import { ProcedureSummaryInfo } from "../../types/procedure";
@@ -75,73 +72,8 @@ export class ClinicService extends BaseService {
     this.clinicGroupService = clinicGroupService;
   }
 
-  // --- Helper Functions ---
-
-  /**
-   * Creates an aggregated ClinicInfo object from Clinic data.
-   * @param clinic The clinic object
-   * @returns ClinicInfo object
-   */
-  private _createClinicInfoForAggregation(clinic: Clinic): ClinicInfo {
-    return {
-      id: clinic.id,
-      featuredPhoto:
-        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? clinic.featuredPhotos[0]
-          : clinic.coverPhoto || "",
-      name: clinic.name,
-      description: clinic.description || "",
-      location: clinic.location,
-      contactInfo: clinic.contactInfo,
-    };
-  }
-
-  /**
-   * Updates the ClinicInfo within the clinicsInfo array for multiple practitioners.
-   * @param practitionerIds IDs of practitioners to update
-   * @param clinicInfo The updated ClinicInfo object
-   */
-  private async _updateClinicInfoInPractitioners(
-    practitionerIds: string[],
-    clinicInfo: ClinicInfo
-  ): Promise<void> {
-    const batch = writeBatch(this.db);
-    const clinicId = clinicInfo.id;
-
-    for (const practitionerId of practitionerIds) {
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-      // Remove old clinic info based on ID
-      batch.update(practitionerRef, {
-        clinicsInfo: arrayRemove(...[{ id: clinicId }]),
-        updatedAt: serverTimestamp(),
-      });
-      // Add updated clinic info
-      batch.update(practitionerRef, {
-        clinicsInfo: arrayUnion(clinicInfo),
-        updatedAt: serverTimestamp(),
-      });
-    }
-    try {
-      await batch.commit();
-    } catch (error) {
-      console.error(
-        `Error updating clinic info in practitioners for clinic ${clinicId}:`,
-        error
-      );
-      // Decide on error handling
-    }
-  }
-
-  // --- Core Service Methods (Updated) ---
-
   /**
    * Creates a new clinic.
-   * Initializes empty doctorsInfo and proceduresInfo.
-   * Aggregation into Clinic happens via PractitionerService and ProcedureService.
    */
   async createClinic(
     data: CreateClinicData,
@@ -209,21 +141,7 @@ export class ClinicService extends BaseService {
       const clinicRef = doc(this.db, CLINICS_COLLECTION, clinicId);
       batch.set(clinicRef, clinicData);
 
-      const groupRef = doc(
-        this.db,
-        CLINIC_GROUPS_COLLECTION,
-        validatedData.clinicGroupId
-      );
-      const newClinicInfoForGroup = this._createClinicInfoForAggregation({
-        ...clinicData,
-        id: clinicId,
-      } as Clinic);
-      batch.update(groupRef, {
-        clinics: arrayUnion(clinicId),
-        clinicsInfo: arrayUnion(newClinicInfoForGroup),
-        updatedAt: serverTimestamp(),
-      });
-
+      // Update admin relationship - this part is still needed
       const adminRef = doc(this.db, CLINIC_ADMINS_COLLECTION, creatorAdminId);
       batch.update(adminRef, {
         clinicsManaged: arrayUnion(clinicId),
@@ -244,7 +162,7 @@ export class ClinicService extends BaseService {
   }
 
   /**
-   * Updates a clinic and propagates changes (ClinicInfo) to associated practitioners.
+   * Updates a clinic.
    */
   async updateClinic(
     clinicId: string,
@@ -292,37 +210,8 @@ export class ClinicService extends BaseService {
         updatedAt: serverTimestamp(),
       };
 
-      const batch = writeBatch(this.db);
-      batch.update(clinicRef, updateDataForFirestore);
+      await updateDoc(clinicRef, updateDataForFirestore);
 
-      const groupRef = doc(
-        this.db,
-        CLINIC_GROUPS_COLLECTION,
-        currentClinic.clinicGroupId
-      );
-      // Use the validated final state for aggregation
-      const updatedClinicInfoForGroup = this._createClinicInfoForAggregation(
-        finalStateForValidation as Clinic
-      );
-      batch.update(groupRef, {
-        clinicsInfo: arrayRemove(...[{ id: clinicId }]),
-        updatedAt: serverTimestamp(),
-      });
-      batch.update(groupRef, {
-        clinicsInfo: arrayUnion(updatedClinicInfoForGroup),
-        updatedAt: serverTimestamp(),
-      });
-
-      const practitionerIds = currentClinic.doctors || [];
-      if (practitionerIds.length > 0) {
-        // Pass the aggregated info based on the final validated state
-        await this._updateClinicInfoInPractitioners(
-          practitionerIds,
-          updatedClinicInfoForGroup
-        );
-      }
-
-      await batch.commit();
       const updatedClinic = await this.getClinic(clinicId);
       if (!updatedClinic) throw new Error("Failed to retrieve updated clinic");
       return updatedClinic;
@@ -342,7 +231,6 @@ export class ClinicService extends BaseService {
 
   /**
    * Deactivates a clinic.
-   * Note: Does not currently remove ClinicInfo from practitioners (might be desired).
    */
   async deactivateClinic(clinicId: string, adminId: string): Promise<void> {
     // Permission check omitted
@@ -351,14 +239,8 @@ export class ClinicService extends BaseService {
       isActive: false,
       updatedAt: serverTimestamp(),
     });
-    // Consider whether to also update ClinicInfo in practitioners to reflect inactive status
   }
 
-  // --- Other Methods ---
-  // (getClinic, getClinicsByGroup, findClinicsInRadius, addTags, removeTags, getClinicsByAdmin, etc.)
-  // Review these methods to ensure they don't rely on outdated aggregation logic (e.g., filtering ServiceInfo)
-  // and update them to use proceduresInfo if necessary for filtering.
-
   /**
    * Dohvata kliniku po ID-u
    */
@@ -375,7 +257,6 @@ export class ClinicService extends BaseService {
 
   /**
    * Pretražuje klinike u određenom radijusu
-   * REVIEW: SearchUtils.findClinicsInRadius might need updating for filters.
    */
   async findClinicsInRadius(
     center: { latitude: number; longitude: number },
@@ -386,10 +267,6 @@ export class ClinicService extends BaseService {
       // Add other relevant filters based on Clinic/ProcedureSummaryInfo fields
     }
   ): Promise<Clinic[]> {
-    console.warn(
-      "SearchUtils.findClinicsInRadius filter logic might need updating for proceduresInfo."
-    );
-    // Pass filters directly, assuming SearchUtils handles it.
     return SearchUtils.findClinicsInRadius(
       this.db,
       center,

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

@@ -13,6 +13,8 @@ import {
   QueryConstraint,
   addDoc,
   writeBatch,
+  limit,
+  startAfter,
 } from "firebase/firestore";
 import {
   Clinic,
@@ -827,8 +829,6 @@ export async function getAllClinics(
 
     // If pagination is specified and greater than 0, limit the query
     if (pagination && pagination > 0) {
-      const { limit, startAfter } = require("firebase/firestore");
-
       if (lastDoc) {
         clinicsQuery = query(
           clinicsCollection,