@blackcode_sa/metaestetics-api 1.13.10 → 1.13.13

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

@@ -468,16 +468,18 @@ export class ClinicService extends BaseService {
 
   /**
    * Dohvata kliniku po ID-u
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinic(clinicId: string): Promise<Clinic | null> {
-    return ClinicUtils.getClinic(this.db, clinicId);
+  async getClinic(clinicId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic | null> {
+    return ClinicUtils.getClinic(this.db, clinicId, excludeDraftPractitioners);
   }
 
   /**
    * Dohvata sve klinike u grupi
+   * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
    */
-  async getClinicsByGroup(groupId: string): Promise<Clinic[]> {
-    return ClinicUtils.getClinicsByGroup(this.db, groupId);
+  async getClinicsByGroup(groupId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic[]> {
+    return ClinicUtils.getClinicsByGroup(this.db, groupId, excludeDraftPractitioners);
   }
 
   /**
@@ -624,29 +626,32 @@ export class ClinicService extends BaseService {
     return clinic;
   }
 
-  async getClinicById(clinicId: string): Promise<Clinic | null> {
-    return ClinicUtils.getClinicById(this.db, clinicId);
+  async getClinicById(clinicId: string, excludeDraftPractitioners: boolean = false): Promise<Clinic | null> {
+    return ClinicUtils.getClinicById(this.db, clinicId, excludeDraftPractitioners);
   }
 
   async getAllClinics(
     pagination?: number,
-    lastDoc?: any
+    lastDoc?: any,
+    excludeDraftPractitioners: boolean = false
   ): Promise<{ clinics: Clinic[]; lastDoc: any }> {
-    return ClinicUtils.getAllClinics(this.db, pagination, lastDoc);
+    return ClinicUtils.getAllClinics(this.db, pagination, lastDoc, excludeDraftPractitioners);
   }
 
   async getAllClinicsInRange(
     center: { latitude: number; longitude: number },
     rangeInKm: number,
     pagination?: number,
-    lastDoc?: any
+    lastDoc?: any,
+    excludeDraftPractitioners: boolean = false
   ): Promise<{ clinics: (Clinic & { distance: number })[]; lastDoc: any }> {
     return ClinicUtils.getAllClinicsInRange(
       this.db,
       center,
       rangeInKm,
       pagination,
-      lastDoc
+      lastDoc,
+      excludeDraftPractitioners
     );
   }
 

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

@@ -24,7 +24,9 @@ import {
   ClinicGroup,
   ClinicBranchSetupData,
   ClinicLocation,
+  DoctorInfo,
 } from "../../../types/clinic";
+import { PractitionerStatus } from "../../../types/practitioner";
 import {
   geohashForLocation,
   distanceBetween,
@@ -384,15 +386,81 @@ export async function createClinic(
  * @param clinicId - ID of the clinic to get
  * @returns The clinic or null if not found
  */
+/**
+ * Filters out draft/inactive practitioners from doctorsInfo array
+ * @param doctorsInfo Array of doctor info objects
+ * @returns Filtered array excluding draft or inactive practitioners
+ */
+function filterDoctorsInfo(doctorsInfo: DoctorInfo[]): DoctorInfo[] {
+  if (!doctorsInfo || doctorsInfo.length === 0) {
+    return [];
+  }
+
+  return doctorsInfo.filter((doctor) => {
+    // Filter out if status is DRAFT
+    if (doctor.status === PractitionerStatus.DRAFT) {
+      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+
+    // Filter out if isActive is explicitly false
+    if (doctor.isActive === false) {
+      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
+      return false;
+    }
+
+    // Include if status is ACTIVE or undefined (backward compatibility) and isActive is true or undefined
+    return true;
+  });
+}
+
+/**
+ * Filters embedded arrays in a Clinic object to exclude draft/inactive practitioners
+ * @param clinic Clinic object to filter
+ * @param excludeDraftPractitioners If true, filters out draft/inactive practitioners. If false (default), returns all practitioners (for admin views)
+ * @returns Clinic object with filtered embedded arrays
+ */
+export function filterClinicEmbeddedArrays(clinic: Clinic, excludeDraftPractitioners: boolean = false): Clinic {
+  if (!clinic) {
+    return clinic;
+  }
+
+  // If excluding drafts is disabled (default), return clinic as-is (for admin views)
+  if (!excludeDraftPractitioners) {
+    return clinic;
+  }
+
+  const filteredClinic = { ...clinic };
+
+  // Filter doctorsInfo array
+  if (filteredClinic.doctorsInfo && filteredClinic.doctorsInfo.length > 0) {
+    const originalLength = filteredClinic.doctorsInfo.length;
+    filteredClinic.doctorsInfo = filterDoctorsInfo(filteredClinic.doctorsInfo);
+    if (filteredClinic.doctorsInfo.length !== originalLength) {
+      console.log(
+        `[CLINIC_UTILS] Filtered ${originalLength - filteredClinic.doctorsInfo.length} draft/inactive doctors from clinic ${clinic.id}`
+      );
+    }
+  }
+
+  // Note: proceduresInfo doesn't have embedded status/isActive, so we rely on
+  // Cloud Functions to not include procedures from draft/inactive practitioners.
+  // If needed, we could add additional filtering here by checking practitioner status.
+
+  return filteredClinic;
+}
+
 export async function getClinic(
   db: Firestore,
-  clinicId: string
+  clinicId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic | null> {
   const docRef = doc(db, CLINICS_COLLECTION, clinicId);
   const docSnap = await getDoc(docRef);
 
   if (docSnap.exists()) {
-    return docSnap.data() as Clinic;
+    const clinicData = docSnap.data() as Clinic;
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
   }
 
   return null;
@@ -406,7 +474,8 @@ export async function getClinic(
  */
 export async function getClinicsByGroup(
   db: Firestore,
-  groupId: string
+  groupId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic[]> {
   const q = query(
     collection(db, CLINICS_COLLECTION),
@@ -415,7 +484,10 @@ export async function getClinicsByGroup(
   );
 
   const querySnapshot = await getDocs(q);
-  return querySnapshot.docs.map((doc) => doc.data() as Clinic);
+  return querySnapshot.docs.map((doc) => {
+    const clinicData = doc.data() as Clinic;
+    return filterClinicEmbeddedArrays(clinicData, excludeDraftPractitioners);
+  });
 }
 
 /**
@@ -789,7 +861,8 @@ export async function getActiveClinicsByAdmin(
  */
 export async function getClinicById(
   db: Firestore,
-  clinicId: string
+  clinicId: string,
+  excludeDraftPractitioners: boolean = false
 ): Promise<Clinic | null> {
   try {
     const clinicRef = doc(db, CLINICS_COLLECTION, clinicId);
@@ -800,10 +873,11 @@ export async function getClinicById(
     }
 
     const clinicData = clinicSnapshot.data() as Clinic;
-    return {
+    const clinicWithId = {
       ...clinicData,
       id: clinicSnapshot.id,
     };
+    return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
   } catch (error) {
     console.error("[CLINIC_UTILS] Error getting clinic by ID:", error);
     throw error;
@@ -821,7 +895,8 @@ export async function getClinicById(
 export async function getAllClinics(
   db: Firestore,
   pagination?: number,
-  lastDoc?: any
+  lastDoc?: any,
+  excludeDraftPractitioners: boolean = false
 ): Promise<{ clinics: Clinic[]; lastDoc: any }> {
   try {
     const clinicsCollection = collection(db, CLINICS_COLLECTION);
@@ -845,10 +920,11 @@ export async function getAllClinics(
 
     const clinics = clinicsSnapshot.docs.map((doc) => {
       const data = doc.data() as Clinic;
-      return {
+      const clinicWithId = {
         ...data,
         id: doc.id,
       };
+      return filterClinicEmbeddedArrays(clinicWithId, excludeDraftPractitioners);
     });
 
     return {
@@ -876,7 +952,8 @@ export async function getAllClinicsInRange(
   center: { latitude: number; longitude: number },
   rangeInKm: number,
   pagination?: number,
-  lastDoc?: any
+  lastDoc?: any,
+  excludeDraftPractitioners: boolean = false
 ): Promise<{ clinics: (Clinic & { distance: number })[]; lastDoc: any }> {
   const bounds = geohashQueryBounds(
     [center.latitude, center.longitude],
@@ -907,8 +984,9 @@ export async function getAllClinicsInRange(
       const distanceInKm = distance / 1000;
 
       if (distanceInKm <= rangeInKm) {
+        const filteredClinic = filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners);
         matchingClinics.push({
-          ...clinic,
+          ...filteredClinic,
           distance: distanceInKm,
         });
       }

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

@@ -12,6 +12,7 @@ import {
 } from 'firebase/firestore';
 import { Clinic, ClinicTag, CLINICS_COLLECTION } from '../../../types/clinic';
 import { geohashQueryBounds, distanceBetween } from 'geofire-common';
+import { filterClinicEmbeddedArrays } from './clinic.utils';
 
 /**
  * Get clinics based on multiple filtering criteria with fallback strategies
@@ -36,6 +37,7 @@ export async function getClinicsByFilters(
     pagination?: number;
     lastDoc?: any;
     isActive?: boolean;
+    excludeDraftPractitioners?: boolean; // If true, filters out draft/inactive practitioners. If false (default), returns all
   },
 ): Promise<{
   clinics: (Clinic & { distance?: number })[];
@@ -94,6 +96,10 @@ export async function getClinicsByFilters(
         }
         let clinics = Array.from(uniqueMap.values());
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply all remaining filters and compute exact distance + sorting
         clinics = applyInMemoryFilters(clinics, filters);
 
@@ -162,6 +168,10 @@ export async function getClinicsByFilters(
         const querySnapshot = await getDocs(q);
         let clinics = querySnapshot.docs.map((doc) => ({ ...doc.data(), id: doc.id } as Clinic));
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply in-memory filters
         clinics = applyInMemoryFilters(clinics, filters);
 
@@ -205,6 +215,10 @@ export async function getClinicsByFilters(
         const querySnapshot = await getDocs(q);
         let clinics = querySnapshot.docs.map((doc) => ({ ...doc.data(), id: doc.id } as Clinic));
 
+        // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
+        const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
+
         // Apply in-memory filters
         clinics = applyInMemoryFilters(clinics, filters);
 

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

@@ -439,6 +439,8 @@ export class ProcedureService extends BaseService {
           : '', // Default to empty string if not a processed URL
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
+      status: practitioner.status, // Include practitioner status for client-side filtering
+      isActive: practitioner.isActive, // Include isActive flag for client-side filtering
     };
 
     // Create the procedure object
@@ -628,6 +630,8 @@ export class ProcedureService extends BaseService {
           : '',
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
+      status: practitioner.status,
+      isActive: practitioner.isActive,
     };
 
     // Construct the new procedure object
@@ -1265,6 +1269,8 @@ export class ProcedureService extends BaseService {
             : '', // Default to empty string if not a processed URL
         rating: newPractitioner.reviewInfo?.averageRating || 0,
         services: newPractitioner.procedures || [],
+        status: newPractitioner.status,
+        isActive: newPractitioner.isActive,
       };
     }
 
@@ -2294,18 +2300,23 @@ export class ProcedureService extends BaseService {
   > {
     const proceduresRef = collection(this.db, PROCEDURES_COLLECTION);
     const snapshot = await getDocs(proceduresRef);
-    const proceduresForMap = snapshot.docs.map(doc => {
-      const data = doc.data();
-      return {
-        id: doc.id,
-        name: data.name,
-        clinicId: data.clinicInfo?.id,
-        clinicName: data.clinicInfo?.name,
-        address: data.clinicInfo?.location?.address || '',
-        latitude: data.clinicInfo?.location?.latitude,
-        longitude: data.clinicInfo?.location?.longitude,
-      };
-    });
+    let procedures = snapshot.docs.map(doc => ({
+      id: doc.id,
+      ...doc.data(),
+    } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+
+    const proceduresForMap = procedures.map(procedure => ({
+      id: procedure.id,
+      name: procedure.name,
+      clinicId: procedure.clinicInfo?.id,
+      clinicName: procedure.clinicInfo?.name,
+      address: procedure.clinicInfo?.location?.address || '',
+      latitude: procedure.clinicInfo?.location?.latitude,
+      longitude: procedure.clinicInfo?.location?.longitude,
+    }));
     return proceduresForMap;
   }
 
@@ -2357,9 +2368,14 @@ export class ProcedureService extends BaseService {
 
     const querySnapshot = await getDocs(proceduresQuery);
     
-    return querySnapshot.docs.map(doc => ({
+    let procedures = querySnapshot.docs.map(doc => ({
       id: doc.id,
       ...doc.data(),
     } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    
+    return procedures;
   }
 }

package/src/types/clinic/index.ts

@@ -3,6 +3,7 @@ import { Timestamp, FieldValue } from 'firebase/firestore';
 import type { ClinicInfo } from '../profile';
 import { ClinicReviewInfo } from '../reviews';
 import { ProcedureSummaryInfo } from '../procedure';
+import { PractitionerStatus } from '../practitioner';
 
 export const CLINIC_GROUPS_COLLECTION = 'clinic_groups';
 export const CLINIC_ADMINS_COLLECTION = 'clinic_admins';
@@ -351,6 +352,8 @@ export interface DoctorInfo {
   photo: string | null;
   rating: number;
   services: string[]; // Used for search and filtering
+  status?: PractitionerStatus; // Practitioner status (DRAFT, ACTIVE, etc.)
+  isActive?: boolean; // Whether practitioner is active
   // TODO: Add aggregated fields, like rating, reviews, services this doctor provides in this clinic and similar
 }