@blackcode_sa/metaestetics-api 1.13.5 → 1.13.8

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

@@ -1,1742 +1,1799 @@
-import {
-  collection,
-  doc,
-  getDoc,
-  getDocs,
-  query,
-  where,
-  updateDoc,
-  setDoc,
-  deleteDoc,
-  Timestamp,
-  serverTimestamp,
-  limit,
-  startAfter,
-  orderBy,
-  writeBatch,
-  arrayUnion,
-  arrayRemove,
-  FieldValue,
-} from "firebase/firestore";
-import { BaseService } from "../base.service";
-import {
-  Practitioner,
-  CreatePractitionerData,
-  UpdatePractitionerData,
-  PRACTITIONERS_COLLECTION,
-  REGISTER_TOKENS_COLLECTION,
-  PractitionerStatus,
-  CreateDraftPractitionerData,
-  PractitionerToken,
-  CreatePractitionerTokenData,
-  PractitionerTokenStatus,
-  PractitionerBasicInfo,
-} from "../../types/practitioner";
-import { ProcedureSummaryInfo } from "../../types/procedure";
-import { ClinicService } from "../clinic/clinic.service";
-import {
-  MediaService,
-  MediaAccessLevel,
-  MediaResource,
-} from "../media/media.service";
-import {
-  practitionerSchema,
-  createPractitionerSchema,
-  createDraftPractitionerSchema,
-  practitionerTokenSchema,
-  createPractitionerTokenSchema,
-} from "../../validations/practitioner.schema";
-import { z } from "zod";
-import { Auth } from "firebase/auth";
-import { Firestore } from "firebase/firestore";
-import { FirebaseApp } from "firebase/app";
-import { PractitionerReviewInfo } from "../../types/reviews";
-import { distanceBetween } from "geofire-common";
-import { CertificationSpecialty } from "../../backoffice/types/static/certification.types";
-import { Clinic, DoctorInfo, CLINICS_COLLECTION } from "../../types/clinic";
-import { ClinicInfo } from "../../types/profile";
-import { ProcedureService } from "../procedure/procedure.service";
-import { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
-import {
-  Currency,
-  PricingMeasure,
-} from "../../backoffice/types/static/pricing.types";
-import { CreateProcedureData } from "../../types/procedure";
-
-export class PractitionerService extends BaseService {
-  private clinicService?: ClinicService;
-  private mediaService: MediaService;
-  private procedureService?: ProcedureService;
-
-  constructor(
-    db: Firestore,
-    auth: Auth,
-    app: FirebaseApp,
-    clinicService?: ClinicService,
-    procedureService?: ProcedureService
-  ) {
-    super(db, auth, app);
-    this.clinicService = clinicService;
-    this.procedureService = procedureService;
-    this.mediaService = new MediaService(db, auth, app);
-  }
-
-  private getClinicService(): ClinicService {
-    if (!this.clinicService) {
-      throw new Error("Clinic service not initialized!");
-    }
-    return this.clinicService;
-  }
-
-  private getProcedureService(): ProcedureService {
-    if (!this.procedureService) {
-      throw new Error("Procedure service not initialized!");
-    }
-    return this.procedureService;
-  }
-
-  setClinicService(clinicService: ClinicService): void {
-    this.clinicService = clinicService;
-  }
-
-  setProcedureService(procedureService: ProcedureService): void {
-    this.procedureService = procedureService;
-  }
-
-  /**
-   * Handles profile photo upload for practitioners
-   * @param profilePhoto - MediaResource (File, Blob, or URL string)
-   * @param practitionerId - ID of the practitioner
-   * @returns URL string of the uploaded or existing photo
-   */
-  private async handleProfilePhotoUpload(
-    profilePhoto: MediaResource | undefined | null,
-    practitionerId: string
-  ): Promise<string | undefined> {
-    if (!profilePhoto) {
-      return undefined;
-    }
-
-    // If it's already a URL string, return it as is
-    if (typeof profilePhoto === "string") {
-      return profilePhoto;
-    }
-
-    // If it's a File or Blob, upload it
-    if (profilePhoto instanceof File || profilePhoto instanceof Blob) {
-      console.log(
-        `[PractitionerService] Uploading profile photo for practitioner ${practitionerId}`
-      );
-
-      const mediaMetadata = await this.mediaService.uploadMedia(
-        profilePhoto,
-        practitionerId, // Using practitionerId as ownerId
-        MediaAccessLevel.PUBLIC, // Profile photos should be public
-        "practitioner_profile_photos",
-        profilePhoto instanceof File
-          ? profilePhoto.name
-          : `profile_photo_${practitionerId}`
-      );
-
-      return mediaMetadata.url;
-    }
-
-    return undefined;
-  }
-
-  /**
-   * Processes BasicPractitionerInfo to handle profile photo uploads
-   * @param basicInfo - The basic info containing potential MediaResource profile photo
-   * @param practitionerId - ID of the practitioner
-   * @returns Processed basic info with URL string for profileImageUrl
-   */
-  private async processBasicInfo(
-    basicInfo: PractitionerBasicInfo & {
-      profileImageUrl?: MediaResource | null;
-    },
-    practitionerId: string
-  ): Promise<PractitionerBasicInfo> {
-    const processedBasicInfo = { ...basicInfo };
-
-    // Handle profile photo upload if needed
-    if (basicInfo.profileImageUrl) {
-      const uploadedUrl = await this.handleProfilePhotoUpload(
-        basicInfo.profileImageUrl,
-        practitionerId
-      );
-      processedBasicInfo.profileImageUrl = uploadedUrl;
-    }
-
-    return processedBasicInfo;
-  }
-
-  /**
-   * Creates a new practitioner
-   */
-  async createPractitioner(
-    data: CreatePractitionerData
-  ): Promise<Practitioner> {
-    try {
-      const validData = createPractitionerSchema.parse(data);
-      const practitionerId = this.generateId();
-
-      // Default review info
-      const reviewInfo: PractitionerReviewInfo = {
-        totalReviews: 0,
-        averageRating: 0,
-        knowledgeAndExpertise: 0,
-        communicationSkills: 0,
-        bedSideManner: 0,
-        thoroughness: 0,
-        trustworthiness: 0,
-        recommendationPercentage: 0,
-      };
-
-      // Create practitioner object
-      const fullNameLower =
-        `${validData.basicInfo.firstName} ${validData.basicInfo.lastName}`.toLowerCase();
-      const practitioner: Omit<Practitioner, "createdAt" | "updatedAt"> & {
-        createdAt: FieldValue;
-        updatedAt: FieldValue;
-      } = {
-        id: practitionerId,
-        userRef: validData.userRef,
-        basicInfo: await this.processBasicInfo(
-          validData.basicInfo,
-          practitionerId
-        ),
-        fullNameLower: fullNameLower, // Ensure this is present
-        certification: validData.certification,
-        clinics: validData.clinics || [],
-        clinicWorkingHours: validData.clinicWorkingHours || [],
-        clinicsInfo: [],
-        procedures: [],
-        proceduresInfo: [],
-        reviewInfo,
-        isActive: validData.isActive !== undefined ? validData.isActive : true,
-        isVerified:
-          validData.isVerified !== undefined ? validData.isVerified : false,
-        status: validData.status || PractitionerStatus.ACTIVE,
-        createdAt: serverTimestamp(),
-        updatedAt: serverTimestamp(),
-      };
-
-      // Validate the entire object
-      practitionerSchema.parse({
-        ...practitioner,
-        createdAt: Timestamp.now(),
-        updatedAt: Timestamp.now(),
-      });
-
-      // Create practitioner document
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-
-      await setDoc(practitionerRef, practitioner);
-
-      // Return the created practitioner
-      const createdPractitioner = await this.getPractitioner(practitionerId);
-      if (!createdPractitioner) {
-        throw new Error(
-          `Failed to retrieve created practitioner ${practitionerId}`
-        );
-      }
-      return createdPractitioner;
-    } catch (error) {
-      if (error instanceof z.ZodError) {
-        throw new Error(`Invalid practitioner data: ${error.message}`);
-      }
-      console.error("Error creating practitioner:", error);
-      throw error;
-    }
-  }
-
-  /**
-   * Kreira novi draft profil zdravstvenog radnika bez povezanog korisnika
-   * Koristi se od strane administratora klinike za kreiranje profila i kasnije pozivanje
-   * @param data Podaci za kreiranje draft profila
-   * @param createdBy ID administratora koji kreira profil
-   * @param clinicId ID klinike za koju se kreira profil
-   * @returns Objekt koji sadrži kreirani draft profil i token za registraciju
-   */
-  async createDraftPractitioner(
-    data: CreateDraftPractitionerData,
-    createdBy: string,
-    clinicId: string
-  ): Promise<{ practitioner: Practitioner; token: PractitionerToken }> {
-    try {
-      // Validacija ulaznih podataka
-      const validatedData = createDraftPractitionerSchema.parse(data);
-
-      // Provera da li klinika postoji
-      const clinic = await this.getClinicService().getClinic(clinicId);
-      if (!clinic) {
-        throw new Error(`Clinic ${clinicId} not found`);
-      }
-
-      // Make sure the primary clinic (clinicId) is always included
-      // Merge the clinics array with the primary clinicId, avoiding duplicates
-      const clinicsToAdd = new Set<string>([clinicId]);
-
-      // Add additional clinics if provided
-      if (data.clinics && data.clinics.length > 0) {
-        for (const cId of data.clinics) {
-          // Verify each additional clinic exists
-          if (cId !== clinicId) {
-            // Skip checking the primary clinic again
-            const otherClinic = await this.getClinicService().getClinic(cId);
-            if (!otherClinic) {
-              throw new Error(`Clinic ${cId} not found`);
-            }
-          }
-          clinicsToAdd.add(cId);
-        }
-      }
-
-      // Convert Set to Array
-      const clinics = Array.from(clinicsToAdd);
-
-      // Initialize default review info for new practitioners
-      const defaultReviewInfo: PractitionerReviewInfo = {
-        totalReviews: 0,
-        averageRating: 0,
-        knowledgeAndExpertise: 0,
-        communicationSkills: 0,
-        bedSideManner: 0,
-        thoroughness: 0,
-        trustworthiness: 0,
-        recommendationPercentage: 0,
-      };
-
-      // Generate ID for the new practitioner
-      const practitionerId = this.generateId();
-
-      // Create clinicsInfo from the merged clinics array
-      const clinicsInfo: ClinicInfo[] = [];
-
-      // Populate clinicsInfo for each clinic
-      for (const cId of clinics) {
-        const clinicData = await this.getClinicService().getClinic(cId);
-        if (clinicData) {
-          // Ensure we're creating a ClinicInfo object that matches the interface structure
-          clinicsInfo.push({
-            id: clinicData.id,
-            name: clinicData.name,
-            location: clinicData.location,
-            contactInfo: clinicData.contactInfo,
-            // Make sure we're using the right property for featuredPhoto
-            featuredPhoto:
-              clinicData.featuredPhotos && clinicData.featuredPhotos.length > 0
-                ? typeof clinicData.featuredPhotos[0] === "string"
-                  ? clinicData.featuredPhotos[0]
-                  : ""
-                : (typeof clinicData.coverPhoto === "string"
-                    ? clinicData.coverPhoto
-                    : "") || "",
-            description: clinicData.description || null,
-          });
-        }
-      }
-
-      // Use provided clinicsInfo if available, otherwise use the ones we just created
-      const finalClinicsInfo =
-        validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0
-          ? validatedData.clinicsInfo
-          : clinicsInfo;
-
-      const proceduresInfo: ProcedureSummaryInfo[] = [];
-
-      // Add fullNameLower for draft
-      const fullNameLowerDraft =
-        `${validatedData.basicInfo.firstName} ${validatedData.basicInfo.lastName}`.toLowerCase();
-      const practitionerData: Omit<Practitioner, "createdAt" | "updatedAt"> & {
-        createdAt: ReturnType<typeof serverTimestamp>;
-        updatedAt: ReturnType<typeof serverTimestamp>;
-      } = {
-        id: practitionerId,
-        userRef: "", // Prazno - biće popunjeno kada korisnik kreira nalog
-        basicInfo: await this.processBasicInfo(
-          validatedData.basicInfo,
-          practitionerId
-        ),
-        fullNameLower: fullNameLowerDraft, // Ensure this is present
-        certification: validatedData.certification,
-        clinics: clinics,
-        clinicWorkingHours: validatedData.clinicWorkingHours || [],
-        clinicsInfo: finalClinicsInfo,
-        procedures: [],
-        proceduresInfo: proceduresInfo,
-        reviewInfo: defaultReviewInfo,
-        isActive:
-          validatedData.isActive !== undefined ? validatedData.isActive : false,
-        isVerified:
-          validatedData.isVerified !== undefined
-            ? validatedData.isVerified
-            : false,
-        status: PractitionerStatus.DRAFT,
-        createdAt: serverTimestamp(),
-        updatedAt: serverTimestamp(),
-      };
-
-      // Validacija kompletnog objekta
-      // Koristimo privremeni userRef za validaciju, biće prazan u bazi
-      practitionerSchema.parse({
-        ...practitionerData,
-        userRef: "temp-for-validation",
-        createdAt: Timestamp.now(),
-        updatedAt: Timestamp.now(),
-      });
-
-      // Čuvamo u Firestore
-      await setDoc(
-        doc(this.db, PRACTITIONERS_COLLECTION, practitionerData.id),
-        practitionerData
-      );
-
-      const savedPractitioner = await this.getPractitioner(practitionerData.id);
-      if (!savedPractitioner) {
-        throw new Error("Failed to create draft practitioner profile");
-      }
-
-      // Automatski kreiramo token za registraciju
-      const tokenString = this.generateId().slice(0, 6).toUpperCase();
-
-      // Default expiration is 7 days from now
-      const expiration = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
-
-      const token: PractitionerToken = {
-        id: this.generateId(),
-        token: tokenString,
-        practitionerId: practitionerId,
-        email: practitionerData.basicInfo.email,
-        clinicId: clinicId,
-        status: PractitionerTokenStatus.ACTIVE,
-        createdBy: createdBy,
-        createdAt: Timestamp.now(),
-        expiresAt: Timestamp.fromDate(expiration),
-      };
-
-      // Validate token object
-      practitionerTokenSchema.parse(token);
-
-      // Store the token in the practitioner document's register_tokens subcollection
-      const tokenPath = `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}/${token.id}`;
-      await setDoc(doc(this.db, tokenPath), token);
-
-      // Ovde bi bilo slanje emaila sa tokenom, ali to ćemo implementirati kasnije
-      // TODO: Implement email sending with Cloud Functions
-
-      return { practitioner: savedPractitioner, token };
-    } catch (error) {
-      if (error instanceof z.ZodError) {
-        throw new Error("Invalid practitioner data: " + error.message);
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * Creates a token for inviting practitioner to claim their profile
-   * @param data Data for creating token
-   * @param createdBy ID of the user creating the token
-   * @returns Created token
-   */
-  async createPractitionerToken(
-    data: CreatePractitionerTokenData,
-    createdBy: string
-  ): Promise<PractitionerToken> {
-    try {
-      // Validate data
-      const validatedData = createPractitionerTokenSchema.parse(data);
-
-      // Check if practitioner exists and is in DRAFT status
-      const practitioner = await this.getPractitioner(
-        validatedData.practitionerId
-      );
-      if (!practitioner) {
-        throw new Error("Practitioner not found");
-      }
-
-      if (practitioner.status !== PractitionerStatus.DRAFT) {
-        throw new Error(
-          "Can only create tokens for practitioners in DRAFT status"
-        );
-      }
-
-      // Check if clinic exists and practitioner belongs to it
-      const clinic = await this.getClinicService().getClinic(
-        validatedData.clinicId
-      );
-      if (!clinic) {
-        throw new Error(`Clinic ${validatedData.clinicId} not found`);
-      }
-
-      if (!practitioner.clinics.includes(validatedData.clinicId)) {
-        throw new Error("Practitioner is not associated with this clinic");
-      }
-
-      // Default expiration is 7 days from now if not specified
-      const expiration =
-        validatedData.expiresAt ||
-        new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
-
-      // Generate a token (6 characters) using generateId from BaseService
-      const tokenString = this.generateId().slice(0, 6).toUpperCase();
-
-      const token: PractitionerToken = {
-        id: this.generateId(),
-        token: tokenString,
-        practitionerId: validatedData.practitionerId,
-        email: validatedData.email,
-        clinicId: validatedData.clinicId,
-        status: PractitionerTokenStatus.ACTIVE,
-        createdBy: createdBy,
-        createdAt: Timestamp.now(),
-        expiresAt: Timestamp.fromDate(expiration),
-      };
-
-      // Validate token object
-      practitionerTokenSchema.parse(token);
-
-      // Store the token in the practitioner document's register_tokens subcollection
-      const tokenPath = `${PRACTITIONERS_COLLECTION}/${validatedData.practitionerId}/${REGISTER_TOKENS_COLLECTION}/${token.id}`;
-      await setDoc(doc(this.db, tokenPath), token);
-
-      return token;
-    } catch (error) {
-      if (error instanceof z.ZodError) {
-        throw new Error("Invalid token data: " + error.message);
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * Gets active tokens for a practitioner
-   * @param practitionerId ID of the practitioner
-   * @returns Array of active tokens
-   */
-  async getPractitionerActiveTokens(
-    practitionerId: string
-  ): Promise<PractitionerToken[]> {
-    const tokensRef = collection(
-      this.db,
-      `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
-    );
-
-    const q = query(
-      tokensRef,
-      where("status", "==", PractitionerTokenStatus.ACTIVE),
-      where("expiresAt", ">", Timestamp.now())
-    );
-
-    const querySnapshot = await getDocs(q);
-    return querySnapshot.docs.map((doc) => doc.data() as PractitionerToken);
-  }
-
-  /**
-   * Gets a token by its string value and validates it
-   * @param tokenString The token string to find
-   * @returns The token if found and valid, null otherwise
-   */
-  async validateToken(tokenString: string): Promise<PractitionerToken | null> {
-    // We need to search through all practitioners' register_tokens subcollections
-    const practitionersRef = collection(this.db, PRACTITIONERS_COLLECTION);
-    const practitionersSnapshot = await getDocs(practitionersRef);
-
-    for (const practitionerDoc of practitionersSnapshot.docs) {
-      const practitionerId = practitionerDoc.id;
-      const tokensRef = collection(
-        this.db,
-        `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
-      );
-
-      console.log(
-        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
-        {
-          tokenString,
-          timestamp: Timestamp.now().toDate(),
-        }
-      );
-
-      const q = query(
-        tokensRef,
-        where("token", "==", tokenString),
-        where("status", "==", PractitionerTokenStatus.ACTIVE),
-        where("expiresAt", ">", Timestamp.now())
-      );
-
-      try {
-        const tokenSnapshot = await getDocs(q);
-        console.log(
-          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
-          {
-            found: !tokenSnapshot.empty,
-            count: tokenSnapshot.size,
-          }
-        );
-
-        if (!tokenSnapshot.empty) {
-          const tokenData = tokenSnapshot.docs[0].data() as PractitionerToken;
-          console.log(`[PRACTITIONER] Valid token found`, {
-            tokenId: tokenData.id,
-            expiresAt: tokenData.expiresAt.toDate(),
-          });
-          return tokenData;
-        }
-      } catch (error) {
-        console.error(
-          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
-          error
-        );
-        // Re-throw the error to be handled by the caller
-        throw error;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Marks a token as used
-   * @param tokenId ID of the token
-   * @param practitionerId ID of the practitioner
-   * @param userId ID of the user using the token
-   */
-  async markTokenAsUsed(
-    tokenId: string,
-    practitionerId: string,
-    userId: string
-  ): Promise<void> {
-    const tokenRef = doc(
-      this.db,
-      `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}/${tokenId}`
-    );
-
-    await updateDoc(tokenRef, {
-      status: PractitionerTokenStatus.USED,
-      usedBy: userId,
-      usedAt: Timestamp.now(),
-    });
-  }
-
-  /**
-   * Dohvata zdravstvenog radnika po ID-u
-   */
-  async getPractitioner(practitionerId: string): Promise<Practitioner | null> {
-    const practitionerDoc = await getDoc(
-      doc(this.db, PRACTITIONERS_COLLECTION, practitionerId)
-    );
-
-    if (!practitionerDoc.exists()) {
-      return null;
-    }
-
-    return practitionerDoc.data() as Practitioner;
-  }
-
-  /**
-   * Dohvata zdravstvenog radnika po User ID-u
-   */
-  async getPractitionerByUserRef(
-    userRef: string
-  ): Promise<Practitioner | null> {
-    const q = query(
-      collection(this.db, PRACTITIONERS_COLLECTION),
-      where("userRef", "==", userRef)
-    );
-
-    const querySnapshot = await getDocs(q);
-    if (querySnapshot.empty) {
-      return null;
-    }
-
-    return querySnapshot.docs[0].data() as Practitioner;
-  }
-
-  /**
-   * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
-   */
-  async getPractitionersByClinic(clinicId: string): Promise<Practitioner[]> {
-    const q = query(
-      collection(this.db, PRACTITIONERS_COLLECTION),
-      where("clinics", "array-contains", clinicId),
-      where("isActive", "==", true),
-      where("status", "==", PractitionerStatus.ACTIVE)
-    );
-
-    const querySnapshot = await getDocs(q);
-    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
-  }
-
-  /**
-   * Dohvata sve zdravstvene radnike za određenu kliniku
-   */
-  async getAllPractitionersByClinic(clinicId: string): Promise<Practitioner[]> {
-    const q = query(
-      collection(this.db, PRACTITIONERS_COLLECTION),
-      where("clinics", "array-contains", clinicId),
-      where("isActive", "==", true)
-    );
-
-    const querySnapshot = await getDocs(q);
-    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
-  }
-
-  /**
-   * Dohvata sve draft zdravstvene radnike za određenu kliniku sa statusom DRAFT
-   */
-  async getDraftPractitionersByClinic(
-    clinicId: string
-  ): Promise<Practitioner[]> {
-    const q = query(
-      collection(this.db, PRACTITIONERS_COLLECTION),
-      where("clinics", "array-contains", clinicId),
-      where("status", "==", PractitionerStatus.DRAFT)
-    );
-
-    const querySnapshot = await getDocs(q);
-    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
-  }
-
-  /**
-   * Updates a practitioner
-   */
-  async updatePractitioner(
-    practitionerId: string,
-    data: UpdatePractitionerData
-  ): Promise<Practitioner> {
-    try {
-      // Validate update data
-      const validData = data; // Using the passed data directly as it's already validated by the schema type
-
-      // Get current practitioner data
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-      const practitionerDoc = await getDoc(practitionerRef);
-
-      if (!practitionerDoc.exists()) {
-        throw new Error(`Practitioner ${practitionerId} not found`);
-      }
-
-      const currentPractitioner = practitionerDoc.data() as Practitioner;
-
-      // Process basicInfo if it's being updated to handle profile photo uploads
-      let processedData: UpdatePractitionerData & { fullNameLower?: string } = {
-        ...validData,
-      };
-      if (validData.basicInfo) {
-        processedData.basicInfo = await this.processBasicInfo(
-          validData.basicInfo as PractitionerBasicInfo & {
-            profileImageUrl?: MediaResource | null;
-          },
-          practitionerId
-        );
-        // Always update fullNameLower when basicInfo changes
-        processedData.fullNameLower =
-          `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
-      }
-
-      // Prepare update data
-      const updateData: any = {
-        ...processedData,
-        updatedAt: serverTimestamp(),
-      };
-
-      // Update practitioner
-      await updateDoc(practitionerRef, updateData);
-
-      // Return updated practitioner
-      const updatedPractitioner = await this.getPractitioner(practitionerId);
-      if (!updatedPractitioner) {
-        throw new Error(
-          `Failed to retrieve updated practitioner ${practitionerId}`
-        );
-      }
-      return updatedPractitioner;
-    } catch (error) {
-      if (error instanceof z.ZodError) {
-        throw new Error(`Invalid practitioner update data: ${error.message}`);
-      }
-      console.error(`Error updating practitioner ${practitionerId}:`, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Adds a clinic to a practitioner
-   */
-  async addClinic(practitionerId: string, clinicId: string): Promise<void> {
-    try {
-      // Get practitioner
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-      const practitionerDoc = await getDoc(practitionerRef);
-
-      if (!practitionerDoc.exists()) {
-        throw new Error(`Practitioner ${practitionerId} not found`);
-      }
-
-      const practitioner = practitionerDoc.data() as Practitioner;
-
-      // Check if clinic already added
-      if (practitioner.clinics?.includes(clinicId)) {
-        console.log(
-          `Clinic ${clinicId} already added to practitioner ${practitionerId}`
-        );
-        return;
-      }
-
-      // Add clinic to clinics array
-      await updateDoc(practitionerRef, {
-        clinics: arrayUnion(clinicId),
-        updatedAt: serverTimestamp(),
-      });
-    } catch (error) {
-      console.error(
-        `Error adding clinic ${clinicId} to practitioner ${practitionerId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Removes a clinic from a practitioner
-   */
-  async removeClinic(practitionerId: string, clinicId: string): Promise<void> {
-    try {
-      // Get practitioner
-      const practitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        practitionerId
-      );
-      const practitionerDoc = await getDoc(practitionerRef);
-
-      if (!practitionerDoc.exists()) {
-        throw new Error(`Practitioner ${practitionerId} not found`);
-      }
-
-      // Remove clinic from clinics array
-      await updateDoc(practitionerRef, {
-        clinics: arrayRemove(clinicId),
-        updatedAt: serverTimestamp(),
-      });
-    } catch (error) {
-      console.error(
-        `Error removing clinic ${clinicId} from practitioner ${practitionerId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Deaktivira profil zdravstvenog radnika
-   */
-  async deactivatePractitioner(practitionerId: string): Promise<void> {
-    await this.updatePractitioner(practitionerId, {
-      isActive: false,
-    });
-  }
-
-  /**
-   * Aktivira profil zdravstvenog radnika
-   */
-  async activatePractitioner(practitionerId: string): Promise<void> {
-    await this.updatePractitioner(practitionerId, {
-      isActive: true,
-    });
-  }
-
-  /**
-   * Briše profil zdravstvenog radnika
-   */
-  async deletePractitioner(practitionerId: string): Promise<void> {
-    const practitioner = await this.getPractitioner(practitionerId);
-    if (!practitioner) {
-      throw new Error("Practitioner not found");
-    }
-
-    // TODO: Kada implementiramo subkolekcije, ovde ćemo dodati brisanje povezanih podataka
-
-    await deleteDoc(doc(this.db, PRACTITIONERS_COLLECTION, practitionerId));
-  }
-
-  /**
-   * Validates a registration token and claims the associated draft practitioner profile
-   * @param tokenString The token provided by the practitioner
-   * @param userId The ID of the user claiming the profile
-   * @returns The claimed practitioner profile or null if token is invalid
-   */
-  async validateTokenAndClaimProfile(
-    tokenString: string,
-    userId: string
-  ): Promise<Practitioner | null> {
-    // Find the token
-    console.log("[PRACTITIONER] Validating token for claiming profile", {
-      tokenString,
-      userId,
-    });
-
-    const token = await this.validateToken(tokenString);
-
-    if (!token) {
-      console.log(
-        "[PRACTITIONER] Token validation failed - token not found or not valid",
-        {
-          tokenString,
-        }
-      );
-      return null; // Token not found or not valid
-    }
-
-    console.log("[PRACTITIONER] Token successfully validated", {
-      tokenId: token.id,
-      practitionerId: token.practitionerId,
-    });
-
-    // Get the practitioner profile
-    const practitioner = await this.getPractitioner(token.practitionerId);
-    if (!practitioner) {
-      console.log("[PRACTITIONER] Practitioner not found", {
-        practitionerId: token.practitionerId,
-      });
-      return null; // Practitioner not found
-    }
-
-    // Ensure practitioner is in DRAFT status
-    if (practitioner.status !== PractitionerStatus.DRAFT) {
-      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
-        practitionerId: practitioner.id,
-        status: practitioner.status,
-      });
-      throw new Error("This practitioner profile has already been claimed");
-    }
-
-    // Check if user already has a practitioner profile
-    const existingPractitioner = await this.getPractitionerByUserRef(userId);
-    if (existingPractitioner) {
-      throw new Error("User already has a practitioner profile");
-    }
-
-    // Claim the profile by linking it to the user
-    const updatedPractitioner = await this.updatePractitioner(practitioner.id, {
-      userRef: userId,
-      status: PractitionerStatus.ACTIVE,
-    });
-
-    // Mark the token as used
-    await this.markTokenAsUsed(token.id, token.practitionerId, userId);
-
-    console.log("[PRACTITIONER] Profile claimed successfully", {
-      practitionerId: updatedPractitioner.id,
-      userId,
-    });
-
-    return updatedPractitioner;
-  }
-
-  /**
-   * Retrieves all practitioners with optional pagination and draft inclusion
-   *
-   * @param options - Search options
-   * @param options.pagination - Optional limit for number of results per page
-   * @param options.lastDoc - Optional last document for pagination
-   * @param options.includeDraftPractitioners - Whether to include draft practitioners
-   * @returns Array of practitioners and the last document for pagination
-   */
-  async getAllPractitioners(options?: {
-    pagination?: number;
-    lastDoc?: any;
-    includeDraftPractitioners?: boolean;
-  }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
-    try {
-      const constraints = [];
-
-      // Filter by status if not including drafts
-      if (!options?.includeDraftPractitioners) {
-        constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
-      }
-
-      // Add ordering for consistent pagination
-      constraints.push(orderBy("basicInfo.lastName", "asc"));
-      constraints.push(orderBy("basicInfo.firstName", "asc"));
-
-      // Add pagination if specified
-      if (options?.pagination && options.pagination > 0) {
-        if (options.lastDoc) {
-          constraints.push(startAfter(options.lastDoc));
-        }
-        constraints.push(limit(options.pagination));
-      }
-
-      const q = query(
-        collection(this.db, PRACTITIONERS_COLLECTION),
-        ...constraints
-      );
-
-      const querySnapshot = await getDocs(q);
-
-      const practitioners = querySnapshot.docs.map(
-        (doc) => doc.data() as Practitioner
-      );
-
-      // Get last document for pagination
-      const lastDoc =
-        querySnapshot.docs.length > 0
-          ? querySnapshot.docs[querySnapshot.docs.length - 1]
-          : null;
-
-      return {
-        practitioners,
-        lastDoc,
-      };
-    } catch (error) {
-      console.error(
-        "[PRACTITIONER_SERVICE] Error getting all practitioners:",
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Searches and filters practitioners based on multiple criteria
-   *
-   * @param filters - Various filters to apply
-   * @param filters.nameSearch - Optional search text for first/last name
-   * @param filters.certifications - Optional array of certifications to filter by
-   * @param filters.specialties - Optional array of specialties to filter by
-   * @param filters.procedureFamily - Optional procedure family practitioners provide
-   * @param filters.procedureCategory - Optional procedure category practitioners provide
-   * @param filters.procedureSubcategory - Optional procedure subcategory practitioners provide
-   * @param filters.procedureTechnology - Optional procedure technology practitioners provide
-   * @param filters.location - Optional location for distance-based search
-   * @param filters.radiusInKm - Optional radius in kilometers (required if location is provided)
-   * @param filters.minRating - Optional minimum rating (0-5)
-   * @param filters.maxRating - Optional maximum rating (0-5)
-   * @param filters.pagination - Optional number of results per page
-   * @param filters.lastDoc - Optional last document for pagination
-   * @param filters.includeDraftPractitioners - Whether to include draft practitioners
-   * @returns Filtered practitioners and the last document for pagination
-   */
-  async getPractitionersByFilters(filters: {
-    nameSearch?: string;
-    certifications?: string[];
-    specialties?: CertificationSpecialty[];
-    procedureFamily?: string;
-    procedureCategory?: string;
-    procedureSubcategory?: string;
-    procedureTechnology?: string;
-    location?: { latitude: number; longitude: number };
-    radiusInKm?: number;
-    minRating?: number;
-    maxRating?: number;
-    pagination?: number;
-    lastDoc?: any;
-    includeDraftPractitioners?: boolean;
-  }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
-    try {
-      console.log(
-        "[PRACTITIONER_SERVICE] Starting practitioner filtering with fallback strategies"
-      );
-
-      // Geo query debug i validacija
-      if (filters.location && filters.radiusInKm) {
-        console.log("[PRACTITIONER_SERVICE] Executing geo query:", {
-          location: filters.location,
-          radius: filters.radiusInKm,
-          serviceName: "PractitionerService",
-        });
-
-        // Validacija location podataka
-        if (!filters.location.latitude || !filters.location.longitude) {
-          console.warn(
-            "[PRACTITIONER_SERVICE] Invalid location data:",
-            filters.location
-          );
-          filters.location = undefined;
-          filters.radiusInKm = undefined;
-        }
-      }
-
-      // Strategy 1: Try fullNameLower search if nameSearch exists
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        try {
-          console.log(
-            "[PRACTITIONER_SERVICE] Strategy 1: Trying fullNameLower search"
-          );
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          const constraints: any[] = [];
-
-          if (!filters.includeDraftPractitioners) {
-            constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
-          }
-          constraints.push(where("isActive", "==", true));
-          constraints.push(where("fullNameLower", ">=", searchTerm));
-          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));
-            }
-          }
-          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(
-            (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
-          );
-          const lastDoc =
-            querySnapshot.docs.length > 0
-              ? querySnapshot.docs[querySnapshot.docs.length - 1]
-              : null;
-
-          console.log(
-            `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
-          );
-
-          // Fix Load More - ako je broj rezultata manji od pagination, nema više
-          if (practitioners.length < (filters.pagination || 10)) {
-            return { practitioners, lastDoc: null };
-          }
-          return { practitioners, lastDoc };
-        } catch (error) {
-          console.log("[PRACTITIONER_SERVICE] Strategy 1 failed:", error);
-        }
-      }
-
-      // Strategy 2: Basic query with createdAt ordering (no name search)
-      try {
-        console.log(
-          "[PRACTITIONER_SERVICE] Strategy 2: Basic query with createdAt ordering"
-        );
-        const constraints: any[] = [];
-
-        if (!filters.includeDraftPractitioners) {
-          constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
-        }
-        constraints.push(where("isActive", "==", true));
-
-        // Add other filters that work well with Firestore
-        if (filters.certifications && filters.certifications.length > 0) {
-          const certificationsToMatch =
-            filters.certifications as CertificationSpecialty[];
-          constraints.push(
-            where(
-              "certification.specialties",
-              "array-contains-any",
-              certificationsToMatch
-            )
-          );
-        }
-
-        if (filters.minRating !== undefined) {
-          constraints.push(
-            where("reviewInfo.averageRating", ">=", filters.minRating)
-          );
-        }
-        if (filters.maxRating !== undefined) {
-          constraints.push(
-            where("reviewInfo.averageRating", "<=", filters.maxRating)
-          );
-        }
-
-        constraints.push(orderBy("createdAt", "desc"));
-
-        // Pagination sa createdAt - poboljšano za geo queries
-        if (filters.location && filters.radiusInKm) {
-          // Ne koristiti lastDoc za geo queries, već preuzmi više rezultata
-          constraints.push(limit((filters.pagination || 10) * 2)); // Dvostruko više za geo filter
-        } 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));
-        }
-
-        const q = query(
-          collection(this.db, PRACTITIONERS_COLLECTION),
-          ...constraints
-        );
-        const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(
-          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
-        );
-
-        // Apply geo filter if needed (this is the only in-memory filter we keep)
-        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 distance = distanceBetween(
-                [location.latitude, location.longitude],
-                [clinic.location.latitude, clinic.location.longitude]
-              );
-              const distanceInKm = distance / 1000;
-              return distanceInKm <= radiusInKm;
-            });
-          });
-
-          // Ograniči na pagination broj nakon geo filtera
-          practitioners = practitioners.slice(0, filters.pagination || 10);
-        }
-
-        // Apply all remaining client-side filters using centralized function
-        practitioners = this.applyInMemoryFilters(practitioners, filters);
-
-        const lastDoc =
-          querySnapshot.docs.length > 0
-            ? querySnapshot.docs[querySnapshot.docs.length - 1]
-            : null;
-        console.log(
-          `[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`
-        );
-
-        // Fix Load More - ako je broj rezultata manji od pagination, nema više
-        if (practitioners.length < (filters.pagination || 10)) {
-          return { practitioners, lastDoc: null };
-        }
-        return { practitioners, lastDoc };
-      } catch (error) {
-        console.log("[PRACTITIONER_SERVICE] Strategy 2 failed:", error);
-      }
-
-      // Strategy 3: Minimal query fallback
-      try {
-        console.log(
-          "[PRACTITIONER_SERVICE] Strategy 3: Minimal query fallback"
-        );
-        const constraints: any[] = [
-          where("isActive", "==", true),
-          orderBy("createdAt", "desc"),
-          limit(filters.pagination || 10),
-        ];
-
-        const q = query(
-          collection(this.db, PRACTITIONERS_COLLECTION),
-          ...constraints
-        );
-        const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(
-          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
-        );
-
-        // Apply all client-side filters using centralized function
-        practitioners = this.applyInMemoryFilters(practitioners, filters);
-
-        const lastDoc =
-          querySnapshot.docs.length > 0
-            ? querySnapshot.docs[querySnapshot.docs.length - 1]
-            : null;
-        console.log(
-          `[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`
-        );
-
-        // Fix Load More - ako je broj rezultata manji od pagination, nema više
-        if (practitioners.length < (filters.pagination || 10)) {
-          return { practitioners, lastDoc: null };
-        }
-        return { practitioners, lastDoc };
-      } catch (error) {
-        console.log("[PRACTITIONER_SERVICE] Strategy 3 failed:", error);
-      }
-
-      // Strategy 4: Client-side filtering fallback (kao u procedure/clinic services)
-      try {
-        console.log(
-          "[PRACTITIONER_SERVICE] Strategy 4: Client-side filtering fallback"
-        );
-
-        const constraints: any[] = [
-          where("isActive", "==", true),
-          where("status", "==", PractitionerStatus.ACTIVE),
-          orderBy("createdAt", "desc"),
-          limit(filters.pagination || 10),
-        ];
-
-        const q = query(
-          collection(this.db, PRACTITIONERS_COLLECTION),
-          ...constraints
-        );
-        const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(
-          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
-        );
-
-        // Apply all client-side filters using centralized function
-        practitioners = this.applyInMemoryFilters(practitioners, filters);
-
-        const lastDoc =
-          querySnapshot.docs.length > 0
-            ? querySnapshot.docs[querySnapshot.docs.length - 1]
-            : null;
-        console.log(
-          `[PRACTITIONER_SERVICE] Strategy 4 success: ${practitioners.length} practitioners`
-        );
-
-        // Fix Load More - ako je broj rezultata manji od pagination, nema više
-        if (practitioners.length < (filters.pagination || 10)) {
-          return { practitioners, lastDoc: null };
-        }
-        return { practitioners, lastDoc };
-      } catch (error) {
-        console.log("[PRACTITIONER_SERVICE] Strategy 4 failed:", error);
-      }
-
-      // All strategies failed
-      console.log(
-        "[PRACTITIONER_SERVICE] All strategies failed, returning empty result"
-      );
-      return { practitioners: [], lastDoc: null };
-    } catch (error) {
-      console.error(
-        "[PRACTITIONER_SERVICE] Error filtering practitioners:",
-        error
-      );
-      return { practitioners: [], lastDoc: null };
-    }
-  }
-
-  /**
-   * Applies in-memory filters to practitioners array
-   * Used when Firestore queries fail or for complex filtering
-   */
-  private applyInMemoryFilters(
-    practitioners: Practitioner[],
-    filters: any
-  ): Practitioner[] {
-    let filteredPractitioners = [...practitioners]; // Create copy to avoid mutating original
-
-    // Name search filter
-    if (filters.nameSearch && filters.nameSearch.trim()) {
-      const searchTerm = filters.nameSearch.trim().toLowerCase();
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const firstName = (
-          practitioner.basicInfo?.firstName || ""
-        ).toLowerCase();
-        const lastName = (practitioner.basicInfo?.lastName || "").toLowerCase();
-        const fullName = `${firstName} ${lastName}`.trim();
-        const fullNameLower = practitioner.fullNameLower || "";
-
-        return (
-          firstName.includes(searchTerm) ||
-          lastName.includes(searchTerm) ||
-          fullName.includes(searchTerm) ||
-          fullNameLower.includes(searchTerm)
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied name filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Certifications filtering
-    if (filters.certifications && filters.certifications.length > 0) {
-      const certificationsToMatch = filters.certifications;
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const practitionerCerts = practitioner.certification?.specialties || [];
-        return certificationsToMatch.some((cert: any) =>
-          practitionerCerts.includes(cert as CertificationSpecialty)
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied certifications filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Specialties filtering
-    if (filters.specialties && filters.specialties.length > 0) {
-      const specialtiesToMatch = filters.specialties;
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const practitionerSpecs = practitioner.certification?.specialties || [];
-        return specialtiesToMatch.some((spec: any) =>
-          practitionerSpecs.includes(spec)
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied specialties filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Rating filtering
-    if (filters.minRating !== undefined || filters.maxRating !== undefined) {
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const rating = practitioner.reviewInfo?.averageRating || 0;
-        if (filters.minRating !== undefined && rating < filters.minRating)
-          return false;
-        if (filters.maxRating !== undefined && rating > filters.maxRating)
-          return false;
-        return true;
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied rating filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Procedure family filtering
-    if (filters.procedureFamily) {
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(
-          (proc) => proc.family === filters.procedureFamily
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied procedure family filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Procedure category filtering
-    if (filters.procedureCategory) {
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(
-          (proc) => proc.categoryName === filters.procedureCategory
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied procedure category filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Procedure subcategory filtering
-    if (filters.procedureSubcategory) {
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(
-          (proc) => proc.subcategoryName === filters.procedureSubcategory
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied procedure subcategory filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Procedure technology filtering
-    if (filters.procedureTechnology) {
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(
-          (proc) => proc.technologyName === filters.procedureTechnology
-        );
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied procedure technology filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    // Geo-radius filter
-    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
-      const location = filters.location;
-      const radiusInKm = filters.radiusInKm;
-      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
-        const clinics = practitioner.clinicsInfo || [];
-        return clinics.some((clinic) => {
-          const distance = distanceBetween(
-            [location.latitude, location.longitude],
-            [clinic.location.latitude, clinic.location.longitude]
-          );
-          const distanceInKm = distance / 1000;
-          return distanceInKm <= radiusInKm;
-        });
-      });
-      console.log(
-        `[PRACTITIONER_SERVICE] Applied geo filter, results: ${filteredPractitioners.length}`
-      );
-    }
-
-    return filteredPractitioners;
-  }
-
-  /**
-   * Enables free consultation for a practitioner in a specific clinic
-   * Creates a free consultation procedure with hardcoded parameters
-   * @param practitionerId - ID of the practitioner
-   * @param clinicId - ID of the clinic
-   * @returns The created consultation procedure
-   */
-  async EnableFreeConsultation(
-    practitionerId: string,
-    clinicId: string
-  ): Promise<void> {
-    try {
-      // First, ensure the free consultation infrastructure exists
-      await this.ensureFreeConsultationInfrastructure();
-
-      // Validate that practitioner exists and is active
-      const practitioner = await this.getPractitioner(practitionerId);
-      if (!practitioner) {
-        throw new Error(`Practitioner ${practitionerId} not found`);
-      }
-
-      // No need to check for is practitioner active
-      // if (!practitioner.isActive) {
-      //   throw new Error(`Practitioner ${practitionerId} is not active`);
-      // }
-
-      // Validate that clinic exists
-      const clinic = await this.getClinicService().getClinic(clinicId);
-      if (!clinic) {
-        throw new Error(`Clinic ${clinicId} not found`);
-      }
-
-      // Check if practitioner is associated with this clinic
-      if (!practitioner.clinics.includes(clinicId)) {
-        throw new Error(
-          `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
-        );
-      }
-
-      // Get all procedures for this practitioner (including inactive ones)
-      const [activeProcedures, inactiveProcedures] = await Promise.all([
-        this.getProcedureService().getProceduresByPractitioner(practitionerId),
-        this.getProcedureService().getInactiveProceduresByPractitioner(
-          practitionerId
-        ),
-      ]);
-
-      // Combine active and inactive procedures
-      const allProcedures = [...activeProcedures, ...inactiveProcedures];
-
-      // Check if free consultation already exists (active or inactive)
-      const existingConsultation = allProcedures.find(
-        (procedure) =>
-          procedure.technology.id === "free-consultation-tech" &&
-          procedure.clinicBranchId === clinicId
-      );
-
-      if (existingConsultation) {
-        if (existingConsultation.isActive) {
-          console.log(
-            `Free consultation already active for practitioner ${practitionerId} in clinic ${clinicId}`
-          );
-          return;
-        } else {
-          // Reactivate the existing disabled consultation
-          await this.getProcedureService().updateProcedure(
-            existingConsultation.id,
-            { isActive: true }
-          );
-          console.log(
-            `Reactivated existing free consultation for practitioner ${practitionerId} in clinic ${clinicId}`
-          );
-          return;
-        }
-      }
-
-      // Create procedure data for free consultation (without productId or productsMetadata)
-      const consultationData: Omit<CreateProcedureData, "productId"> = {
-        name: "Free Consultation",
-        nameLower: "free consultation",
-        description:
-          "Free initial consultation to discuss treatment options and assess patient needs.",
-        family: ProcedureFamily.AESTHETICS,
-        categoryId: "consultation",
-        subcategoryId: "free-consultation",
-        technologyId: "free-consultation-tech",
-        price: 0,
-        currency: Currency.EUR,
-        pricingMeasure: PricingMeasure.PER_SESSION,
-        // productsMetadata omitted - no products needed for consultations
-        duration: 30, // 30 minutes consultation
-        practitionerId: practitionerId,
-        clinicBranchId: clinicId,
-        photos: [], // No photos for consultation
-      };
-
-      // Create the consultation procedure using the special method
-      await this.getProcedureService().createConsultationProcedure(
-        consultationData
-      );
-
-      console.log(
-        `Free consultation enabled for practitioner ${practitionerId} in clinic ${clinicId}`
-      );
-    } catch (error) {
-      console.error(
-        `Error enabling free consultation for practitioner ${practitionerId} in clinic ${clinicId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Ensures that the free consultation infrastructure exists by calling the Cloud Function
-   * @returns Promise<boolean> - True if infrastructure exists or was created successfully
-   */
-  async ensureFreeConsultationInfrastructure(): Promise<boolean> {
-    try {
-      console.log(
-        "[PRACTITIONER_SERVICE] Ensuring free consultation infrastructure via HTTP"
-      );
-
-      // Check if user is authenticated
-      const currentUser = this.auth.currentUser;
-      if (!currentUser) {
-        throw new Error(
-          "User must be authenticated to ensure free consultation infrastructure"
-        );
-      }
-
-      // Construct the function URL for the Express app endpoint
-      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/ensureFreeConsultationInfrastructure`;
-
-      // Get the authenticated user's ID token
-      const idToken = await currentUser.getIdToken();
-
-      console.log(
-        `[PRACTITIONER_SERVICE] Making fetch request to ${functionUrl}`
-      );
-
-      // Make the HTTP request
-      const response = await fetch(functionUrl, {
-        method: "POST",
-        mode: "cors",
-        cache: "no-cache",
-        credentials: "omit",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${idToken}`,
-        },
-        redirect: "follow",
-        referrerPolicy: "no-referrer",
-        body: JSON.stringify({}), // Empty body as no parameters needed
-      });
-
-      console.log(
-        `[PRACTITIONER_SERVICE] Received response ${response.status}: ${response.statusText}`
-      );
-
-      // Check if the request was successful
-      if (!response.ok) {
-        const errorText = await response.text();
-        console.error(
-          `[PRACTITIONER_SERVICE] Error response details: ${errorText}`
-        );
-        throw new Error(
-          `Failed to ensure free consultation infrastructure: ${response.status} ${response.statusText} - ${errorText}`
-        );
-      }
-
-      // Parse the response
-      const result = await response.json();
-      console.log(
-        `[PRACTITIONER_SERVICE] Infrastructure check response:`,
-        result
-      );
-
-      if (!result.success) {
-        throw new Error(
-          result.error || "Failed to ensure free consultation infrastructure"
-        );
-      }
-
-      console.log(
-        `[PRACTITIONER_SERVICE] Free consultation infrastructure ensured successfully`
-      );
-
-      return result.infrastructureExists;
-    } catch (error) {
-      console.error(
-        "[PRACTITIONER_SERVICE] Error ensuring free consultation infrastructure:",
-        error
-      );
-      throw error;
-    }
-  }
-
-  /**
-   * Disables free consultation for a practitioner in a specific clinic
-   * Finds and deactivates the existing free consultation procedure
-   * @param practitionerId - ID of the practitioner
-   * @param clinicId - ID of the clinic
-   */
-  async DisableFreeConsultation(
-    practitionerId: string,
-    clinicId: string
-  ): Promise<void> {
-    try {
-      // Validate that practitioner exists
-      const practitioner = await this.getPractitioner(practitionerId);
-      if (!practitioner) {
-        throw new Error(`Practitioner ${practitionerId} not found`);
-      }
-
-      // Validate that clinic exists
-      const clinic = await this.getClinicService().getClinic(clinicId);
-      if (!clinic) {
-        throw new Error(`Clinic ${clinicId} not found`);
-      }
-
-      // Check if practitioner is associated with this clinic
-      if (!practitioner.clinics.includes(clinicId)) {
-        throw new Error(
-          `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
-        );
-      }
-
-      // Find the free consultation procedure for this practitioner in this clinic
-      // Use the more specific search by technology ID instead of name
-      const existingProcedures =
-        await this.getProcedureService().getProceduresByPractitioner(
-          practitionerId
-        );
-      const freeConsultation = existingProcedures.find(
-        (procedure) =>
-          procedure.technology.id === "free-consultation-tech" &&
-          procedure.clinicBranchId === clinicId &&
-          procedure.isActive
-      );
-
-      if (!freeConsultation) {
-        console.log(
-          `No active free consultation found for practitioner ${practitionerId} in clinic ${clinicId}`
-        );
-        return;
-      }
-
-      // Deactivate the consultation procedure
-      await this.getProcedureService().deactivateProcedure(freeConsultation.id);
-
-      console.log(
-        `Free consultation disabled for practitioner ${practitionerId} in clinic ${clinicId}`
-      );
-    } catch (error) {
-      console.error(
-        `Error disabling free consultation for practitioner ${practitionerId} in clinic ${clinicId}:`,
-        error
-      );
-      throw error;
-    }
-  }
-}
+import {
+  collection,
+  doc,
+  getDoc,
+  getDocs,
+  query,
+  where,
+  updateDoc,
+  setDoc,
+  deleteDoc,
+  Timestamp,
+  serverTimestamp,
+  limit,
+  startAfter,
+  orderBy,
+  writeBatch,
+  arrayUnion,
+  arrayRemove,
+  FieldValue,
+} from "firebase/firestore";
+import { BaseService } from "../base.service";
+import {
+  Practitioner,
+  CreatePractitionerData,
+  UpdatePractitionerData,
+  PRACTITIONERS_COLLECTION,
+  REGISTER_TOKENS_COLLECTION,
+  PractitionerStatus,
+  CreateDraftPractitionerData,
+  PractitionerToken,
+  CreatePractitionerTokenData,
+  PractitionerTokenStatus,
+  PractitionerBasicInfo,
+} from "../../types/practitioner";
+import { ProcedureSummaryInfo } from "../../types/procedure";
+import { ClinicService } from "../clinic/clinic.service";
+import {
+  MediaService,
+  MediaAccessLevel,
+  MediaResource,
+} from "../media/media.service";
+import {
+  practitionerSchema,
+  createPractitionerSchema,
+  createDraftPractitionerSchema,
+  practitionerTokenSchema,
+  createPractitionerTokenSchema,
+} from "../../validations/practitioner.schema";
+import { z } from "zod";
+import { Auth } from "firebase/auth";
+import { Firestore } from "firebase/firestore";
+import { FirebaseApp } from "firebase/app";
+import { PractitionerReviewInfo } from "../../types/reviews";
+import { distanceBetween } from "geofire-common";
+import { CertificationSpecialty } from "../../backoffice/types/static/certification.types";
+import { Clinic, DoctorInfo, CLINICS_COLLECTION } from "../../types/clinic";
+import { ClinicInfo } from "../../types/profile";
+import { ProcedureService } from "../procedure/procedure.service";
+import { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
+import {
+  Currency,
+  PricingMeasure,
+} from "../../backoffice/types/static/pricing.types";
+import { CreateProcedureData } from "../../types/procedure";
+
+export class PractitionerService extends BaseService {
+  private clinicService?: ClinicService;
+  private mediaService: MediaService;
+  private procedureService?: ProcedureService;
+
+  constructor(
+    db: Firestore,
+    auth: Auth,
+    app: FirebaseApp,
+    clinicService?: ClinicService,
+    procedureService?: ProcedureService
+  ) {
+    super(db, auth, app);
+    this.clinicService = clinicService;
+    this.procedureService = procedureService;
+    this.mediaService = new MediaService(db, auth, app);
+  }
+
+  public getClinicService(): ClinicService {
+    if (!this.clinicService) {
+      throw new Error("Clinic service not initialized!");
+    }
+    return this.clinicService;
+  }
+
+  private getProcedureService(): ProcedureService {
+    if (!this.procedureService) {
+      throw new Error("Procedure service not initialized!");
+    }
+    return this.procedureService;
+  }
+
+  setClinicService(clinicService: ClinicService): void {
+    this.clinicService = clinicService;
+  }
+
+  setProcedureService(procedureService: ProcedureService): void {
+    this.procedureService = procedureService;
+  }
+
+  /**
+   * Handles profile photo upload for practitioners
+   * @param profilePhoto - MediaResource (File, Blob, or URL string)
+   * @param practitionerId - ID of the practitioner
+   * @returns URL string of the uploaded or existing photo
+   */
+  private async handleProfilePhotoUpload(
+    profilePhoto: MediaResource | undefined | null,
+    practitionerId: string
+  ): Promise<string | undefined> {
+    if (!profilePhoto) {
+      return undefined;
+    }
+
+    // If it's already a URL string, return it as is
+    if (typeof profilePhoto === "string") {
+      return profilePhoto;
+    }
+
+    // If it's a File or Blob, upload it
+    if (profilePhoto instanceof File || profilePhoto instanceof Blob) {
+      console.log(
+        `[PractitionerService] Uploading profile photo for practitioner ${practitionerId}`
+      );
+
+      const mediaMetadata = await this.mediaService.uploadMedia(
+        profilePhoto,
+        practitionerId, // Using practitionerId as ownerId
+        MediaAccessLevel.PUBLIC, // Profile photos should be public
+        "practitioner_profile_photos",
+        profilePhoto instanceof File
+          ? profilePhoto.name
+          : `profile_photo_${practitionerId}`
+      );
+
+      return mediaMetadata.url;
+    }
+
+    return undefined;
+  }
+
+  /**
+   * Processes BasicPractitionerInfo to handle profile photo uploads
+   * @param basicInfo - The basic info containing potential MediaResource profile photo
+   * @param practitionerId - ID of the practitioner
+   * @returns Processed basic info with URL string for profileImageUrl
+   */
+  private async processBasicInfo(
+    basicInfo: PractitionerBasicInfo & {
+      profileImageUrl?: MediaResource | null;
+    },
+    practitionerId: string
+  ): Promise<PractitionerBasicInfo> {
+    const processedBasicInfo = { ...basicInfo };
+
+    // Handle profile photo upload if needed
+    if (basicInfo.profileImageUrl) {
+      const uploadedUrl = await this.handleProfilePhotoUpload(
+        basicInfo.profileImageUrl,
+        practitionerId
+      );
+      processedBasicInfo.profileImageUrl = uploadedUrl;
+    }
+
+    return processedBasicInfo;
+  }
+
+  /**
+   * Creates a new practitioner
+   */
+  async createPractitioner(
+    data: CreatePractitionerData
+  ): Promise<Practitioner> {
+    try {
+      const validData = createPractitionerSchema.parse(data);
+      const practitionerId = this.generateId();
+
+      // Default review info
+      const reviewInfo: PractitionerReviewInfo = {
+        totalReviews: 0,
+        averageRating: 0,
+        knowledgeAndExpertise: 0,
+        communicationSkills: 0,
+        bedSideManner: 0,
+        thoroughness: 0,
+        trustworthiness: 0,
+        recommendationPercentage: 0,
+      };
+
+      // Create practitioner object
+      const fullNameLower =
+        `${validData.basicInfo.firstName} ${validData.basicInfo.lastName}`.toLowerCase();
+      const practitioner: Omit<Practitioner, "createdAt" | "updatedAt"> & {
+        createdAt: FieldValue;
+        updatedAt: FieldValue;
+      } = {
+        id: practitionerId,
+        userRef: validData.userRef,
+        basicInfo: await this.processBasicInfo(
+          validData.basicInfo,
+          practitionerId
+        ),
+        fullNameLower: fullNameLower, // Ensure this is present
+        certification: validData.certification,
+        clinics: validData.clinics || [],
+        clinicWorkingHours: validData.clinicWorkingHours || [],
+        clinicsInfo: [],
+        procedures: [],
+        proceduresInfo: [],
+        reviewInfo,
+        isActive: validData.isActive !== undefined ? validData.isActive : true,
+        isVerified:
+          validData.isVerified !== undefined ? validData.isVerified : false,
+        status: validData.status || PractitionerStatus.ACTIVE,
+        createdAt: serverTimestamp(),
+        updatedAt: serverTimestamp(),
+      };
+
+      // Validate the entire object
+      practitionerSchema.parse({
+        ...practitioner,
+        createdAt: Timestamp.now(),
+        updatedAt: Timestamp.now(),
+      });
+
+      // Create practitioner document
+      const practitionerRef = doc(
+        this.db,
+        PRACTITIONERS_COLLECTION,
+        practitionerId
+      );
+
+      await setDoc(practitionerRef, practitioner);
+
+      // Return the created practitioner
+      const createdPractitioner = await this.getPractitioner(practitionerId);
+      if (!createdPractitioner) {
+        throw new Error(
+          `Failed to retrieve created practitioner ${practitionerId}`
+        );
+      }
+      return createdPractitioner;
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        throw new Error(`Invalid practitioner data: ${error.message}`);
+      }
+      console.error("Error creating practitioner:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * Kreira novi draft profil zdravstvenog radnika bez povezanog korisnika
+   * Koristi se od strane administratora klinike za kreiranje profila i kasnije pozivanje
+   * @param data Podaci za kreiranje draft profila
+   * @param createdBy ID administratora koji kreira profil
+   * @param clinicId ID klinike za koju se kreira profil
+   * @returns Objekt koji sadrži kreirani draft profil i token za registraciju
+   */
+  async createDraftPractitioner(
+    data: CreateDraftPractitionerData,
+    createdBy: string,
+    clinicId: string
+  ): Promise<{ practitioner: Practitioner; token: PractitionerToken }> {
+    try {
+      // Validacija ulaznih podataka
+      const validatedData = createDraftPractitionerSchema.parse(data);
+
+      // Provera da li klinika postoji
+      const clinic = await this.getClinicService().getClinic(clinicId);
+      if (!clinic) {
+        throw new Error(`Clinic ${clinicId} not found`);
+      }
+
+      // Make sure the primary clinic (clinicId) is always included
+      // Merge the clinics array with the primary clinicId, avoiding duplicates
+      const clinicsToAdd = new Set<string>([clinicId]);
+
+      // Add additional clinics if provided
+      if (data.clinics && data.clinics.length > 0) {
+        for (const cId of data.clinics) {
+          // Verify each additional clinic exists
+          if (cId !== clinicId) {
+            // Skip checking the primary clinic again
+            const otherClinic = await this.getClinicService().getClinic(cId);
+            if (!otherClinic) {
+              throw new Error(`Clinic ${cId} not found`);
+            }
+          }
+          clinicsToAdd.add(cId);
+        }
+      }
+
+      // Convert Set to Array
+      const clinics = Array.from(clinicsToAdd);
+
+      // Initialize default review info for new practitioners
+      const defaultReviewInfo: PractitionerReviewInfo = {
+        totalReviews: 0,
+        averageRating: 0,
+        knowledgeAndExpertise: 0,
+        communicationSkills: 0,
+        bedSideManner: 0,
+        thoroughness: 0,
+        trustworthiness: 0,
+        recommendationPercentage: 0,
+      };
+
+      // Generate ID for the new practitioner
+      const practitionerId = this.generateId();
+
+      // Create clinicsInfo from the merged clinics array
+      const clinicsInfo: ClinicInfo[] = [];
+
+      // Populate clinicsInfo for each clinic
+      for (const cId of clinics) {
+        const clinicData = await this.getClinicService().getClinic(cId);
+        if (clinicData) {
+          // Ensure we're creating a ClinicInfo object that matches the interface structure
+          clinicsInfo.push({
+            id: clinicData.id,
+            name: clinicData.name,
+            location: clinicData.location,
+            contactInfo: clinicData.contactInfo,
+            // Make sure we're using the right property for featuredPhoto
+            featuredPhoto:
+              clinicData.featuredPhotos && clinicData.featuredPhotos.length > 0
+                ? typeof clinicData.featuredPhotos[0] === "string"
+                  ? clinicData.featuredPhotos[0]
+                  : ""
+                : (typeof clinicData.coverPhoto === "string"
+                    ? clinicData.coverPhoto
+                    : "") || "",
+            description: clinicData.description || null,
+          });
+        }
+      }
+
+      // Use provided clinicsInfo if available, otherwise use the ones we just created
+      const finalClinicsInfo =
+        validatedData.clinicsInfo && validatedData.clinicsInfo.length > 0
+          ? validatedData.clinicsInfo
+          : clinicsInfo;
+
+      const proceduresInfo: ProcedureSummaryInfo[] = [];
+
+      // Add fullNameLower for draft
+      const fullNameLowerDraft =
+        `${validatedData.basicInfo.firstName} ${validatedData.basicInfo.lastName}`.toLowerCase();
+      const practitionerData: Omit<Practitioner, "createdAt" | "updatedAt"> & {
+        createdAt: ReturnType<typeof serverTimestamp>;
+        updatedAt: ReturnType<typeof serverTimestamp>;
+      } = {
+        id: practitionerId,
+        userRef: "", // Prazno - biće popunjeno kada korisnik kreira nalog
+        basicInfo: await this.processBasicInfo(
+          validatedData.basicInfo,
+          practitionerId
+        ),
+        fullNameLower: fullNameLowerDraft, // Ensure this is present
+        certification: validatedData.certification,
+        clinics: clinics,
+        clinicWorkingHours: validatedData.clinicWorkingHours || [],
+        clinicsInfo: finalClinicsInfo,
+        procedures: [],
+        proceduresInfo: proceduresInfo,
+        reviewInfo: defaultReviewInfo,
+        isActive:
+          validatedData.isActive !== undefined ? validatedData.isActive : false,
+        isVerified:
+          validatedData.isVerified !== undefined
+            ? validatedData.isVerified
+            : false,
+        status: PractitionerStatus.DRAFT,
+        createdAt: serverTimestamp(),
+        updatedAt: serverTimestamp(),
+      };
+
+      // Validacija kompletnog objekta
+      // Koristimo privremeni userRef za validaciju, biće prazan u bazi
+      practitionerSchema.parse({
+        ...practitionerData,
+        userRef: "temp-for-validation",
+        createdAt: Timestamp.now(),
+        updatedAt: Timestamp.now(),
+      });
+
+      // Čuvamo u Firestore
+      await setDoc(
+        doc(this.db, PRACTITIONERS_COLLECTION, practitionerData.id),
+        practitionerData
+      );
+
+      const savedPractitioner = await this.getPractitioner(practitionerData.id);
+      if (!savedPractitioner) {
+        throw new Error("Failed to create draft practitioner profile");
+      }
+
+      // Automatski kreiramo token za registraciju
+      const tokenString = this.generateId().slice(0, 6).toUpperCase();
+
+      // Default expiration is 7 days from now
+      const expiration = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
+
+      const token: PractitionerToken = {
+        id: this.generateId(),
+        token: tokenString,
+        practitionerId: practitionerId,
+        email: practitionerData.basicInfo.email,
+        clinicId: clinicId,
+        status: PractitionerTokenStatus.ACTIVE,
+        createdBy: createdBy,
+        createdAt: Timestamp.now(),
+        expiresAt: Timestamp.fromDate(expiration),
+      };
+
+      // Validate token object
+      practitionerTokenSchema.parse(token);
+
+      // Store the token in the practitioner document's register_tokens subcollection
+      const tokenPath = `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}/${token.id}`;
+      await setDoc(doc(this.db, tokenPath), token);
+
+      // Ovde bi bilo slanje emaila sa tokenom, ali to ćemo implementirati kasnije
+      // TODO: Implement email sending with Cloud Functions
+
+      return { practitioner: savedPractitioner, token };
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        throw new Error("Invalid practitioner data: " + error.message);
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Creates a token for inviting practitioner to claim their profile
+   * @param data Data for creating token
+   * @param createdBy ID of the user creating the token
+   * @returns Created token
+   */
+  async createPractitionerToken(
+    data: CreatePractitionerTokenData,
+    createdBy: string
+  ): Promise<PractitionerToken> {
+    try {
+      // Validate data
+      const validatedData = createPractitionerTokenSchema.parse(data);
+
+      // Check if practitioner exists and is in DRAFT status
+      const practitioner = await this.getPractitioner(
+        validatedData.practitionerId
+      );
+      if (!practitioner) {
+        throw new Error("Practitioner not found");
+      }
+
+      if (practitioner.status !== PractitionerStatus.DRAFT) {
+        throw new Error(
+          "Can only create tokens for practitioners in DRAFT status"
+        );
+      }
+
+      // Check if clinic exists and practitioner belongs to it
+      const clinic = await this.getClinicService().getClinic(
+        validatedData.clinicId
+      );
+      if (!clinic) {
+        throw new Error(`Clinic ${validatedData.clinicId} not found`);
+      }
+
+      if (!practitioner.clinics.includes(validatedData.clinicId)) {
+        throw new Error("Practitioner is not associated with this clinic");
+      }
+
+      // Default expiration is 7 days from now if not specified
+      const expiration =
+        validatedData.expiresAt ||
+        new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
+
+      // Generate a token (6 characters) using generateId from BaseService
+      const tokenString = this.generateId().slice(0, 6).toUpperCase();
+
+      const token: PractitionerToken = {
+        id: this.generateId(),
+        token: tokenString,
+        practitionerId: validatedData.practitionerId,
+        email: validatedData.email,
+        clinicId: validatedData.clinicId,
+        status: PractitionerTokenStatus.ACTIVE,
+        createdBy: createdBy,
+        createdAt: Timestamp.now(),
+        expiresAt: Timestamp.fromDate(expiration),
+      };
+
+      // Validate token object
+      practitionerTokenSchema.parse(token);
+
+      // Store the token in the practitioner document's register_tokens subcollection
+      const tokenPath = `${PRACTITIONERS_COLLECTION}/${validatedData.practitionerId}/${REGISTER_TOKENS_COLLECTION}/${token.id}`;
+      await setDoc(doc(this.db, tokenPath), token);
+
+      return token;
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        throw new Error("Invalid token data: " + error.message);
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Gets active tokens for a practitioner
+   * @param practitionerId ID of the practitioner
+   * @returns Array of active tokens
+   */
+  async getPractitionerActiveTokens(
+    practitionerId: string
+  ): Promise<PractitionerToken[]> {
+    const tokensRef = collection(
+      this.db,
+      `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
+    );
+
+    const q = query(
+      tokensRef,
+      where("status", "==", PractitionerTokenStatus.ACTIVE),
+      where("expiresAt", ">", Timestamp.now())
+    );
+
+    const querySnapshot = await getDocs(q);
+    return querySnapshot.docs.map((doc) => doc.data() as PractitionerToken);
+  }
+
+  /**
+   * Gets a token by its string value and validates it
+   * @param tokenString The token string to find
+   * @returns The token if found and valid, null otherwise
+   */
+  async validateToken(tokenString: string): Promise<PractitionerToken | null> {
+    // We need to search through all practitioners' register_tokens subcollections
+    const practitionersRef = collection(this.db, PRACTITIONERS_COLLECTION);
+    const practitionersSnapshot = await getDocs(practitionersRef);
+
+    for (const practitionerDoc of practitionersSnapshot.docs) {
+      const practitionerId = practitionerDoc.id;
+      const tokensRef = collection(
+        this.db,
+        `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
+      );
+
+      console.log(
+        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
+        {
+          tokenString,
+          timestamp: Timestamp.now().toDate(),
+        }
+      );
+
+      const q = query(
+        tokensRef,
+        where("token", "==", tokenString),
+        where("status", "==", PractitionerTokenStatus.ACTIVE),
+        where("expiresAt", ">", Timestamp.now())
+      );
+
+      try {
+        const tokenSnapshot = await getDocs(q);
+        console.log(
+          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
+          {
+            found: !tokenSnapshot.empty,
+            count: tokenSnapshot.size,
+          }
+        );
+
+        if (!tokenSnapshot.empty) {
+          const tokenData = tokenSnapshot.docs[0].data() as PractitionerToken;
+          console.log(`[PRACTITIONER] Valid token found`, {
+            tokenId: tokenData.id,
+            expiresAt: tokenData.expiresAt.toDate(),
+          });
+          return tokenData;
+        }
+      } catch (error) {
+        console.error(
+          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
+          error
+        );
+        // Re-throw the error to be handled by the caller
+        throw error;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Marks a token as used
+   * @param tokenId ID of the token
+   * @param practitionerId ID of the practitioner
+   * @param userId ID of the user using the token
+   */
+  async markTokenAsUsed(
+    tokenId: string,
+    practitionerId: string,
+    userId: string
+  ): Promise<void> {
+    const tokenRef = doc(
+      this.db,
+      `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}/${tokenId}`
+    );
+
+    await updateDoc(tokenRef, {
+      status: PractitionerTokenStatus.USED,
+      usedBy: userId,
+      usedAt: Timestamp.now(),
+    });
+  }
+
+  /**
+   * Dohvata zdravstvenog radnika po ID-u
+   */
+  async getPractitioner(practitionerId: string): Promise<Practitioner | null> {
+    const practitionerDoc = await getDoc(
+      doc(this.db, PRACTITIONERS_COLLECTION, practitionerId)
+    );
+
+    if (!practitionerDoc.exists()) {
+      return null;
+    }
+
+    return practitionerDoc.data() as Practitioner;
+  }
+
+  /**
+   * Dohvata zdravstvenog radnika po User ID-u
+   */
+  async getPractitionerByUserRef(
+    userRef: string
+  ): Promise<Practitioner | null> {
+    const q = query(
+      collection(this.db, PRACTITIONERS_COLLECTION),
+      where("userRef", "==", userRef)
+    );
+
+    const querySnapshot = await getDocs(q);
+    if (querySnapshot.empty) {
+      return null;
+    }
+
+    return querySnapshot.docs[0].data() as Practitioner;
+  }
+
+  /**
+   * Finds a draft practitioner profile by email address
+   * Used to detect if a draft profile exists when a doctor registers without a token
+   * 
+   * @param email - Email address to search for
+   * @returns Draft practitioner profile if found, null otherwise
+   * 
+   * @remarks
+   * Requires Firestore composite index on:
+   * - Collection: practitioners
+   * - Fields: basicInfo.email (Ascending), status (Ascending), userRef (Ascending)
+   */
+  async findDraftPractitionerByEmail(
+    email: string
+  ): Promise<Practitioner | null> {
+    try {
+      const normalizedEmail = email.toLowerCase().trim();
+      
+      console.log("[PRACTITIONER] Searching for draft practitioner by email", {
+        email: normalizedEmail,
+      });
+
+      const q = query(
+        collection(this.db, PRACTITIONERS_COLLECTION),
+        where("basicInfo.email", "==", normalizedEmail),
+        where("status", "==", PractitionerStatus.DRAFT),
+        where("userRef", "==", ""),
+        limit(1)
+      );
+
+      const querySnapshot = await getDocs(q);
+      
+      if (querySnapshot.empty) {
+        console.log("[PRACTITIONER] No draft practitioner found for email", {
+          email: normalizedEmail,
+        });
+        return null;
+      }
+
+      const draftPractitioner = querySnapshot.docs[0].data() as Practitioner;
+      console.log("[PRACTITIONER] Draft practitioner found", {
+        email: normalizedEmail,
+        practitionerId: draftPractitioner.id,
+      });
+
+      return draftPractitioner;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER] Error finding draft practitioner by email:",
+        error
+      );
+      // If query fails (e.g., index not created), return null to allow registration
+      // This prevents blocking registration if index is missing
+      return null;
+    }
+  }
+
+  /**
+   * Dohvata sve zdravstvene radnike za određenu kliniku sa statusom ACTIVE
+   */
+  async getPractitionersByClinic(clinicId: string): Promise<Practitioner[]> {
+    const q = query(
+      collection(this.db, PRACTITIONERS_COLLECTION),
+      where("clinics", "array-contains", clinicId),
+      where("isActive", "==", true),
+      where("status", "==", PractitionerStatus.ACTIVE)
+    );
+
+    const querySnapshot = await getDocs(q);
+    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
+  }
+
+  /**
+   * Dohvata sve zdravstvene radnike za određenu kliniku
+   */
+  async getAllPractitionersByClinic(clinicId: string): Promise<Practitioner[]> {
+    const q = query(
+      collection(this.db, PRACTITIONERS_COLLECTION),
+      where("clinics", "array-contains", clinicId),
+      where("isActive", "==", true)
+    );
+
+    const querySnapshot = await getDocs(q);
+    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
+  }
+
+  /**
+   * Dohvata sve draft zdravstvene radnike za određenu kliniku sa statusom DRAFT
+   */
+  async getDraftPractitionersByClinic(
+    clinicId: string
+  ): Promise<Practitioner[]> {
+    const q = query(
+      collection(this.db, PRACTITIONERS_COLLECTION),
+      where("clinics", "array-contains", clinicId),
+      where("status", "==", PractitionerStatus.DRAFT)
+    );
+
+    const querySnapshot = await getDocs(q);
+    return querySnapshot.docs.map((doc) => doc.data() as Practitioner);
+  }
+
+  /**
+   * Updates a practitioner
+   */
+  async updatePractitioner(
+    practitionerId: string,
+    data: UpdatePractitionerData
+  ): Promise<Practitioner> {
+    try {
+      // Validate update data
+      const validData = data; // Using the passed data directly as it's already validated by the schema type
+
+      // Get current practitioner data
+      const practitionerRef = doc(
+        this.db,
+        PRACTITIONERS_COLLECTION,
+        practitionerId
+      );
+      const practitionerDoc = await getDoc(practitionerRef);
+
+      if (!practitionerDoc.exists()) {
+        throw new Error(`Practitioner ${practitionerId} not found`);
+      }
+
+      const currentPractitioner = practitionerDoc.data() as Practitioner;
+
+      // Process basicInfo if it's being updated to handle profile photo uploads
+      let processedData: UpdatePractitionerData & { fullNameLower?: string } = {
+        ...validData,
+      };
+      if (validData.basicInfo) {
+        processedData.basicInfo = await this.processBasicInfo(
+          validData.basicInfo as PractitionerBasicInfo & {
+            profileImageUrl?: MediaResource | null;
+          },
+          practitionerId
+        );
+        // Always update fullNameLower when basicInfo changes
+        processedData.fullNameLower =
+          `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
+      }
+
+      // Prepare update data
+      const updateData: any = {
+        ...processedData,
+        updatedAt: serverTimestamp(),
+      };
+
+      // Update practitioner
+      await updateDoc(practitionerRef, updateData);
+
+      // Return updated practitioner
+      const updatedPractitioner = await this.getPractitioner(practitionerId);
+      if (!updatedPractitioner) {
+        throw new Error(
+          `Failed to retrieve updated practitioner ${practitionerId}`
+        );
+      }
+      return updatedPractitioner;
+    } catch (error) {
+      if (error instanceof z.ZodError) {
+        throw new Error(`Invalid practitioner update data: ${error.message}`);
+      }
+      console.error(`Error updating practitioner ${practitionerId}:`, error);
+      throw error;
+    }
+  }
+
+  /**
+   * Adds a clinic to a practitioner
+   */
+  async addClinic(practitionerId: string, clinicId: string): Promise<void> {
+    try {
+      // Get practitioner
+      const practitionerRef = doc(
+        this.db,
+        PRACTITIONERS_COLLECTION,
+        practitionerId
+      );
+      const practitionerDoc = await getDoc(practitionerRef);
+
+      if (!practitionerDoc.exists()) {
+        throw new Error(`Practitioner ${practitionerId} not found`);
+      }
+
+      const practitioner = practitionerDoc.data() as Practitioner;
+
+      // Check if clinic already added
+      if (practitioner.clinics?.includes(clinicId)) {
+        console.log(
+          `Clinic ${clinicId} already added to practitioner ${practitionerId}`
+        );
+        return;
+      }
+
+      // Add clinic to clinics array
+      await updateDoc(practitionerRef, {
+        clinics: arrayUnion(clinicId),
+        updatedAt: serverTimestamp(),
+      });
+    } catch (error) {
+      console.error(
+        `Error adding clinic ${clinicId} to practitioner ${practitionerId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Removes a clinic from a practitioner
+   */
+  async removeClinic(practitionerId: string, clinicId: string): Promise<void> {
+    try {
+      // Get practitioner
+      const practitionerRef = doc(
+        this.db,
+        PRACTITIONERS_COLLECTION,
+        practitionerId
+      );
+      const practitionerDoc = await getDoc(practitionerRef);
+
+      if (!practitionerDoc.exists()) {
+        throw new Error(`Practitioner ${practitionerId} not found`);
+      }
+
+      // Remove clinic from clinics array
+      await updateDoc(practitionerRef, {
+        clinics: arrayRemove(clinicId),
+        updatedAt: serverTimestamp(),
+      });
+    } catch (error) {
+      console.error(
+        `Error removing clinic ${clinicId} from practitioner ${practitionerId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Deaktivira profil zdravstvenog radnika
+   */
+  async deactivatePractitioner(practitionerId: string): Promise<void> {
+    await this.updatePractitioner(practitionerId, {
+      isActive: false,
+    });
+  }
+
+  /**
+   * Aktivira profil zdravstvenog radnika
+   */
+  async activatePractitioner(practitionerId: string): Promise<void> {
+    await this.updatePractitioner(practitionerId, {
+      isActive: true,
+    });
+  }
+
+  /**
+   * Briše profil zdravstvenog radnika
+   */
+  async deletePractitioner(practitionerId: string): Promise<void> {
+    const practitioner = await this.getPractitioner(practitionerId);
+    if (!practitioner) {
+      throw new Error("Practitioner not found");
+    }
+
+    // TODO: Kada implementiramo subkolekcije, ovde ćemo dodati brisanje povezanih podataka
+
+    await deleteDoc(doc(this.db, PRACTITIONERS_COLLECTION, practitionerId));
+  }
+
+  /**
+   * Validates a registration token and claims the associated draft practitioner profile
+   * @param tokenString The token provided by the practitioner
+   * @param userId The ID of the user claiming the profile
+   * @returns The claimed practitioner profile or null if token is invalid
+   */
+  async validateTokenAndClaimProfile(
+    tokenString: string,
+    userId: string
+  ): Promise<Practitioner | null> {
+    // Find the token
+    console.log("[PRACTITIONER] Validating token for claiming profile", {
+      tokenString,
+      userId,
+    });
+
+    const token = await this.validateToken(tokenString);
+
+    if (!token) {
+      console.log(
+        "[PRACTITIONER] Token validation failed - token not found or not valid",
+        {
+          tokenString,
+        }
+      );
+      return null; // Token not found or not valid
+    }
+
+    console.log("[PRACTITIONER] Token successfully validated", {
+      tokenId: token.id,
+      practitionerId: token.practitionerId,
+    });
+
+    // Get the practitioner profile
+    const practitioner = await this.getPractitioner(token.practitionerId);
+    if (!practitioner) {
+      console.log("[PRACTITIONER] Practitioner not found", {
+        practitionerId: token.practitionerId,
+      });
+      return null; // Practitioner not found
+    }
+
+    // Ensure practitioner is in DRAFT status
+    if (practitioner.status !== PractitionerStatus.DRAFT) {
+      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
+        practitionerId: practitioner.id,
+        status: practitioner.status,
+      });
+      throw new Error("This practitioner profile has already been claimed");
+    }
+
+    // Check if user already has a practitioner profile
+    const existingPractitioner = await this.getPractitionerByUserRef(userId);
+    if (existingPractitioner) {
+      throw new Error("User already has a practitioner profile");
+    }
+
+    // Claim the profile by linking it to the user
+    const updatedPractitioner = await this.updatePractitioner(practitioner.id, {
+      userRef: userId,
+      status: PractitionerStatus.ACTIVE,
+    });
+
+    // Mark the token as used
+    await this.markTokenAsUsed(token.id, token.practitionerId, userId);
+
+    console.log("[PRACTITIONER] Profile claimed successfully", {
+      practitionerId: updatedPractitioner.id,
+      userId,
+    });
+
+    return updatedPractitioner;
+  }
+
+  /**
+   * Retrieves all practitioners with optional pagination and draft inclusion
+   *
+   * @param options - Search options
+   * @param options.pagination - Optional limit for number of results per page
+   * @param options.lastDoc - Optional last document for pagination
+   * @param options.includeDraftPractitioners - Whether to include draft practitioners
+   * @returns Array of practitioners and the last document for pagination
+   */
+  async getAllPractitioners(options?: {
+    pagination?: number;
+    lastDoc?: any;
+    includeDraftPractitioners?: boolean;
+  }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
+    try {
+      const constraints = [];
+
+      // Filter by status if not including drafts
+      if (!options?.includeDraftPractitioners) {
+        constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
+      }
+
+      // Add ordering for consistent pagination
+      constraints.push(orderBy("basicInfo.lastName", "asc"));
+      constraints.push(orderBy("basicInfo.firstName", "asc"));
+
+      // Add pagination if specified
+      if (options?.pagination && options.pagination > 0) {
+        if (options.lastDoc) {
+          constraints.push(startAfter(options.lastDoc));
+        }
+        constraints.push(limit(options.pagination));
+      }
+
+      const q = query(
+        collection(this.db, PRACTITIONERS_COLLECTION),
+        ...constraints
+      );
+
+      const querySnapshot = await getDocs(q);
+
+      const practitioners = querySnapshot.docs.map(
+        (doc) => doc.data() as Practitioner
+      );
+
+      // Get last document for pagination
+      const lastDoc =
+        querySnapshot.docs.length > 0
+          ? querySnapshot.docs[querySnapshot.docs.length - 1]
+          : null;
+
+      return {
+        practitioners,
+        lastDoc,
+      };
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error getting all practitioners:",
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Searches and filters practitioners based on multiple criteria
+   *
+   * @param filters - Various filters to apply
+   * @param filters.nameSearch - Optional search text for first/last name
+   * @param filters.certifications - Optional array of certifications to filter by
+   * @param filters.specialties - Optional array of specialties to filter by
+   * @param filters.procedureFamily - Optional procedure family practitioners provide
+   * @param filters.procedureCategory - Optional procedure category practitioners provide
+   * @param filters.procedureSubcategory - Optional procedure subcategory practitioners provide
+   * @param filters.procedureTechnology - Optional procedure technology practitioners provide
+   * @param filters.location - Optional location for distance-based search
+   * @param filters.radiusInKm - Optional radius in kilometers (required if location is provided)
+   * @param filters.minRating - Optional minimum rating (0-5)
+   * @param filters.maxRating - Optional maximum rating (0-5)
+   * @param filters.pagination - Optional number of results per page
+   * @param filters.lastDoc - Optional last document for pagination
+   * @param filters.includeDraftPractitioners - Whether to include draft practitioners
+   * @returns Filtered practitioners and the last document for pagination
+   */
+  async getPractitionersByFilters(filters: {
+    nameSearch?: string;
+    certifications?: string[];
+    specialties?: CertificationSpecialty[];
+    procedureFamily?: string;
+    procedureCategory?: string;
+    procedureSubcategory?: string;
+    procedureTechnology?: string;
+    location?: { latitude: number; longitude: number };
+    radiusInKm?: number;
+    minRating?: number;
+    maxRating?: number;
+    pagination?: number;
+    lastDoc?: any;
+    includeDraftPractitioners?: boolean;
+  }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
+    try {
+      console.log(
+        "[PRACTITIONER_SERVICE] Starting practitioner filtering with fallback strategies"
+      );
+
+      // Geo query debug i validacija
+      if (filters.location && filters.radiusInKm) {
+        console.log("[PRACTITIONER_SERVICE] Executing geo query:", {
+          location: filters.location,
+          radius: filters.radiusInKm,
+          serviceName: "PractitionerService",
+        });
+
+        // Validacija location podataka
+        if (!filters.location.latitude || !filters.location.longitude) {
+          console.warn(
+            "[PRACTITIONER_SERVICE] Invalid location data:",
+            filters.location
+          );
+          filters.location = undefined;
+          filters.radiusInKm = undefined;
+        }
+      }
+
+      // Strategy 1: Try fullNameLower search if nameSearch exists
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        try {
+          console.log(
+            "[PRACTITIONER_SERVICE] Strategy 1: Trying fullNameLower search"
+          );
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          const constraints: any[] = [];
+
+          if (!filters.includeDraftPractitioners) {
+            constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
+          }
+          constraints.push(where("isActive", "==", true));
+          constraints.push(where("fullNameLower", ">=", searchTerm));
+          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));
+            }
+          }
+          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(
+            (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+          );
+          const lastDoc =
+            querySnapshot.docs.length > 0
+              ? querySnapshot.docs[querySnapshot.docs.length - 1]
+              : null;
+
+          console.log(
+            `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
+          );
+
+          // Fix Load More - ako je broj rezultata manji od pagination, nema više
+          if (practitioners.length < (filters.pagination || 10)) {
+            return { practitioners, lastDoc: null };
+          }
+          return { practitioners, lastDoc };
+        } catch (error) {
+          console.log("[PRACTITIONER_SERVICE] Strategy 1 failed:", error);
+        }
+      }
+
+      // Strategy 2: Basic query with createdAt ordering (no name search)
+      try {
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 2: Basic query with createdAt ordering"
+        );
+        const constraints: any[] = [];
+
+        if (!filters.includeDraftPractitioners) {
+          constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
+        }
+        constraints.push(where("isActive", "==", true));
+
+        // Add other filters that work well with Firestore
+        if (filters.certifications && filters.certifications.length > 0) {
+          const certificationsToMatch =
+            filters.certifications as CertificationSpecialty[];
+          constraints.push(
+            where(
+              "certification.specialties",
+              "array-contains-any",
+              certificationsToMatch
+            )
+          );
+        }
+
+        if (filters.minRating !== undefined) {
+          constraints.push(
+            where("reviewInfo.averageRating", ">=", filters.minRating)
+          );
+        }
+        if (filters.maxRating !== undefined) {
+          constraints.push(
+            where("reviewInfo.averageRating", "<=", filters.maxRating)
+          );
+        }
+
+        constraints.push(orderBy("createdAt", "desc"));
+
+        // Pagination sa createdAt - poboljšano za geo queries
+        if (filters.location && filters.radiusInKm) {
+          // Ne koristiti lastDoc za geo queries, već preuzmi više rezultata
+          constraints.push(limit((filters.pagination || 10) * 2)); // Dvostruko više za geo filter
+        } 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));
+        }
+
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
+        const querySnapshot = await getDocs(q);
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
+
+        // Apply geo filter if needed (this is the only in-memory filter we keep)
+        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 distance = distanceBetween(
+                [location.latitude, location.longitude],
+                [clinic.location.latitude, clinic.location.longitude]
+              );
+              const distanceInKm = distance / 1000;
+              return distanceInKm <= radiusInKm;
+            });
+          });
+
+          // Ograniči na pagination broj nakon geo filtera
+          practitioners = practitioners.slice(0, filters.pagination || 10);
+        }
+
+        // Apply all remaining client-side filters using centralized function
+        practitioners = this.applyInMemoryFilters(practitioners, filters);
+
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`
+        );
+
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (practitioners.length < (filters.pagination || 10)) {
+          return { practitioners, lastDoc: null };
+        }
+        return { practitioners, lastDoc };
+      } catch (error) {
+        console.log("[PRACTITIONER_SERVICE] Strategy 2 failed:", error);
+      }
+
+      // Strategy 3: Minimal query fallback
+      try {
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 3: Minimal query fallback"
+        );
+        const constraints: any[] = [
+          where("isActive", "==", true),
+          orderBy("createdAt", "desc"),
+          limit(filters.pagination || 10),
+        ];
+
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
+        const querySnapshot = await getDocs(q);
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
+
+        // Apply all client-side filters using centralized function
+        practitioners = this.applyInMemoryFilters(practitioners, filters);
+
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`
+        );
+
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (practitioners.length < (filters.pagination || 10)) {
+          return { practitioners, lastDoc: null };
+        }
+        return { practitioners, lastDoc };
+      } catch (error) {
+        console.log("[PRACTITIONER_SERVICE] Strategy 3 failed:", error);
+      }
+
+      // Strategy 4: Client-side filtering fallback (kao u procedure/clinic services)
+      try {
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 4: Client-side filtering fallback"
+        );
+
+        const constraints: any[] = [
+          where("isActive", "==", true),
+          where("status", "==", PractitionerStatus.ACTIVE),
+          orderBy("createdAt", "desc"),
+          limit(filters.pagination || 10),
+        ];
+
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
+        const querySnapshot = await getDocs(q);
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
+
+        // Apply all client-side filters using centralized function
+        practitioners = this.applyInMemoryFilters(practitioners, filters);
+
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 4 success: ${practitioners.length} practitioners`
+        );
+
+        // Fix Load More - ako je broj rezultata manji od pagination, nema više
+        if (practitioners.length < (filters.pagination || 10)) {
+          return { practitioners, lastDoc: null };
+        }
+        return { practitioners, lastDoc };
+      } catch (error) {
+        console.log("[PRACTITIONER_SERVICE] Strategy 4 failed:", error);
+      }
+
+      // All strategies failed
+      console.log(
+        "[PRACTITIONER_SERVICE] All strategies failed, returning empty result"
+      );
+      return { practitioners: [], lastDoc: null };
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error filtering practitioners:",
+        error
+      );
+      return { practitioners: [], lastDoc: null };
+    }
+  }
+
+  /**
+   * Applies in-memory filters to practitioners array
+   * Used when Firestore queries fail or for complex filtering
+   */
+  private applyInMemoryFilters(
+    practitioners: Practitioner[],
+    filters: any
+  ): Practitioner[] {
+    let filteredPractitioners = [...practitioners]; // Create copy to avoid mutating original
+
+    // Name search filter
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      const searchTerm = filters.nameSearch.trim().toLowerCase();
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const firstName = (
+          practitioner.basicInfo?.firstName || ""
+        ).toLowerCase();
+        const lastName = (practitioner.basicInfo?.lastName || "").toLowerCase();
+        const fullName = `${firstName} ${lastName}`.trim();
+        const fullNameLower = practitioner.fullNameLower || "";
+
+        return (
+          firstName.includes(searchTerm) ||
+          lastName.includes(searchTerm) ||
+          fullName.includes(searchTerm) ||
+          fullNameLower.includes(searchTerm)
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied name filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Certifications filtering
+    if (filters.certifications && filters.certifications.length > 0) {
+      const certificationsToMatch = filters.certifications;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const practitionerCerts = practitioner.certification?.specialties || [];
+        return certificationsToMatch.some((cert: any) =>
+          practitionerCerts.includes(cert as CertificationSpecialty)
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied certifications filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Specialties filtering
+    if (filters.specialties && filters.specialties.length > 0) {
+      const specialtiesToMatch = filters.specialties;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const practitionerSpecs = practitioner.certification?.specialties || [];
+        return specialtiesToMatch.some((spec: any) =>
+          practitionerSpecs.includes(spec)
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied specialties filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Rating filtering
+    if (filters.minRating !== undefined || filters.maxRating !== undefined) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const rating = practitioner.reviewInfo?.averageRating || 0;
+        if (filters.minRating !== undefined && rating < filters.minRating)
+          return false;
+        if (filters.maxRating !== undefined && rating > filters.maxRating)
+          return false;
+        return true;
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied rating filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Procedure family filtering
+    if (filters.procedureFamily) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some(
+          (proc) => proc.family === filters.procedureFamily
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure family filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Procedure category filtering
+    if (filters.procedureCategory) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some(
+          (proc) => proc.categoryName === filters.procedureCategory
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure category filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Procedure subcategory filtering
+    if (filters.procedureSubcategory) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some(
+          (proc) => proc.subcategoryName === filters.procedureSubcategory
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure subcategory filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Procedure technology filtering
+    if (filters.procedureTechnology) {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const proceduresInfo = practitioner.proceduresInfo || [];
+        return proceduresInfo.some(
+          (proc) => proc.technologyName === filters.procedureTechnology
+        );
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure technology filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    // Geo-radius filter
+    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const clinics = practitioner.clinicsInfo || [];
+        return clinics.some((clinic) => {
+          const distance = distanceBetween(
+            [location.latitude, location.longitude],
+            [clinic.location.latitude, clinic.location.longitude]
+          );
+          const distanceInKm = distance / 1000;
+          return distanceInKm <= radiusInKm;
+        });
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied geo filter, results: ${filteredPractitioners.length}`
+      );
+    }
+
+    return filteredPractitioners;
+  }
+
+  /**
+   * Enables free consultation for a practitioner in a specific clinic
+   * Creates a free consultation procedure with hardcoded parameters
+   * @param practitionerId - ID of the practitioner
+   * @param clinicId - ID of the clinic
+   * @returns The created consultation procedure
+   */
+  async EnableFreeConsultation(
+    practitionerId: string,
+    clinicId: string
+  ): Promise<void> {
+    try {
+      // First, ensure the free consultation infrastructure exists
+      await this.ensureFreeConsultationInfrastructure();
+
+      // Validate that practitioner exists and is active
+      const practitioner = await this.getPractitioner(practitionerId);
+      if (!practitioner) {
+        throw new Error(`Practitioner ${practitionerId} not found`);
+      }
+
+      // No need to check for is practitioner active
+      // if (!practitioner.isActive) {
+      //   throw new Error(`Practitioner ${practitionerId} is not active`);
+      // }
+
+      // Validate that clinic exists
+      const clinic = await this.getClinicService().getClinic(clinicId);
+      if (!clinic) {
+        throw new Error(`Clinic ${clinicId} not found`);
+      }
+
+      // Check if practitioner is associated with this clinic
+      if (!practitioner.clinics.includes(clinicId)) {
+        throw new Error(
+          `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
+        );
+      }
+
+      // Get all procedures for this practitioner (including inactive ones)
+      const [activeProcedures, inactiveProcedures] = await Promise.all([
+        this.getProcedureService().getProceduresByPractitioner(practitionerId),
+        this.getProcedureService().getInactiveProceduresByPractitioner(
+          practitionerId
+        ),
+      ]);
+
+      // Combine active and inactive procedures
+      const allProcedures = [...activeProcedures, ...inactiveProcedures];
+
+      // Check if free consultation already exists (active or inactive)
+      const existingConsultation = allProcedures.find(
+        (procedure) =>
+          procedure.technology.id === "free-consultation-tech" &&
+          procedure.clinicBranchId === clinicId
+      );
+
+      if (existingConsultation) {
+        if (existingConsultation.isActive) {
+          console.log(
+            `Free consultation already active for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        } else {
+          // Reactivate the existing disabled consultation
+          await this.getProcedureService().updateProcedure(
+            existingConsultation.id,
+            { isActive: true }
+          );
+          console.log(
+            `Reactivated existing free consultation for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        }
+      }
+
+      // Create procedure data for free consultation (without productId or productsMetadata)
+      const consultationData: Omit<CreateProcedureData, "productId"> = {
+        name: "Free Consultation",
+        nameLower: "free consultation",
+        description:
+          "Free initial consultation to discuss treatment options and assess patient needs.",
+        family: ProcedureFamily.AESTHETICS,
+        categoryId: "consultation",
+        subcategoryId: "free-consultation",
+        technologyId: "free-consultation-tech",
+        price: 0,
+        currency: Currency.EUR,
+        pricingMeasure: PricingMeasure.PER_SESSION,
+        // productsMetadata omitted - no products needed for consultations
+        duration: 30, // 30 minutes consultation
+        practitionerId: practitionerId,
+        clinicBranchId: clinicId,
+        photos: [], // No photos for consultation
+      };
+
+      // Create the consultation procedure using the special method
+      await this.getProcedureService().createConsultationProcedure(
+        consultationData
+      );
+
+      console.log(
+        `Free consultation enabled for practitioner ${practitionerId} in clinic ${clinicId}`
+      );
+    } catch (error) {
+      console.error(
+        `Error enabling free consultation for practitioner ${practitionerId} in clinic ${clinicId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+   * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+   */
+  async ensureFreeConsultationInfrastructure(): Promise<boolean> {
+    try {
+      console.log(
+        "[PRACTITIONER_SERVICE] Ensuring free consultation infrastructure via HTTP"
+      );
+
+      // Check if user is authenticated
+      const currentUser = this.auth.currentUser;
+      if (!currentUser) {
+        throw new Error(
+          "User must be authenticated to ensure free consultation infrastructure"
+        );
+      }
+
+      // Construct the function URL for the Express app endpoint
+      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/ensureFreeConsultationInfrastructure`;
+
+      // Get the authenticated user's ID token
+      const idToken = await currentUser.getIdToken();
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Making fetch request to ${functionUrl}`
+      );
+
+      // Make the HTTP request
+      const response = await fetch(functionUrl, {
+        method: "POST",
+        mode: "cors",
+        cache: "no-cache",
+        credentials: "omit",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${idToken}`,
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+        body: JSON.stringify({}), // Empty body as no parameters needed
+      });
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Received response ${response.status}: ${response.statusText}`
+      );
+
+      // Check if the request was successful
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error(
+          `[PRACTITIONER_SERVICE] Error response details: ${errorText}`
+        );
+        throw new Error(
+          `Failed to ensure free consultation infrastructure: ${response.status} ${response.statusText} - ${errorText}`
+        );
+      }
+
+      // Parse the response
+      const result = await response.json();
+      console.log(
+        `[PRACTITIONER_SERVICE] Infrastructure check response:`,
+        result
+      );
+
+      if (!result.success) {
+        throw new Error(
+          result.error || "Failed to ensure free consultation infrastructure"
+        );
+      }
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Free consultation infrastructure ensured successfully`
+      );
+
+      return result.infrastructureExists;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error ensuring free consultation infrastructure:",
+        error
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Disables free consultation for a practitioner in a specific clinic
+   * Finds and deactivates the existing free consultation procedure
+   * @param practitionerId - ID of the practitioner
+   * @param clinicId - ID of the clinic
+   */
+  async DisableFreeConsultation(
+    practitionerId: string,
+    clinicId: string
+  ): Promise<void> {
+    try {
+      // Validate that practitioner exists
+      const practitioner = await this.getPractitioner(practitionerId);
+      if (!practitioner) {
+        throw new Error(`Practitioner ${practitionerId} not found`);
+      }
+
+      // Validate that clinic exists
+      const clinic = await this.getClinicService().getClinic(clinicId);
+      if (!clinic) {
+        throw new Error(`Clinic ${clinicId} not found`);
+      }
+
+      // Check if practitioner is associated with this clinic
+      if (!practitioner.clinics.includes(clinicId)) {
+        throw new Error(
+          `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
+        );
+      }
+
+      // Find the free consultation procedure for this practitioner in this clinic
+      // Use the more specific search by technology ID instead of name
+      const existingProcedures =
+        await this.getProcedureService().getProceduresByPractitioner(
+          practitionerId
+        );
+      const freeConsultation = existingProcedures.find(
+        (procedure) =>
+          procedure.technology.id === "free-consultation-tech" &&
+          procedure.clinicBranchId === clinicId &&
+          procedure.isActive
+      );
+
+      if (!freeConsultation) {
+        console.log(
+          `No active free consultation found for practitioner ${practitionerId} in clinic ${clinicId}`
+        );
+        return;
+      }
+
+      // Deactivate the consultation procedure
+      await this.getProcedureService().deactivateProcedure(freeConsultation.id);
+
+      console.log(
+        `Free consultation disabled for practitioner ${practitionerId} in clinic ${clinicId}`
+      );
+    } catch (error) {
+      console.error(
+        `Error disabling free consultation for practitioner ${practitionerId} in clinic ${clinicId}:`,
+        error
+      );
+      throw error;
+    }
+  }
+}