@blackcode_sa/metaestetics-api 1.15.16 → 1.15.17-staging.0

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

@@ -1,2521 +1,2521 @@
-import {
-  collection,
-  doc,
-  getDoc,
-  getDocs,
-  query,
-  where,
-  updateDoc,
-  setDoc,
-  deleteDoc,
-  Timestamp,
-  serverTimestamp,
-  DocumentData,
-  writeBatch,
-  arrayUnion,
-  arrayRemove,
-  FieldValue,
-  orderBy,
-  limit,
-  startAfter,
-  QueryConstraint,
-  documentId,
-} from 'firebase/firestore';
-import { BaseService } from '../base.service';
-import { enforceProcedureLimit } from '../tier-enforcement';
-import {
-  Procedure,
-  CreateProcedureData,
-  UpdateProcedureData,
-  PROCEDURES_COLLECTION,
-  ProcedureSummaryInfo,
-} from '../../types/procedure';
-import { createProcedureSchema, updateProcedureSchema } from '../../validations/procedure.schema';
-import { z } from 'zod';
-import { Auth } from 'firebase/auth';
-import { Firestore } from 'firebase/firestore';
-import { FirebaseApp } from 'firebase/app';
-import { Category, CATEGORIES_COLLECTION } from '../../backoffice/types/category.types';
-import { Subcategory, SUBCATEGORIES_COLLECTION } from '../../backoffice/types/subcategory.types';
-import { Technology, TECHNOLOGIES_COLLECTION } from '../../backoffice/types/technology.types';
-import { Product, PRODUCTS_COLLECTION } from '../../backoffice/types/product.types';
-import { CategoryService } from '../../backoffice/services/category.service';
-import { SubcategoryService } from '../../backoffice/services/subcategory.service';
-import { TechnologyService } from '../../backoffice/services/technology.service';
-import { ProductService } from '../../backoffice/services/product.service';
-import { Practitioner, PRACTITIONERS_COLLECTION } from '../../types/practitioner';
-import {
-  CertificationLevel,
-  CertificationSpecialty,
-  ProcedureFamily,
-  type TreatmentBenefitDynamic,
-} from '../../backoffice/types';
-import { Currency, PricingMeasure } from '../../backoffice/types/static/pricing.types';
-import { Clinic, CLINICS_COLLECTION } from '../../types/clinic';
-import { ProcedureReviewInfo } from '../../types/reviews';
-import { distanceBetween, geohashQueryBounds } from 'geofire-common';
-import { MediaService, MediaAccessLevel } from '../media/media.service';
-import type { ProcedureProduct } from '../../backoffice/types/procedure-product.types';
-
-import { PractitionerService } from '../practitioner/practitioner.service';
-import { PractitionerStatus } from '../../types/practitioner';
-
-export class ProcedureService extends BaseService {
-  private categoryService: CategoryService;
-  private subcategoryService: SubcategoryService;
-  private technologyService: TechnologyService;
-  private productService: ProductService;
-  private mediaService: MediaService;
-  private practitionerService?: PractitionerService;
-
-  constructor(
-    db: Firestore,
-    auth: Auth,
-    app: FirebaseApp,
-    categoryService: CategoryService,
-    subcategoryService: SubcategoryService,
-    technologyService: TechnologyService,
-    productService: ProductService,
-    mediaService: MediaService,
-  ) {
-    super(db, auth, app);
-    this.categoryService = categoryService;
-    this.subcategoryService = subcategoryService;
-    this.technologyService = technologyService;
-    this.productService = productService;
-    this.mediaService = mediaService;
-  }
-
-  setPractitionerService(practitionerService: PractitionerService) {
-    this.practitionerService = practitionerService;
-  }
-
-  /**
-   * Filters out procedures that should not be visible to patients:
-   * 1. Procedures with no practitioner (missing practitionerId)
-   * 2. Procedures where practitioner doesn't exist
-   * 3. Procedures from draft practitioners
-   * 4. Procedures from inactive practitioners (isActive === false)
-   * 
-   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
-   * the procedure is filtered out.
-   * 
-   * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
-   */
-  private async filterDraftPractitionerProcedures(
-    procedures: Procedure[]
-  ): Promise<Procedure[]> {
-    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
-    if (!this.practitionerService || procedures.length === 0) {
-      if (!this.practitionerService) {
-        console.warn('[ProcedureService] practitionerService not available - skipping filtering');
-      }
-      return procedures;
-    }
-
-    try {
-      // First, filter out procedures with no practitionerId
-      const proceduresWithPractitioner = procedures.filter((p) => 
-        p.practitionerId && p.practitionerId.trim() !== ''
-      );
-
-      if (proceduresWithPractitioner.length === 0) {
-        console.log(
-          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
-        );
-        return [];
-      }
-
-      // Get unique practitioner IDs from procedures
-      const practitionerIds = Array.from(
-        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
-      );
-
-      if (practitionerIds.length === 0) {
-        return [];
-      }
-
-      // Fetch all practitioners in parallel
-      const practitionerPromises = practitionerIds.map((id) =>
-        this.practitionerService!.getPractitioner(id).catch(() => null)
-      );
-      const practitioners = await Promise.all(practitionerPromises);
-
-      // Create a map of practitioner ID to practitioner data
-      const practitionerMap = new Map<string, Practitioner>();
-      practitioners.forEach((practitioner, index) => {
-        if (practitioner) {
-          practitionerMap.set(practitionerIds[index], practitioner);
-        }
-      });
-
-      // Filter out procedures that:
-      // 1. Have no practitionerId (already filtered above, but double-check)
-      // 2. Have a practitioner that doesn't exist
-      // 3. Have a practitioner with DRAFT status
-      // 4. Have a practitioner that is not active (isActive === false)
-      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
-        // Check if practitioner exists
-        const practitioner = practitionerMap.get(procedure.practitionerId);
-        
-        if (!practitioner) {
-          console.log(
-            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
-          );
-          return false;
-        }
-
-        // Check if practitioner is DRAFT
-        if (practitioner.status === PractitionerStatus.DRAFT) {
-          console.log(
-            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
-          );
-          return false;
-        }
-
-        // Check if practitioner is active (must be true to show procedure)
-        if (!practitioner.isActive) {
-          console.log(
-            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
-          );
-          return false;
-        }
-
-        return true;
-      });
-
-      const filteredCount = procedures.length - filteredProcedures.length;
-      if (filteredCount > 0) {
-        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
-        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
-        console.log(
-          `[ProcedureService] Filtered out ${filteredCount} procedures: ` +
-          `${noPractitionerCount} with no practitionerId, ` +
-          `${invalidPractitionerCount} with missing/draft/inactive practitioners`
-        );
-      }
-
-      return filteredProcedures;
-    } catch (error) {
-      console.error(
-        '[ProcedureService] Error filtering practitioner procedures:',
-        error
-      );
-      // On error, return original procedures to avoid breaking functionality
-      return procedures;
-    }
-  }
-
-  /**
-   * Process media resource (string URL or File object)
-   * @param media String URL or File object
-   * @param ownerId Owner ID for the media (usually procedureId)
-   * @param collectionName Collection name for organizing files
-   * @returns URL string after processing
-   */
-  private async processMedia(
-    media: string | File | Blob | null | undefined,
-    ownerId: string,
-    collectionName: string,
-  ): Promise<string | null> {
-    if (!media) return null;
-
-    // If already a string URL, return it directly
-    if (typeof media === 'string') {
-      return media;
-    }
-
-    // If it's a File, upload it using MediaService
-    if (media instanceof File || media instanceof Blob) {
-      console.log(`[ProcedureService] Uploading ${collectionName} media for ${ownerId}`);
-      const metadata = await this.mediaService.uploadMedia(
-        media,
-        ownerId,
-        MediaAccessLevel.PUBLIC,
-        collectionName,
-      );
-      return metadata.url;
-    }
-
-    return null;
-  }
-
-  /**
-   * Process array of media resources (strings or Files)
-   * @param mediaArray Array of string URLs or File objects
-   * @param ownerId Owner ID for the media
-   * @param collectionName Collection name for organizing files
-   * @returns Array of URL strings after processing
-   */
-  private async processMediaArray(
-    mediaArray: (string | File | Blob)[] | undefined,
-    ownerId: string,
-    collectionName: string,
-  ): Promise<string[]> {
-    if (!mediaArray || mediaArray.length === 0) return [];
-
-    const result: string[] = [];
-
-    for (const media of mediaArray) {
-      const processedUrl = await this.processMedia(media, ownerId, collectionName);
-      if (processedUrl) {
-        result.push(processedUrl);
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Transforms validated procedure product data (with productId) to ProcedureProduct objects (with full product)
-   * @param productsMetadata Array of validated procedure product data (optional)
-   * @param technologyId Technology ID to fetch products from
-   * @returns Array of ProcedureProduct objects with full product information
-   */
-  private async transformProductsMetadata(
-    productsMetadata: {
-      productId: string;
-      price: number;
-      currency: Currency;
-      pricingMeasure: PricingMeasure;
-      isDefault?: boolean;
-    }[] | undefined,
-    technologyId: string,
-  ): Promise<ProcedureProduct[]> {
-    // Return empty array if no products metadata provided (for product-free procedures like consultations)
-    if (!productsMetadata || productsMetadata.length === 0) {
-      return [];
-    }
-
-    const transformedProducts: ProcedureProduct[] = [];
-
-    for (const productData of productsMetadata) {
-      // Fetch the full product object
-      const product = await this.productService.getById(technologyId, productData.productId);
-      if (!product) {
-        throw new Error(
-          `Product with ID ${productData.productId} not found for technology ${technologyId}`,
-        );
-      }
-
-      // Transform to ProcedureProduct
-      transformedProducts.push({
-        product,
-        price: productData.price,
-        currency: productData.currency,
-        pricingMeasure: productData.pricingMeasure,
-        isDefault: productData.isDefault,
-      });
-    }
-
-    return transformedProducts;
-  }
-
-  /**
-   * Creates a new procedure
-   * @param data - The data for creating a new procedure
-   * @returns The created procedure
-   */
-  async createProcedure(data: CreateProcedureData): Promise<Procedure> {
-    const validatedData = createProcedureSchema.parse(data);
-
-    // Check if this is a product-free procedure (e.g., free consultation)
-    const isProductFree = !validatedData.productId;
-
-    // Generate procedure ID first so we can use it for media uploads
-    const procedureId = this.generateId();
-
-    // Get references to related entities (Category, Subcategory, Technology, and optionally Product)
-    const baseEntitiesPromises: Promise<Category | Subcategory | Technology | Product | null>[] = [
-      this.categoryService.getById(validatedData.categoryId),
-      this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
-      this.technologyService.getById(validatedData.technologyId),
-    ];
-
-    // Only fetch product if productId is provided
-    if (!isProductFree) {
-      baseEntitiesPromises.push(
-        this.productService.getById(validatedData.technologyId, validatedData.productId!)
-      );
-    }
-
-    const results = await Promise.all(baseEntitiesPromises);
-    const category = results[0] as Category | null;
-    const subcategory = results[1] as Subcategory | null;
-    const technology = results[2] as Technology | null;
-    const product = isProductFree ? undefined : ((results[3] as Product | null) || undefined);
-
-    if (!category || !subcategory || !technology) {
-      throw new Error('One or more required base entities not found');
-    }
-
-    // For regular procedures, validate product exists
-    if (!isProductFree && !product) {
-      throw new Error('Product not found for regular procedure');
-    }
-
-    // Get clinic and practitioner information for aggregation
-    const clinicRef = doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId);
-    const clinicSnapshot = await getDoc(clinicRef);
-    if (!clinicSnapshot.exists()) {
-      throw new Error(`Clinic with ID ${validatedData.clinicBranchId} not found`);
-    }
-    const clinic = clinicSnapshot.data() as Clinic; // Assert type
-
-    // Enforce tier limit before creating procedure (per-provider, per-branch)
-    await enforceProcedureLimit(this.db, clinic.clinicGroupId, validatedData.clinicBranchId, validatedData.practitionerId);
-
-    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, validatedData.practitionerId);
-    const practitionerSnapshot = await getDoc(practitionerRef);
-    if (!practitionerSnapshot.exists()) {
-      throw new Error(`Practitioner with ID ${validatedData.practitionerId} not found`);
-    }
-    const practitioner = practitionerSnapshot.data() as Practitioner; // Assert type
-
-    // Check if practitioner already has a procedure with the same technology ID in this clinic branch
-    const existingProceduresQuery = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      where('practitionerId', '==', validatedData.practitionerId),
-      where('clinicBranchId', '==', validatedData.clinicBranchId),
-      where('isActive', '==', true)
-    );
-    const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
-    const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
-    
-    const hasSameTechnology = existingProcedures.some(
-      proc => proc.technology?.id === validatedData.technologyId
-    );
-    if (hasSameTechnology) {
-      throw new Error(
-        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch`
-      );
-    }
-
-    // Process photos if provided
-    let processedPhotos: string[] = [];
-    if (validatedData.photos && validatedData.photos.length > 0) {
-      processedPhotos = await this.processMediaArray(
-        validatedData.photos,
-        procedureId,
-        'procedure-photos',
-      );
-    }
-
-    // If no photos provided and technology has a photoTemplate, use it as default photo
-    if (processedPhotos.length === 0 && technology.photoTemplate) {
-      console.log(`[ProcedureService] Using technology photoTemplate as default photo: ${technology.photoTemplate}`);
-      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
-      if (photoTemplateUrl) {
-        processedPhotos.push(photoTemplateUrl);
-      } else {
-        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
-      }
-    }
-
-    // Transform productsMetadata from validation format to ProcedureProduct format
-    const transformedProductsMetadata = await this.transformProductsMetadata(
-      validatedData.productsMetadata,
-      validatedData.technologyId,
-    );
-
-    // Create aggregated clinic info for the procedure document
-    const clinicInfo = {
-      id: clinicSnapshot.id,
-      name: clinic.name,
-      description: clinic.description || '',
-      featuredPhoto:
-        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? typeof clinic.featuredPhotos[0] === 'string'
-            ? clinic.featuredPhotos[0]
-            : ''
-          : typeof clinic.coverPhoto === 'string'
-          ? clinic.coverPhoto
-          : '',
-      location: clinic.location,
-      contactInfo: clinic.contactInfo,
-    };
-
-    // Create aggregated doctor info for the procedure document
-    const doctorInfo = {
-      id: practitionerSnapshot.id,
-      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
-      description: practitioner.basicInfo.bio || '',
-      photo:
-        typeof practitioner.basicInfo.profileImageUrl === 'string'
-          ? practitioner.basicInfo.profileImageUrl
-          : '', // Default to empty string if not a processed URL
-      rating: practitioner.reviewInfo?.averageRating || 0,
-      services: practitioner.procedures || [],
-    };
-
-    // Create the procedure object
-    const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
-    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
-      id: procedureId,
-      ...validatedDataWithoutProductsMetadata,
-      // Ensure nameLower is always set even if omitted by client
-      nameLower: (validatedData as any).nameLower || validatedData.name.toLowerCase(),
-      photos: processedPhotos,
-      category, // Embed full objects
-      subcategory,
-      technology,
-      ...(product && { product }), // Only include product field if it exists (Firestore doesn't allow undefined)
-      productsMetadata: transformedProductsMetadata, // Use transformed data, not original
-      blockingConditions: technology.blockingConditions,
-      contraindications: technology.contraindications || [],
-      contraindicationIds: technology.contraindications?.map(c => c.id) || [],
-      treatmentBenefits: technology.benefits,
-      treatmentBenefitIds: Array.isArray(technology.benefits) 
-        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
-        : [],
-      preRequirements: technology.requirements.pre,
-      postRequirements: technology.requirements.post,
-      certificationRequirement: technology.certificationRequirement,
-      documentationTemplates: technology?.documentationTemplates || [],
-      clinicInfo, // Embed aggregated info
-      doctorInfo, // Embed aggregated info
-      reviewInfo: {
-        // Default empty reviews
-        totalReviews: 0,
-        averageRating: 0,
-        effectivenessOfTreatment: 0,
-        outcomeExplanation: 0,
-        painManagement: 0,
-        followUpCare: 0,
-        valueForMoney: 0,
-        recommendationPercentage: 0,
-      },
-      isActive: true, // Default to active
-    };
-
-    // 🔥 DEBUG: Find undefined fields before writing to Firestore
-    console.log('🔥🔥🔥 CREATE PROCEDURE - Processing procedure:', procedureId);
-    console.log('🔥🔥🔥 FULL PROCEDURE OBJECT:', JSON.stringify(newProcedure, null, 2));
-    
-    const undefinedFields: string[] = [];
-    Object.entries(newProcedure).forEach(([key, value]) => {
-      if (value === undefined) {
-        undefinedFields.push(key);
-      }
-    });
-    if (undefinedFields.length > 0) {
-      console.error('🔥🔥🔥 UNDEFINED FIELDS DETECTED:', undefinedFields);
-      throw new Error(`Cannot write procedure with undefined fields: ${undefinedFields.join(', ')}`);
-    }
-    console.log('🔥🔥🔥 NO UNDEFINED FIELDS - Proceeding with setDoc');
-
-    // Create the procedure document
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
-    await setDoc(procedureRef, {
-      ...newProcedure,
-      createdAt: serverTimestamp(),
-      updatedAt: serverTimestamp(),
-    });
-
-    // Return the created procedure (fetch again to get server timestamps)
-    const savedDoc = await getDoc(procedureRef);
-    return savedDoc.data() as Procedure;
-  }
-
-  /**
-   * Validates if a practitioner can perform a procedure based on certification requirements.
-   * 
-   * @param procedure - The procedure to check
-   * @param practitioner - The practitioner to validate
-   * @returns true if practitioner can perform the procedure, false otherwise
-   */
-  canPractitionerPerformProcedure(procedure: Procedure, practitioner: Practitioner): boolean {
-    if (!practitioner.certification) {
-      return false;
-    }
-
-    const requiredCert = procedure.certificationRequirement;
-    const practitionerCert = practitioner.certification;
-
-    // Check certification level
-    const levelOrder = [
-      'aesthetician',
-      'nurse_assistant',
-      'nurse',
-      'nurse_practitioner',
-      'physician_assistant',
-      'doctor',
-      'specialist',
-      'plastic_surgeon',
-    ];
-
-    const practitionerLevelIndex = levelOrder.indexOf(practitionerCert.level);
-    const requiredLevelIndex = levelOrder.indexOf(requiredCert.minimumLevel);
-
-    if (practitionerLevelIndex < requiredLevelIndex) {
-      return false;
-    }
-
-    // Check required specialties
-    const requiredSpecialties = requiredCert.requiredSpecialties || [];
-    if (requiredSpecialties.length > 0) {
-      const practitionerSpecialties = practitionerCert.specialties || [];
-      const hasAllRequired = requiredSpecialties.every(specialty =>
-        practitionerSpecialties.includes(specialty)
-      );
-      if (!hasAllRequired) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Clones an existing procedure for a target practitioner.
-   * This creates a new procedure document with the same data as the source procedure,
-   * but linked to the target practitioner.
-   *
-   * @param sourceProcedureId - The ID of the procedure to clone
-   * @param targetPractitionerId - The ID of the practitioner to assign the cloned procedure to
-   * @param overrides - Optional overrides for the new procedure (e.g. price, duration, isActive)
-   * @returns The newly created procedure
-   */
-  async cloneProcedureForPractitioner(
-    sourceProcedureId: string,
-    targetPractitionerId: string,
-    overrides?: Partial<CreateProcedureData> & { isActive?: boolean }
-  ): Promise<Procedure> {
-    // 1. Fetch source procedure
-    const sourceProcedure = await this.getProcedure(sourceProcedureId);
-    if (!sourceProcedure) {
-      throw new Error(`Source procedure with ID ${sourceProcedureId} not found`);
-    }
-
-    // 2. Fetch target practitioner
-    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, targetPractitionerId);
-    const practitionerSnapshot = await getDoc(practitionerRef);
-    if (!practitionerSnapshot.exists()) {
-      throw new Error(`Target practitioner with ID ${targetPractitionerId} not found`);
-    }
-    const practitioner = practitionerSnapshot.data() as Practitioner;
-
-    // 3. Validate certification
-    if (!this.canPractitionerPerformProcedure(sourceProcedure, practitioner)) {
-      throw new Error(
-        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} does not meet the certification requirements for this procedure`
-      );
-    }
-
-    // 4. Check if practitioner already has a procedure with the same technology ID in this clinic branch
-    const existingProceduresQuery = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      where('practitionerId', '==', targetPractitionerId),
-      where('clinicBranchId', '==', sourceProcedure.clinicBranchId),
-      where('isActive', '==', true)
-    );
-    const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
-    const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
-    
-    const hasSameTechnology = existingProcedures.some(
-      proc => proc.technology?.id === sourceProcedure.technology?.id
-    );
-    if (hasSameTechnology) {
-      throw new Error(
-        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${sourceProcedure.technology?.name || sourceProcedure.technology?.id}" in this clinic branch`
-      );
-    }
-
-    // 5. Prepare data for new procedure
-    const newProcedureId = this.generateId();
-
-    // Create aggregated doctor info for the new procedure
-    const doctorInfo = {
-      id: practitioner.id,
-      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
-      description: practitioner.basicInfo.bio || '',
-      photo:
-        typeof practitioner.basicInfo.profileImageUrl === 'string'
-          ? practitioner.basicInfo.profileImageUrl
-          : '',
-      rating: practitioner.reviewInfo?.averageRating || 0,
-      services: practitioner.procedures || [],
-    };
-
-    // Construct the new procedure object
-    // We copy everything from source, but override specific fields
-    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
-      ...sourceProcedure,
-      id: newProcedureId,
-      practitionerId: targetPractitionerId,
-      doctorInfo, // Link to new doctor
-      
-      // Reset review info for the new procedure
-      reviewInfo: {
-        totalReviews: 0,
-        averageRating: 0,
-        effectivenessOfTreatment: 0,
-        outcomeExplanation: 0,
-        painManagement: 0,
-        followUpCare: 0,
-        valueForMoney: 0,
-        recommendationPercentage: 0,
-      },
-
-      // Apply any overrides if provided
-      ...(overrides?.price !== undefined && { price: overrides.price }),
-      ...(overrides?.duration !== undefined && { duration: overrides.duration }),
-      ...(overrides?.description !== undefined && { description: overrides.description }),
-      
-      // Ensure it's active by default unless specified otherwise
-      isActive: overrides?.isActive !== undefined ? overrides.isActive : true,
-    };
-
-    // 6. Save to Firestore
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, newProcedureId);
-    await setDoc(procedureRef, {
-      ...newProcedure,
-      createdAt: serverTimestamp(),
-      updatedAt: serverTimestamp(),
-    });
-
-    // 7. Return the new procedure
-    const savedDoc = await getDoc(procedureRef);
-    return savedDoc.data() as Procedure;
-  }
-
-  /**
-   * Clones an existing procedure for multiple target practitioners.
-   * This creates new procedure documents with the same data as the source procedure,
-   * but linked to each target practitioner.
-   *
-   * @param sourceProcedureId - The ID of the procedure to clone
-   * @param targetPractitionerIds - Array of practitioner IDs to assign the cloned procedure to
-   * @param overrides - Optional overrides for the new procedures (e.g. price, duration, isActive)
-   * @returns Array of newly created procedures
-   */
-  async bulkCloneProcedureForPractitioners(
-    sourceProcedureId: string,
-    targetPractitionerIds: string[],
-    overrides?: Partial<CreateProcedureData> & { isActive?: boolean }
-  ): Promise<Procedure[]> {
-    if (!targetPractitionerIds || targetPractitionerIds.length === 0) {
-      throw new Error('At least one target practitioner ID is required');
-    }
-
-    // 1. Fetch source procedure
-    const sourceProcedure = await this.getProcedure(sourceProcedureId);
-    if (!sourceProcedure) {
-      throw new Error(`Source procedure with ID ${sourceProcedureId} not found`);
-    }
-
-    // 2. Fetch all target practitioners
-    const practitionerPromises = targetPractitionerIds.map(id =>
-      getDoc(doc(this.db, PRACTITIONERS_COLLECTION, id))
-    );
-    const practitionerSnapshots = await Promise.all(practitionerPromises);
-
-    // 3. Validate all practitioners exist, can perform the procedure, and don't already have the same technology
-    const practitioners: Practitioner[] = [];
-    const sourceTechnologyId = sourceProcedure.technology?.id;
-    
-    for (let i = 0; i < practitionerSnapshots.length; i++) {
-      const snapshot = practitionerSnapshots[i];
-      if (!snapshot.exists()) {
-        throw new Error(`Target practitioner with ID ${targetPractitionerIds[i]} not found`);
-      }
-      const practitioner = snapshot.data() as Practitioner;
-      
-      if (!this.canPractitionerPerformProcedure(sourceProcedure, practitioner)) {
-        throw new Error(
-          `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} does not meet the certification requirements for this procedure`
-        );
-      }
-
-      // Check if practitioner already has a procedure with the same technology ID in this clinic branch
-      const existingProceduresQuery = query(
-        collection(this.db, PROCEDURES_COLLECTION),
-        where('practitionerId', '==', practitioner.id),
-        where('clinicBranchId', '==', sourceProcedure.clinicBranchId),
-        where('isActive', '==', true)
-      );
-      const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
-      const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
-      
-      const hasSameTechnology = existingProcedures.some(
-        proc => proc.technology?.id === sourceTechnologyId
-      );
-      if (hasSameTechnology) {
-        throw new Error(
-          `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${sourceProcedure.technology?.name || sourceTechnologyId}" in this clinic branch`
-        );
-      }
-      
-      practitioners.push(practitioner);
-    }
-
-    // 4. Create procedures in batch
-    const batch = writeBatch(this.db);
-    const newProcedures: Omit<Procedure, 'createdAt' | 'updatedAt'>[] = [];
-
-    for (const practitioner of practitioners) {
-      const newProcedureId = this.generateId();
-
-      // Create aggregated doctor info for the new procedure
-      const doctorInfo = {
-        id: practitioner.id,
-        name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
-        description: practitioner.basicInfo.bio || '',
-        photo:
-          typeof practitioner.basicInfo.profileImageUrl === 'string'
-            ? practitioner.basicInfo.profileImageUrl
-            : '',
-        rating: practitioner.reviewInfo?.averageRating || 0,
-        services: practitioner.procedures || [],
-      };
-
-      // Construct the new procedure object
-      const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
-        ...sourceProcedure,
-        id: newProcedureId,
-        practitionerId: practitioner.id,
-        doctorInfo,
-        
-        // Reset review info for the new procedure
-        reviewInfo: {
-          totalReviews: 0,
-          averageRating: 0,
-          effectivenessOfTreatment: 0,
-          outcomeExplanation: 0,
-          painManagement: 0,
-          followUpCare: 0,
-          valueForMoney: 0,
-          recommendationPercentage: 0,
-        },
-
-        // Apply any overrides if provided
-        ...(overrides?.price !== undefined && { price: overrides.price }),
-        ...(overrides?.duration !== undefined && { duration: overrides.duration }),
-        ...(overrides?.description !== undefined && { description: overrides.description }),
-        
-        // Ensure it's active by default unless specified otherwise
-        isActive: overrides?.isActive !== undefined ? overrides.isActive : true,
-      };
-
-      newProcedures.push(newProcedure);
-
-      // Add to batch
-      const procedureRef = doc(this.db, PROCEDURES_COLLECTION, newProcedureId);
-      batch.set(procedureRef, {
-        ...newProcedure,
-        createdAt: serverTimestamp(),
-        updatedAt: serverTimestamp(),
-      });
-    }
-
-    // 5. Commit batch
-    await batch.commit();
-
-    // 6. Fetch and return the created procedures
-    const createdProcedures = await Promise.all(
-      newProcedures.map(p => this.getProcedure(p.id))
-    );
-
-    return createdProcedures.filter((p): p is Procedure => p !== null);
-  }
-
-  /**
-   * Creates multiple procedures for a list of practitioners based on common data.
-   * This method is optimized for bulk creation to reduce database reads and writes.
-   *
-   * @param baseData - The base data for the procedures to be created, omitting the practitionerId.
-   * @param practitionerIds - An array of practitioner IDs for whom the procedures will be created.
-   * @returns A promise that resolves to an array of the newly created procedures.
-   */
-  async bulkCreateProcedures(
-    baseData: Omit<CreateProcedureData, 'practitionerId'>,
-    practitionerIds: string[],
-  ): Promise<Procedure[]> {
-    // 1. Validation
-    if (!practitionerIds || practitionerIds.length === 0) {
-      throw new Error('Practitioner IDs array cannot be empty.');
-    }
-
-    // Check if this is a product-free procedure
-    const isProductFree = !baseData.productId;
-
-    // Add a dummy practitionerId for the validation schema to pass
-    const validationData = { ...baseData, practitionerId: practitionerIds[0] };
-    const validatedData = createProcedureSchema.parse(validationData);
-
-    // 2. Fetch common data once to avoid redundant reads
-    const baseEntitiesPromises: Promise<Category | Subcategory | Technology | Product | null>[] = [
-      this.categoryService.getById(validatedData.categoryId),
-      this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
-      this.technologyService.getById(validatedData.technologyId),
-    ];
-
-    // Only fetch product if productId is provided
-    if (!isProductFree) {
-      baseEntitiesPromises.push(
-        this.productService.getById(validatedData.technologyId, validatedData.productId!)
-      );
-    }
-
-    // Fetch clinic separately to maintain type safety
-    const clinicSnapshotPromise = getDoc(doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId));
-
-    const [baseResults, clinicSnapshot] = await Promise.all([
-      Promise.all(baseEntitiesPromises),
-      clinicSnapshotPromise
-    ]);
-    
-    const category = baseResults[0] as Category | null;
-    const subcategory = baseResults[1] as Subcategory | null;
-    const technology = baseResults[2] as Technology | null;
-    const product = isProductFree ? undefined : ((baseResults[3] as Product | null) || undefined);
-
-    if (!category || !subcategory || !technology) {
-      throw new Error('One or more required base entities not found');
-    }
-    
-    // For regular procedures, validate product exists
-    if (!isProductFree && !product) {
-      throw new Error('Product not found for regular procedure');
-    }
-    
-    if (!clinicSnapshot || !clinicSnapshot.exists()) {
-      throw new Error(`Clinic with ID ${validatedData.clinicBranchId} not found`);
-    }
-    const clinic = clinicSnapshot.data() as Clinic;
-
-    // Enforce tier limit for each practitioner (per-provider, per-branch)
-    for (const practitionerId of practitionerIds) {
-      await enforceProcedureLimit(this.db, clinic.clinicGroupId, validatedData.clinicBranchId, practitionerId);
-    }
-
-    // 3. Handle media uploads once for efficiency
-    let processedPhotos: string[] = [];
-    if (validatedData.photos && validatedData.photos.length > 0) {
-      const batchId = this.generateId(); // Use a single ID for all media in this batch
-      processedPhotos = await this.processMediaArray(
-        validatedData.photos,
-        batchId,
-        'procedure-photos-batch',
-      );
-    }
-
-    // If no photos provided and technology has a photoTemplate, use it as default photo
-    if (processedPhotos.length === 0 && technology.photoTemplate) {
-      console.log(`[ProcedureService] Using technology photoTemplate as default photo for bulk create: ${technology.photoTemplate}`);
-      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
-      if (photoTemplateUrl) {
-        processedPhotos.push(photoTemplateUrl);
-      } else {
-        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
-      }
-    }
-
-    // Transform productsMetadata from validation format to ProcedureProduct format
-    const transformedProductsMetadata = await this.transformProductsMetadata(
-      validatedData.productsMetadata,
-      validatedData.technologyId,
-    );
-
-    // 4. Fetch all practitioner data efficiently
-    const practitionersMap = new Map<string, Practitioner>();
-    // Use 'in' query in chunks of 30, as this is the Firestore limit
-    for (let i = 0; i < practitionerIds.length; i += 30) {
-      const chunk = practitionerIds.slice(i, i + 30);
-      const practitionersQuery = query(
-        collection(this.db, PRACTITIONERS_COLLECTION),
-        where(documentId(), 'in', chunk),
-      );
-      const practitionersSnapshot = await getDocs(practitionersQuery);
-      practitionersSnapshot.docs.forEach(doc => {
-        practitionersMap.set(doc.id, doc.data() as Practitioner);
-      });
-    }
-
-    // Verify all practitioners were found
-    if (practitionersMap.size !== practitionerIds.length) {
-      const foundIds = Array.from(practitionersMap.keys());
-      const notFoundIds = practitionerIds.filter(id => !foundIds.includes(id));
-      throw new Error(`The following practitioners were not found: ${notFoundIds.join(', ')}`);
-    }
-
-    // 5. Check for duplicates across all practitioners before creating any procedures
-    const duplicatePractitioners: string[] = [];
-    const duplicateChecks = await Promise.all(
-      practitionerIds.map(async (practitionerId) => {
-        const existingProceduresQuery = query(
-          collection(this.db, PROCEDURES_COLLECTION),
-          where('practitionerId', '==', practitionerId),
-          where('clinicBranchId', '==', validatedData.clinicBranchId),
-          where('isActive', '==', true)
-        );
-        const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
-        const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
-        
-        const hasSameTechnology = existingProcedures.some(
-          proc => proc.technology?.id === validatedData.technologyId
-        );
-        
-        return { practitionerId, hasSameTechnology };
-      })
-    );
-
-    // Collect all practitioners with duplicates
-    duplicateChecks.forEach(({ practitionerId, hasSameTechnology }) => {
-      if (hasSameTechnology) {
-        duplicatePractitioners.push(practitionerId);
-      }
-    });
-
-    // If any duplicates found, throw error listing all of them
-    if (duplicatePractitioners.length > 0) {
-      const duplicateNames = duplicatePractitioners
-        .map(id => {
-          const practitioner = practitionersMap.get(id)!;
-          return `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`;
-        })
-        .join(', ');
-      
-      throw new Error(
-        `The following practitioner(s) already have a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch: ${duplicateNames}. Please remove them from the selection and try again.`
-      );
-    }
-
-    // 6. Use a Firestore batch for atomic creation
-    const batch = writeBatch(this.db);
-    const createdProcedureIds: string[] = [];
-    const clinicInfo = {
-      id: clinicSnapshot.id,
-      name: clinic.name,
-      description: clinic.description || '',
-      featuredPhoto:
-        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? typeof clinic.featuredPhotos[0] === 'string'
-            ? clinic.featuredPhotos[0]
-            : ''
-          : typeof clinic.coverPhoto === 'string'
-          ? clinic.coverPhoto
-          : '',
-      location: clinic.location,
-      contactInfo: clinic.contactInfo,
-    };
-
-    for (const practitionerId of practitionerIds) {
-      const practitioner = practitionersMap.get(practitionerId)!;
-
-      const doctorInfo = {
-        id: practitioner.id,
-        name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
-        description: practitioner.basicInfo.bio || '',
-        photo:
-          typeof practitioner.basicInfo.profileImageUrl === 'string'
-            ? practitioner.basicInfo.profileImageUrl
-            : '',
-        rating: practitioner.reviewInfo?.averageRating || 0,
-        services: practitioner.procedures || [],
-      };
-
-      const procedureId = this.generateId();
-      createdProcedureIds.push(procedureId);
-      const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
-
-      // Construct the new procedure, reusing common data
-      const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
-      const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
-        id: procedureId,
-        ...validatedDataWithoutProductsMetadata,
-        nameLower: (validatedData as any).nameLower || validatedData.name.toLowerCase(),
-        practitionerId: practitionerId, // Override practitionerId with the correct one
-        photos: processedPhotos,
-        category,
-        subcategory,
-        technology,
-        ...(product && { product }), // Only include product field if it exists (Firestore doesn't allow undefined)
-        productsMetadata: transformedProductsMetadata, // Use transformed data, not original
-        blockingConditions: technology.blockingConditions,
-        contraindications: technology.contraindications || [],
-        contraindicationIds: technology.contraindications?.map(c => c.id) || [],
-        treatmentBenefits: technology.benefits,
-        treatmentBenefitIds: Array.isArray(technology.benefits) 
-        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
-        : [],
-        preRequirements: technology.requirements.pre,
-        postRequirements: technology.requirements.post,
-        certificationRequirement: technology.certificationRequirement,
-        documentationTemplates: technology?.documentationTemplates || [],
-        clinicInfo,
-        doctorInfo, // Set specific doctor info
-        reviewInfo: {
-          totalReviews: 0,
-          averageRating: 0,
-          effectivenessOfTreatment: 0,
-          outcomeExplanation: 0,
-          painManagement: 0,
-          followUpCare: 0,
-          valueForMoney: 0,
-          recommendationPercentage: 0,
-        },
-        isActive: true,
-      };
-
-      // 🔥 DEBUG: Find undefined fields before writing to Firestore
-      console.log('🔥🔥🔥 BULK CREATE - Processing procedure:', procedureId, 'for practitioner:', practitionerId);
-      console.log('🔥🔥🔥 FULL PROCEDURE OBJECT:', JSON.stringify(newProcedure, null, 2));
-      
-      const undefinedFields: string[] = [];
-      Object.entries(newProcedure).forEach(([key, value]) => {
-        if (value === undefined) {
-          undefinedFields.push(key);
-        }
-      });
-      if (undefinedFields.length > 0) {
-        console.error('🔥🔥🔥 UNDEFINED FIELDS DETECTED:', undefinedFields);
-        throw new Error(`Cannot write procedure with undefined fields: ${undefinedFields.join(', ')}`);
-      }
-      console.log('🔥🔥🔥 NO UNDEFINED FIELDS - Proceeding with batch.set');
-
-      batch.set(procedureRef, {
-        ...newProcedure,
-        createdAt: serverTimestamp(),
-        updatedAt: serverTimestamp(),
-      });
-    }
-
-    // 7. Commit the atomic batch write
-    await batch.commit();
-
-    // 8. Fetch and return the newly created procedures
-    const fetchedProcedures: Procedure[] = [];
-    for (let i = 0; i < createdProcedureIds.length; i += 30) {
-      const chunk = createdProcedureIds.slice(i, i + 30);
-      const q = query(collection(this.db, PROCEDURES_COLLECTION), where(documentId(), 'in', chunk));
-      const snapshot = await getDocs(q);
-      snapshot.forEach(doc => {
-        fetchedProcedures.push(doc.data() as Procedure);
-      });
-    }
-
-    return fetchedProcedures;
-  }
-
-  /**
-   * Gets a procedure by ID
-   * @param id - The ID of the procedure to get
-   * @returns The procedure if found, null otherwise
-   */
-  async getProcedure(id: string): Promise<Procedure | null> {
-    const docRef = doc(this.db, PROCEDURES_COLLECTION, id);
-    const docSnap = await getDoc(docRef);
-
-    if (!docSnap.exists()) {
-      return null;
-    }
-
-    return docSnap.data() as Procedure;
-  }
-
-  /**
-   * Gets all procedures for a clinic branch
-   * @param clinicBranchId - The ID of the clinic branch
-   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status (default: false for admin views)
-   * @returns List of procedures
-   */
-  async getProceduresByClinicBranch(
-    clinicBranchId: string,
-    excludeDraftPractitioners: boolean = false
-  ): Promise<Procedure[]> {
-    const q = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      where('clinicBranchId', '==', clinicBranchId),
-      where('isActive', '==', true),
-    );
-    const snapshot = await getDocs(q);
-    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
-    
-    // Filter out procedures from draft practitioners only if explicitly requested (for patient-facing apps)
-    if (excludeDraftPractitioners) {
-      return await this.filterDraftPractitionerProcedures(procedures);
-    }
-    
-    return procedures;
-  }
-
-  /**
-   * Gets all procedures for a practitioner
-   * @param practitionerId - The ID of the practitioner
-   * @param clinicBranchId - Optional clinic branch ID to filter by
-   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status
-   * @returns List of procedures
-   */
-  async getProceduresByPractitioner(
-    practitionerId: string, 
-    clinicBranchId?: string,
-    excludeDraftPractitioners: boolean = true
-  ): Promise<Procedure[]> {
-    const constraints: QueryConstraint[] = [
-      where('practitionerId', '==', practitionerId),
-      where('isActive', '==', true),
-    ];
-    
-    if (clinicBranchId) {
-      constraints.push(where('clinicBranchId', '==', clinicBranchId));
-    }
-    
-    const q = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      ...constraints
-    );
-    const snapshot = await getDocs(q);
-    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
-
-    // If we need to exclude draft practitioners and have the service available
-    if (excludeDraftPractitioners && this.practitionerService) {
-      try {
-        const practitioner = await this.practitionerService.getPractitioner(practitionerId);
-        if (practitioner && practitioner.status === PractitionerStatus.DRAFT) {
-          console.log(`[ProcedureService] Excluding procedures for draft practitioner ${practitionerId}`);
-          return [];
-        }
-      } catch (error) {
-        console.error(`[ProcedureService] Error checking practitioner status for ${practitionerId}:`, error);
-        // On error, default to returning procedures to avoid breaking UI
-      }
-    }
-
-    return procedures;
-  }
-
-  /**
-   * Gets all inactive procedures for a practitioner
-   * @param practitionerId - The ID of the practitioner
-   * @returns List of inactive procedures
-   */
-  async getInactiveProceduresByPractitioner(practitionerId: string): Promise<Procedure[]> {
-    const q = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      where('practitionerId', '==', practitionerId),
-      where('isActive', '==', false),
-    );
-    const snapshot = await getDocs(q);
-    return snapshot.docs.map(doc => doc.data() as Procedure);
-  }
-
-  /**
-   * Updates a procedure
-   * @param id - The ID of the procedure to update
-   * @param data - The data to update the procedure with
-   * @returns The updated procedure
-   */
-  async updateProcedure(id: string, data: UpdateProcedureData): Promise<Procedure> {
-    const validatedData = updateProcedureSchema.parse(data);
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
-    const procedureSnapshot = await getDoc(procedureRef);
-
-    if (!procedureSnapshot.exists()) {
-      throw new Error(`Procedure with ID ${id} not found`);
-    }
-
-    const existingProcedure = procedureSnapshot.data() as Procedure;
-    let updatedProcedureData: Partial<Procedure> = {};
-
-    // Copy validated simple fields
-    if (validatedData.name !== undefined) updatedProcedureData.name = validatedData.name;
-    if (validatedData.description !== undefined)
-      updatedProcedureData.description = validatedData.description;
-    if (validatedData.price !== undefined) updatedProcedureData.price = validatedData.price;
-    if (validatedData.currency !== undefined)
-      updatedProcedureData.currency = validatedData.currency;
-    if (validatedData.pricingMeasure !== undefined)
-      updatedProcedureData.pricingMeasure = validatedData.pricingMeasure;
-    if (validatedData.duration !== undefined)
-      updatedProcedureData.duration = validatedData.duration;
-    if (validatedData.isActive !== undefined)
-      updatedProcedureData.isActive = validatedData.isActive;
-
-    let practitionerChanged = false;
-    let clinicChanged = false;
-    const oldPractitionerId = existingProcedure.practitionerId;
-    const oldClinicId = existingProcedure.clinicBranchId;
-    let newPractitioner: Practitioner | null = null;
-    let newClinic: Clinic | null = null;
-
-    // Process photos if provided
-    if (validatedData.photos !== undefined) {
-      updatedProcedureData.photos = await this.processMediaArray(
-        validatedData.photos,
-        id,
-        'procedure-photos',
-      );
-    }
-
-    // Transform productsMetadata if provided
-    if (validatedData.productsMetadata !== undefined) {
-      const technologyId = validatedData.technologyId ?? existingProcedure.technology.id;
-      if (!technologyId) {
-        throw new Error('Technology ID is required for updating products metadata');
-      }
-      updatedProcedureData.productsMetadata = await this.transformProductsMetadata(
-        validatedData.productsMetadata,
-        technologyId,
-      );
-    }
-
-    // --- Prepare updates and fetch new related data if IDs change ---
-
-    // Handle Practitioner Change
-    if (validatedData.practitionerId && validatedData.practitionerId !== oldPractitionerId) {
-      practitionerChanged = true;
-      const newPractitionerRef = doc(
-        this.db,
-        PRACTITIONERS_COLLECTION,
-        validatedData.practitionerId,
-      );
-      const newPractitionerSnap = await getDoc(newPractitionerRef);
-      if (!newPractitionerSnap.exists())
-        throw new Error(`New Practitioner ${validatedData.practitionerId} not found`);
-      newPractitioner = newPractitionerSnap.data() as Practitioner;
-      // Update doctorInfo within the procedure document
-      updatedProcedureData.doctorInfo = {
-        id: newPractitioner.id,
-        name: `${newPractitioner.basicInfo.firstName} ${newPractitioner.basicInfo.lastName}`,
-        description: newPractitioner.basicInfo.bio || '',
-        photo:
-          typeof newPractitioner.basicInfo.profileImageUrl === 'string'
-            ? newPractitioner.basicInfo.profileImageUrl
-            : '', // Default to empty string if not a processed URL
-        rating: newPractitioner.reviewInfo?.averageRating || 0,
-        services: newPractitioner.procedures || [],
-      };
-    }
-
-    // Handle Clinic Change
-    if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
-      clinicChanged = true;
-      const newClinicRef = doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId);
-      const newClinicSnap = await getDoc(newClinicRef);
-      if (!newClinicSnap.exists())
-        throw new Error(`New Clinic ${validatedData.clinicBranchId} not found`);
-      newClinic = newClinicSnap.data() as Clinic;
-      // Update clinicInfo within the procedure document
-      updatedProcedureData.clinicInfo = {
-        id: newClinic.id,
-        name: newClinic.name,
-        description: newClinic.description || '',
-        featuredPhoto:
-          newClinic.featuredPhotos && newClinic.featuredPhotos.length > 0
-            ? typeof newClinic.featuredPhotos[0] === 'string'
-              ? newClinic.featuredPhotos[0]
-              : ''
-            : typeof newClinic.coverPhoto === 'string'
-            ? newClinic.coverPhoto
-            : '',
-        location: newClinic.location,
-        contactInfo: newClinic.contactInfo,
-      };
-    }
-
-    // Handle Category/Subcategory/Technology/Product Changes
-    let finalCategoryId = existingProcedure.category.id;
-    if (validatedData.name) {
-      updatedProcedureData.nameLower = validatedData.name.toLowerCase();
-    }
-    if (validatedData.categoryId) {
-      const category = await this.categoryService.getById(validatedData.categoryId);
-      if (!category) throw new Error(`Category ${validatedData.categoryId} not found`);
-      updatedProcedureData.category = category;
-      finalCategoryId = category.id; // Update finalCategoryId if category changed
-    }
-
-    // Only fetch subcategory if its ID is provided AND we have a valid finalCategoryId
-    if (validatedData.subcategoryId && finalCategoryId) {
-      const subcategory = await this.subcategoryService.getById(
-        finalCategoryId,
-        validatedData.subcategoryId,
-      );
-      if (!subcategory)
-        throw new Error(
-          `Subcategory ${validatedData.subcategoryId} not found for category ${finalCategoryId}`,
-        );
-      updatedProcedureData.subcategory = subcategory;
-    } else if (validatedData.subcategoryId) {
-      console.warn('Attempted to update subcategory without a valid categoryId');
-    }
-
-    let finalTechnologyId = existingProcedure.technology.id;
-    if (validatedData.technologyId) {
-      const technology = await this.technologyService.getById(validatedData.technologyId);
-      if (!technology) throw new Error(`Technology ${validatedData.technologyId} not found`);
-      updatedProcedureData.technology = technology;
-      finalTechnologyId = technology.id; // Update finalTechnologyId if technology changed
-      // Update related fields derived from technology
-      updatedProcedureData.blockingConditions = technology.blockingConditions;
-      updatedProcedureData.contraindications = technology.contraindications || [];
-      updatedProcedureData.contraindicationIds = technology.contraindications?.map(c => c.id) || [];
-      updatedProcedureData.treatmentBenefits = technology.benefits;
-      updatedProcedureData.treatmentBenefitIds = Array.isArray(technology.benefits)
-        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
-        : [];
-      updatedProcedureData.preRequirements = technology.requirements.pre;
-      updatedProcedureData.postRequirements = technology.requirements.post;
-      updatedProcedureData.certificationRequirement = technology.certificationRequirement;
-      updatedProcedureData.documentationTemplates = technology.documentationTemplates || [];
-    }
-
-    // Only fetch product if its ID is provided AND we have a valid finalTechnologyId
-    if (validatedData.productId && finalTechnologyId) {
-      const product = await this.productService.getById(finalTechnologyId, validatedData.productId);
-      if (!product)
-        throw new Error(
-          `Product ${validatedData.productId} not found for technology ${finalTechnologyId}`,
-        );
-      updatedProcedureData.product = product;
-    } else if (validatedData.productId) {
-      console.warn('Attempted to update product without a valid technologyId');
-    }
-
-    // Update the procedure document
-    await updateDoc(procedureRef, {
-      ...updatedProcedureData,
-      updatedAt: serverTimestamp(),
-    });
-
-    // Return the updated procedure
-    const updatedSnapshot = await getDoc(procedureRef);
-    return updatedSnapshot.data() as Procedure;
-  }
-
-  /**
-   * Deactivates a procedure (soft delete)
-   * @param id - The ID of the procedure to deactivate
-   */
-  async deactivateProcedure(id: string): Promise<void> {
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
-    const procedureSnap = await getDoc(procedureRef);
-    if (!procedureSnap.exists()) {
-      console.warn(`Procedure ${id} not found for deactivation.`);
-      return;
-    }
-
-    // Mark procedure as inactive
-    await updateDoc(procedureRef, {
-      isActive: false,
-      updatedAt: serverTimestamp(),
-    });
-  }
-
-  /**
-   * Deletes a procedure permanently
-   * @param id - The ID of the procedure to delete
-   * @returns A boolean indicating if the deletion was successful
-   */
-  async deleteProcedure(id: string): Promise<boolean> {
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
-    const procedureSnapshot = await getDoc(procedureRef);
-
-    if (!procedureSnapshot.exists()) {
-      // Already deleted or never existed
-      return false;
-    }
-
-    // Delete the procedure document
-    await deleteDoc(procedureRef);
-    return true;
-  }
-
-  /**
-   * Gets all procedures that a practitioner is certified to perform
-   * @param practitioner - The practitioner's profile
-   * @returns Object containing allowed technologies, families, categories, subcategories
-   */
-  async getAllowedTechnologies(practitioner: Practitioner): Promise<{
-    technologies: Technology[];
-    families: ProcedureFamily[];
-    categories: string[];
-    subcategories: string[];
-  }> {
-    // This logic depends on TechnologyService and remains valid
-    const { technologies, families, categories, subcategories } =
-      await this.technologyService.getAllowedTechnologies(practitioner);
-
-    return {
-      technologies,
-      families,
-      categories,
-      subcategories,
-    };
-  }
-
-  /**
-   * Gets all procedures with optional pagination
-   *
-   * @param pagination - Optional number of procedures per page (0 or undefined returns all)
-   * @param lastDoc - Optional last document for pagination (if continuing from a previous page)
-   * @param excludeDraftPractitioners - Whether to exclude procedures from draft practitioners (default: true)
-   * @returns Object containing procedures array and the last document for pagination
-   */
-  async getAllProcedures(
-    pagination?: number,
-    lastDoc?: any,
-    excludeDraftPractitioners: boolean = true,
-  ): Promise<{ procedures: Procedure[]; lastDoc: any }> {
-    try {
-      const proceduresCollection = collection(this.db, PROCEDURES_COLLECTION);
-      let proceduresQuery = query(proceduresCollection);
-
-      // Apply pagination if specified
-      if (pagination && pagination > 0) {
-        const { limit, startAfter } = await import('firebase/firestore'); // Use dynamic import if needed top-level
-
-        if (lastDoc) {
-          proceduresQuery = query(
-            proceduresCollection,
-            orderBy('name'), // Use imported orderBy
-            startAfter(lastDoc),
-            limit(pagination),
-          );
-        } else {
-          proceduresQuery = query(proceduresCollection, orderBy('name'), limit(pagination)); // Use imported orderBy
-        }
-      } else {
-        proceduresQuery = query(proceduresCollection, orderBy('name')); // Use imported orderBy
-      }
-
-      const proceduresSnapshot = await getDocs(proceduresQuery);
-
-      let procedures = proceduresSnapshot.docs.map(doc => {
-        const data = doc.data() as Procedure;
-        return {
-          ...data,
-          id: doc.id, // Ensure ID is present
-        };
-      });
-
-      // Filter out procedures from draft practitioners if requested
-      if (excludeDraftPractitioners) {
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
-      }
-
-      // Fix lastDoc - if we got fewer documents from Firestore than requested, no more pages
-      const lastDocForPagination = 
-        pagination && pagination > 0 && proceduresSnapshot.docs.length < pagination
-          ? null
-          : proceduresSnapshot.docs.length > 0
-          ? proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1]
-          : null;
-
-      return {
-        procedures,
-        lastDoc: lastDocForPagination,
-      };
-    } catch (error) {
-      console.error('[PROCEDURE_SERVICE] Error getting all procedures:', error);
-      throw error;
-    }
-  }
-
-  /**
-   * Creates a serializable cursor from a DocumentSnapshot or returns the cursor values.
-   * This format can be passed through React Native state/Redux without losing data.
-   *
-   * @param doc - The Firestore DocumentSnapshot
-   * @param orderByField - The field used in orderBy clause
-   * @returns Serializable cursor object with values needed for startAfter
-   */
-  private createSerializableCursor(
-    doc: any,
-    orderByField: string = 'createdAt',
-  ): { __cursor: true; values: any[]; id: string; orderByField: string } | null {
-    if (!doc) return null;
-
-    const data = typeof doc.data === 'function' ? doc.data() : doc;
-    const docId = doc.id || data?.id;
-
-    if (!docId) return null;
-
-    // Get the value of the orderBy field
-    let orderByValue = data?.[orderByField];
-
-    // Handle Firestore Timestamp
-    if (orderByValue && typeof orderByValue.toDate === 'function') {
-      orderByValue = orderByValue.toMillis();
-    } else if (orderByValue && orderByValue.seconds) {
-      // Serialized Timestamp
-      orderByValue = orderByValue.seconds * 1000 + (orderByValue.nanoseconds || 0) / 1000000;
-    }
-
-    return {
-      __cursor: true,
-      values: [orderByValue],
-      id: docId,
-      orderByField,
-    };
-  }
-
-  /**
-   * Converts a serializable cursor back to values for startAfter.
-   * Handles both native DocumentSnapshots and serialized cursor objects.
-   *
-   * @param lastDoc - Either a DocumentSnapshot or a serializable cursor object
-   * @param orderByField - The field used in orderBy clause (for validation)
-   * @returns Values to spread into startAfter, or null if invalid
-   */
-  private getCursorValuesForStartAfter(
-    lastDoc: any,
-    orderByField: string = 'createdAt',
-  ): any[] | null {
-    if (!lastDoc) return null;
-
-    // If it's a native DocumentSnapshot with data() method
-    if (typeof lastDoc.data === 'function') {
-      return [lastDoc];
-    }
-
-    // If it's our serializable cursor format
-    if (lastDoc.__cursor && Array.isArray(lastDoc.values)) {
-      // Reconstruct Timestamp if needed for createdAt
-      if (orderByField === 'createdAt' && typeof lastDoc.values[0] === 'number') {
-        const timestamp = Timestamp.fromMillis(lastDoc.values[0]);
-        return [timestamp];
-      }
-      return lastDoc.values;
-    }
-
-    // If it's an array of values directly
-    if (Array.isArray(lastDoc)) {
-      return lastDoc;
-    }
-
-    // Fallback: try to use the object's orderByField value
-    if (lastDoc[orderByField]) {
-      let value = lastDoc[orderByField];
-      if (typeof value === 'number' && orderByField === 'createdAt') {
-        value = Timestamp.fromMillis(value);
-      } else if (value.seconds && orderByField === 'createdAt') {
-        value = new Timestamp(value.seconds, value.nanoseconds || 0);
-      }
-      return [value];
-    }
-
-    console.warn('[PROCEDURE_SERVICE] Could not parse lastDoc cursor:', typeof lastDoc);
-    return null;
-  }
-
-  /**
-   * Searches and filters procedures based on multiple criteria
-   *
-   * @note Frontend can now send either a DocumentSnapshot or a serializable cursor object.
-   * The serializable cursor format is: { __cursor: true, values: [...], id: string, orderByField: string }
-   *
-   * @param filters - Various filters to apply
-   * @param filters.nameSearch - Optional search text for procedure name
-   * @param filters.treatmentBenefitIds - Optional array of treatment benefits to filter by
-   * @param filters.procedureFamily - Optional procedure family to filter by
-   * @param filters.procedureCategory - Optional procedure category to filter by
-   * @param filters.procedureSubcategory - Optional procedure subcategory to filter by
-   * @param filters.procedureTechnology - Optional procedure technology to filter by
-   * @param filters.location - Optional location for distance-based search
-   * @param filters.radiusInKm - Optional radius in kilometers (required if location is provided)
-   * @param filters.minPrice - Optional minimum price
-   * @param filters.maxPrice - Optional maximum price
-   * @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.isActive - Optional filter for active procedures only
-   * @returns Filtered procedures and the last document for pagination
-   */
-  async getProceduresByFilters(filters: {
-    nameSearch?: string;
-    treatmentBenefits?: string[];
-    procedureFamily?: ProcedureFamily;
-    procedureCategory?: string;
-    procedureSubcategory?: string;
-    procedureTechnology?: string;
-    location?: { latitude: number; longitude: number };
-    radiusInKm?: number;
-    minPrice?: number;
-    maxPrice?: number;
-    minRating?: number;
-    maxRating?: number;
-    pagination?: number;
-    lastDoc?: any;
-    isActive?: boolean;
-    practitionerId?: string;
-    clinicId?: string;
-    excludeDraftPractitioners?: boolean;
-  }): Promise<{
-    procedures: (Procedure & { distance?: number })[];
-    lastDoc: any;
-  }> {
-    try {
-      console.log('[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies');
-      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners)
-
-      // Geo query debug i validacija
-      if (filters.location && filters.radiusInKm) {
-        console.log('[PROCEDURE_SERVICE] Executing geo query:', {
-          location: filters.location,
-          radius: filters.radiusInKm,
-          serviceName: 'ProcedureService',
-        });
-
-        // Validacija location podataka
-        if (!filters.location.latitude || !filters.location.longitude) {
-          console.warn('[PROCEDURE_SERVICE] Invalid location data:', filters.location);
-          filters.location = undefined;
-          filters.radiusInKm = undefined;
-        }
-      }
-
-      // Handle geo queries separately (they work differently)
-      const isGeoQuery = filters.location && filters.radiusInKm && filters.radiusInKm > 0;
-      if (isGeoQuery) {
-        return this.handleGeoQuery(filters);
-      }
-
-      // Base constraints (used in all strategies)
-      const getBaseConstraints = () => {
-        const constraints: QueryConstraint[] = [];
-
-        // Active status filter
-        if (filters.isActive !== undefined) {
-          constraints.push(where('isActive', '==', filters.isActive));
-        } else {
-          constraints.push(where('isActive', '==', true));
-        }
-
-        // Filter constraints
-        if (filters.procedureFamily) {
-          constraints.push(where('family', '==', filters.procedureFamily));
-        }
-        if (filters.procedureCategory) {
-          constraints.push(where('category.id', '==', filters.procedureCategory));
-        }
-        if (filters.procedureSubcategory) {
-          constraints.push(where('subcategory.id', '==', filters.procedureSubcategory));
-        }
-        if (filters.procedureTechnology) {
-          constraints.push(where('technology.id', '==', filters.procedureTechnology));
-        }
-        if (filters.practitionerId) {
-          constraints.push(where('practitionerId', '==', filters.practitionerId));
-        }
-        if (filters.clinicId) {
-          constraints.push(where('clinicBranchId', '==', filters.clinicId));
-        }
-        if (filters.minPrice !== undefined) {
-          constraints.push(where('price', '>=', filters.minPrice));
-        }
-        if (filters.maxPrice !== undefined) {
-          constraints.push(where('price', '<=', filters.maxPrice));
-        }
-        if (filters.minRating !== undefined) {
-          constraints.push(where('reviewInfo.averageRating', '>=', filters.minRating));
-        }
-        if (filters.maxRating !== undefined) {
-          constraints.push(where('reviewInfo.averageRating', '<=', filters.maxRating));
-        }
-        if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
-          const benefitIdsToMatch = filters.treatmentBenefits;
-          constraints.push(where('treatmentBenefitIds', 'array-contains-any', benefitIdsToMatch));
-        }
-
-        return constraints;
-      };
-
-      // Strategy 1: Try nameLower search if nameSearch exists
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        try {
-          console.log('[PROCEDURE_SERVICE] Strategy 1: Trying nameLower search');
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          const constraints = getBaseConstraints();
-          
-          // Check if we have nested field filters that might conflict with orderBy
-          const hasNestedFilters = !!(filters.procedureTechnology || filters.procedureCategory || filters.procedureSubcategory);
-          
-          if (hasNestedFilters) {
-            console.log('[PROCEDURE_SERVICE] Strategy 1: Has nested filters, will apply client-side after query');
-          }
-          
-          constraints.push(where('nameLower', '>=', searchTerm));
-          constraints.push(where('nameLower', '<=', searchTerm + '\uf8ff'));
-          constraints.push(orderBy('nameLower'));
-
-          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
-          if (filters.lastDoc) {
-            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'nameLower');
-            if (cursorValues) {
-              constraints.push(startAfter(...cursorValues));
-              console.log('[PROCEDURE_SERVICE] Strategy 1: Using cursor for pagination');
-            }
-          }
-          constraints.push(limit(filters.pagination || 10));
-
-          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-          const querySnapshot = await getDocs(q);
-          let procedures = querySnapshot.docs.map(
-            doc => ({ ...doc.data(), id: doc.id } as Procedure),
-          );
-          
-          // Apply client-side filters for nested fields if needed
-          if (hasNestedFilters) {
-            procedures = this.applyInMemoryFilters(procedures, filters);
-          }
-          
-          // Filter out procedures from draft practitioners if requested
-          if (filters.excludeDraftPractitioners) {
-            procedures = await this.filterDraftPractitionerProcedures(procedures);
-          }
-          
-          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
-
-          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
-          if (querySnapshot.docs.length < (filters.pagination || 10)) {
-            return { procedures, lastDoc: null };
-          }
-          
-          // Return serializable cursor for pagination
-          const lastDocSnapshot = querySnapshot.docs.length > 0
-            ? querySnapshot.docs[querySnapshot.docs.length - 1]
-            : null;
-          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'nameLower');
-          
-          return { procedures, lastDoc: serializableCursor };
-        } catch (error) {
-          console.log('[PROCEDURE_SERVICE] Strategy 1 failed:', error);
-        }
-      }
-
-      // Strategy 2: Try name field search as fallback
-      if (filters.nameSearch && filters.nameSearch.trim()) {
-        try {
-          console.log('[PROCEDURE_SERVICE] Strategy 2: Trying name field search');
-          const searchTerm = filters.nameSearch.trim().toLowerCase();
-          const constraints = getBaseConstraints();
-          
-          // Check if we have nested field filters that might conflict with orderBy
-          const hasNestedFilters = !!(filters.procedureTechnology || filters.procedureCategory || filters.procedureSubcategory);
-          
-          if (hasNestedFilters) {
-            console.log('[PROCEDURE_SERVICE] Strategy 2: Has nested filters, will apply client-side after query');
-          }
-          
-          constraints.push(where('name', '>=', searchTerm));
-          constraints.push(where('name', '<=', searchTerm + '\uf8ff'));
-          constraints.push(orderBy('name'));
-
-          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
-          if (filters.lastDoc) {
-            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'name');
-            if (cursorValues) {
-              constraints.push(startAfter(...cursorValues));
-              console.log('[PROCEDURE_SERVICE] Strategy 2: Using cursor for pagination');
-            }
-          }
-          constraints.push(limit(filters.pagination || 10));
-
-          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-          const querySnapshot = await getDocs(q);
-          let procedures = querySnapshot.docs.map(
-            doc => ({ ...doc.data(), id: doc.id } as Procedure),
-          );
-          
-          // Apply client-side filters for nested fields if needed
-          if (hasNestedFilters) {
-            procedures = this.applyInMemoryFilters(procedures, filters);
-          }
-          
-          // Filter out procedures from draft practitioners
-          if(filters.excludeDraftPractitioners){
-            procedures = await this.filterDraftPractitionerProcedures(procedures);
-          }
-          
-          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
-
-          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
-          if (querySnapshot.docs.length < (filters.pagination || 10)) {
-            return { procedures, lastDoc: null };
-          }
-          
-          // Return serializable cursor for pagination
-          const lastDocSnapshot = querySnapshot.docs.length > 0
-            ? querySnapshot.docs[querySnapshot.docs.length - 1]
-            : null;
-          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'name');
-          
-          return { procedures, lastDoc: serializableCursor };
-        } catch (error) {
-          console.log('[PROCEDURE_SERVICE] Strategy 2 failed:', error);
-        }
-      }
-
-      // Strategy 3: orderBy createdAt with client-side filtering
-      // NOTE: This strategy excludes nested field filters (technology.id, category.id, subcategory.id)
-      // from Firestore query because Firestore doesn't support orderBy on different field
-      // when using where on nested fields without a composite index.
-      // These filters are applied client-side instead.
-      try {
-        console.log(
-          '[PROCEDURE_SERVICE] Strategy 3: Using createdAt orderBy with client-side filtering',
-          {
-            procedureTechnology: filters.procedureTechnology,
-            hasTechnologyFilter: !!filters.procedureTechnology,
-          },
-        );
-        
-        // Build constraints WITHOUT nested field filters (these will be applied client-side)
-        const constraints: QueryConstraint[] = [];
-        
-        // Active status filter
-        if (filters.isActive !== undefined) {
-          constraints.push(where('isActive', '==', filters.isActive));
-        } else {
-          constraints.push(where('isActive', '==', true));
-        }
-        
-        // Only include non-nested field filters in Firestore query
-        if (filters.procedureFamily) {
-          constraints.push(where('family', '==', filters.procedureFamily));
-        }
-        if (filters.practitionerId) {
-          constraints.push(where('practitionerId', '==', filters.practitionerId));
-        }
-        if (filters.clinicId) {
-          constraints.push(where('clinicBranchId', '==', filters.clinicId));
-        }
-        if (filters.minPrice !== undefined) {
-          constraints.push(where('price', '>=', filters.minPrice));
-        }
-        if (filters.maxPrice !== undefined) {
-          constraints.push(where('price', '<=', filters.maxPrice));
-        }
-        if (filters.minRating !== undefined) {
-          constraints.push(where('reviewInfo.averageRating', '>=', filters.minRating));
-        }
-        if (filters.maxRating !== undefined) {
-          constraints.push(where('reviewInfo.averageRating', '<=', filters.maxRating));
-        }
-        if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
-          const benefitIdsToMatch = filters.treatmentBenefits;
-          constraints.push(where('treatmentBenefitIds', 'array-contains-any', benefitIdsToMatch));
-        }
-        
-        // NOTE: We intentionally EXCLUDE these nested field filters from Firestore query:
-        // - filters.procedureTechnology (technology.id)
-        // - filters.procedureCategory (category.id)
-        // - filters.procedureSubcategory (subcategory.id)
-        // These will be applied client-side in applyInMemoryFilters
-        
-        console.log(
-          '[PROCEDURE_SERVICE] Strategy 3 Firestore constraints (nested filters excluded):',
-          constraints.map(c => (c as any).fieldPath || 'unknown'),
-        );
-        constraints.push(orderBy('createdAt', 'desc'));
-
-        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
-        if (filters.lastDoc) {
-          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
-          if (cursorValues) {
-            constraints.push(startAfter(...cursorValues));
-            console.log('[PROCEDURE_SERVICE] Strategy 3: Using cursor for pagination');
-          }
-        }
-        constraints.push(limit(filters.pagination || 10));
-
-        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-        const querySnapshot = await getDocs(q);
-        let procedures = querySnapshot.docs.map(
-          doc => ({ ...doc.data(), id: doc.id } as Procedure),
-        );
-
-        // Apply all client-side filters using centralized function
-        console.log('[PROCEDURE_SERVICE] Before applyInMemoryFilters (Strategy 3):', {
-          procedureCount: procedures.length,
-          procedureTechnology: filters.procedureTechnology,
-          filtersObject: {
-            procedureTechnology: filters.procedureTechnology,
-            procedureFamily: filters.procedureFamily,
-            procedureCategory: filters.procedureCategory,
-            procedureSubcategory: filters.procedureSubcategory,
-          },
-        });
-        procedures = this.applyInMemoryFilters(procedures, filters);
-        
-        // Filter out procedures from draft practitioners
-        if(filters.excludeDraftPractitioners){
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
-        }
-        
-        console.log('[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):', {
-          procedureCount: procedures.length,
-          queryDocCount: querySnapshot.docs.length,
-        });
-
-        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
-
-        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
-        if (querySnapshot.docs.length < (filters.pagination || 10)) {
-          return { procedures, lastDoc: null };
-        }
-        
-        // Return serializable cursor for pagination
-        const lastDocSnapshot = querySnapshot.docs.length > 0 
-          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
-          : null;
-        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
-        
-        return { procedures, lastDoc: serializableCursor };
-      } catch (error) {
-        console.log('[PROCEDURE_SERVICE] Strategy 3 failed:', error);
-      }
-
-      // Strategy 4: Minimal query fallback
-      try {
-        console.log('[PROCEDURE_SERVICE] Strategy 4: Minimal query fallback');
-        const constraints: QueryConstraint[] = [
-          where('isActive', '==', filters.isActive !== undefined ? filters.isActive : true),
-          orderBy('createdAt', 'desc'),
-        ];
-        if (filters.practitionerId) {
-          constraints.push(where('practitionerId', '==', filters.practitionerId));
-        }
-        if (filters.clinicId) {
-          constraints.push(where('clinicBranchId', '==', filters.clinicId));
-        }
-
-        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
-        if (filters.lastDoc) {
-          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
-          if (cursorValues) {
-            constraints.push(startAfter(...cursorValues));
-            console.log('[PROCEDURE_SERVICE] Strategy 4: Using cursor for pagination');
-          }
-        }
-        constraints.push(limit(filters.pagination || 10));
-
-        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
-        const querySnapshot = await getDocs(q);
-        let procedures = querySnapshot.docs.map(
-          doc => ({ ...doc.data(), id: doc.id } as Procedure),
-        );
-
-        // Apply all client-side filters using centralized function
-        procedures = this.applyInMemoryFilters(procedures, filters);
-        
-        // Filter out procedures from draft practitioners
-        if(filters.excludeDraftPractitioners){
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
-        }
-
-        console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
-
-        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
-        if (querySnapshot.docs.length < (filters.pagination || 10)) {
-          return { procedures, lastDoc: null };
-        }
-        
-        // Return serializable cursor for pagination
-        const lastDocSnapshot = querySnapshot.docs.length > 0 
-          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
-          : null;
-        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
-        
-        return { procedures, lastDoc: serializableCursor };
-      } catch (error) {
-        console.log('[PROCEDURE_SERVICE] Strategy 4 failed:', error);
-      }
-
-      // All strategies failed
-      console.log('[PROCEDURE_SERVICE] All strategies failed, returning empty result');
-      return { procedures: [], lastDoc: null };
-    } catch (error) {
-      console.error('[PROCEDURE_SERVICE] Error filtering procedures:', error);
-      return { procedures: [], lastDoc: null };
-    }
-  }
-
-  /**
-   * Applies in-memory filters to procedures array
-   * Used when Firestore queries fail or for complex filtering
-   */
-  private applyInMemoryFilters(
-    procedures: Procedure[],
-    filters: any,
-  ): (Procedure & { distance?: number })[] {
-    let filteredProcedures = [...procedures]; // Create copy to avoid mutating original
-
-    // Debug: Log what filters we received
-    console.log('[PROCEDURE_SERVICE] applyInMemoryFilters called:', {
-      procedureCount: procedures.length,
-      procedureTechnology: filters.procedureTechnology,
-      hasTechnologyFilter: !!filters.procedureTechnology,
-      allFilterKeys: Object.keys(filters).filter(k => filters[k] !== undefined && filters[k] !== null),
-    });
-
-    // Name search filter
-    if (filters.nameSearch && filters.nameSearch.trim()) {
-      const searchTerm = filters.nameSearch.trim().toLowerCase();
-      filteredProcedures = filteredProcedures.filter(procedure => {
-        const name = (procedure.name || '').toLowerCase();
-        const nameLower = procedure.nameLower || '';
-        return name.includes(searchTerm) || nameLower.includes(searchTerm);
-      });
-      console.log(`[PROCEDURE_SERVICE] Applied name filter, results: ${filteredProcedures.length}`);
-    }
-
-    // Price filtering
-    if (filters.minPrice !== undefined || filters.maxPrice !== undefined) {
-      filteredProcedures = filteredProcedures.filter(procedure => {
-        const price = procedure.price || 0;
-        if (filters.minPrice !== undefined && price < filters.minPrice) return false;
-        if (filters.maxPrice !== undefined && price > filters.maxPrice) return false;
-        return true;
-      });
-      console.log(
-        `[PROCEDURE_SERVICE] Applied price filter (${filters.minPrice}-${filters.maxPrice}), results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Rating filtering
-    if (filters.minRating !== undefined || filters.maxRating !== undefined) {
-      filteredProcedures = filteredProcedures.filter(procedure => {
-        const rating = procedure.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(
-        `[PROCEDURE_SERVICE] Applied rating filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Treatment benefits filtering
-    if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
-      const benefitIdsToMatch = filters.treatmentBenefits;
-      filteredProcedures = filteredProcedures.filter(procedure => {
-        const procedureBenefitIds = procedure.treatmentBenefitIds || [];
-        return benefitIdsToMatch.some((benefitId: string) =>
-          procedureBenefitIds.includes(benefitId),
-        );
-      });
-      console.log(
-        `[PROCEDURE_SERVICE] Applied benefits filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Procedure family filtering
-    if (filters.procedureFamily) {
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.family === filters.procedureFamily,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied family filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Category filtering
-    if (filters.procedureCategory) {
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.category?.id === filters.procedureCategory,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied category filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Subcategory filtering
-    if (filters.procedureSubcategory) {
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.subcategory?.id === filters.procedureSubcategory,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied subcategory filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Technology filtering
-    if (filters.procedureTechnology) {
-      const beforeCount = filteredProcedures.length;
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.technology?.id === filters.procedureTechnology,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied technology filter (${filters.procedureTechnology}), before: ${beforeCount}, after: ${filteredProcedures.length}`,
-      );
-      // Log sample technology IDs for debugging
-      if (beforeCount > filteredProcedures.length) {
-        const filteredOut = procedures
-          .filter(p => p.technology?.id !== filters.procedureTechnology)
-          .slice(0, 3)
-          .map(p => ({ id: p.id, techId: p.technology?.id, name: p.name }));
-        console.log('[PROCEDURE_SERVICE] Filtered out sample procedures:', filteredOut);
-      }
-    }
-
-    // Practitioner filtering
-    if (filters.practitionerId) {
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.practitionerId === filters.practitionerId,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied practitioner filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Clinic filtering
-    if (filters.clinicId) {
-      filteredProcedures = filteredProcedures.filter(
-        procedure => procedure.clinicBranchId === filters.clinicId,
-      );
-      console.log(
-        `[PROCEDURE_SERVICE] Applied clinic filter, results: ${filteredProcedures.length}`,
-      );
-    }
-
-    // Geo-radius filter
-    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
-      const location = filters.location;
-      const radiusInKm = filters.radiusInKm;
-      filteredProcedures = filteredProcedures.filter(procedure => {
-        const clinicLocation = procedure.clinicInfo?.location;
-        if (!clinicLocation?.latitude || !clinicLocation?.longitude) {
-          return false;
-        }
-
-        const distance = distanceBetween(
-          [location.latitude, location.longitude],
-          [clinicLocation.latitude, clinicLocation.longitude],
-        ); // Already returns km
-
-        // Attach distance for frontend sorting/display
-        (procedure as any).distance = distance;
-
-        return distance <= radiusInKm;
-      });
-      console.log(`[PROCEDURE_SERVICE] Applied geo filter, results: ${filteredProcedures.length}`);
-
-      // Sort by distance when geo filtering is applied
-      filteredProcedures.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
-    }
-
-    return filteredProcedures as (Procedure & { distance?: number })[];
-  }
-
-  private handleGeoQuery(filters: any): Promise<{
-    procedures: (Procedure & { distance?: number })[];
-    lastDoc: any;
-  }> {
-    console.log('[PROCEDURE_SERVICE] Executing geo query with geohash bounds');
-    try {
-      const location = filters.location;
-      const radiusInKm = filters.radiusInKm;
-
-      if (!location || !radiusInKm) {
-        return Promise.resolve({ procedures: [], lastDoc: null });
-      }
-
-      const bounds = geohashQueryBounds([location.latitude, location.longitude], radiusInKm * 1000);
-
-      const fetches = bounds.map(b => {
-        const constraints: QueryConstraint[] = [
-          where('clinicInfo.location.geohash', '>=', b[0]),
-          where('clinicInfo.location.geohash', '<=', b[1]),
-          where('isActive', '==', filters.isActive !== undefined ? filters.isActive : true),
-        ];
-        if (filters.practitionerId) {
-          constraints.push(where('practitionerId', '==', filters.practitionerId));
-        }
-        if (filters.clinicId) {
-          constraints.push(where('clinicBranchId', '==', filters.clinicId));
-        }
-        return getDocs(query(collection(this.db, PROCEDURES_COLLECTION), ...constraints));
-      });
-
-      return Promise.all(fetches)
-        .then(snaps => {
-          const collected: Procedure[] = [];
-          snaps.forEach(snap => {
-            snap.docs.forEach(d => collected.push({ ...(d.data() as Procedure), id: d.id }));
-          });
-
-          // Deduplicate by id
-          const uniqueMap = new Map<string, Procedure>();
-          for (const p of collected) {
-            uniqueMap.set(p.id, p);
-          }
-          let procedures = Array.from(uniqueMap.values());
-
-          // Apply remaining filters including precise distance and sorting
-          procedures = this.applyInMemoryFilters(procedures, filters);
-
-          // Manual pagination
-          const pageSize = filters.pagination || 10;
-          let startIndex = 0;
-          if (
-            filters.lastDoc &&
-            typeof filters.lastDoc === 'object' &&
-            (filters.lastDoc as any).id
-          ) {
-            const idx = procedures.findIndex(p => p.id === (filters.lastDoc as any).id);
-            if (idx >= 0) startIndex = idx + 1;
-          }
-          const page = procedures.slice(startIndex, startIndex + pageSize);
-          const newLastDoc = page.length === pageSize ? page[page.length - 1] : null;
-
-          console.log(
-            `[PROCEDURE_SERVICE] Geo query success: ${page.length} (of ${procedures.length}) within ${radiusInKm}km`,
-          );
-          return { procedures: page, lastDoc: newLastDoc };
-        })
-        .catch(err => {
-          console.error('[PROCEDURE_SERVICE] Geo bounds fetch failed:', err);
-          return { procedures: [], lastDoc: null };
-        });
-    } catch (error) {
-      console.error('[PROCEDURE_SERVICE] Geo query failed:', error);
-      return Promise.resolve({ procedures: [], lastDoc: null });
-    }
-  }
-
-  /**
-   * Creates a consultation procedure without requiring a product
-   * This is a special method for consultation procedures that don't use products
-   * @param data - The data for creating a consultation procedure (without productId)
-   * @returns The created procedure
-   */
-  async createConsultationProcedure(
-    data: Omit<CreateProcedureData, 'productId'>,
-  ): Promise<Procedure> {
-    // Generate procedure ID first so we can use it for media uploads
-    const procedureId = this.generateId();
-
-    // Get references to related entities (Category, Subcategory, Technology)
-    // For consultation, we don't need a product
-    const [category, subcategory, technology] = await Promise.all([
-      this.categoryService.getByIdInternal(data.categoryId),
-      this.subcategoryService.getByIdInternal(data.categoryId, data.subcategoryId),
-      this.technologyService.getByIdInternal(data.technologyId),
-    ]);
-
-    if (!category || !subcategory || !technology) {
-      throw new Error('One or more required base entities not found');
-    }
-
-    // Get clinic and practitioner information for aggregation
-    const clinicRef = doc(this.db, CLINICS_COLLECTION, data.clinicBranchId);
-    const clinicSnapshot = await getDoc(clinicRef);
-    if (!clinicSnapshot.exists()) {
-      throw new Error(`Clinic with ID ${data.clinicBranchId} not found`);
-    }
-    const clinic = clinicSnapshot.data() as Clinic;
-
-    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, data.practitionerId);
-    const practitionerSnapshot = await getDoc(practitionerRef);
-    if (!practitionerSnapshot.exists()) {
-      throw new Error(`Practitioner with ID ${data.practitionerId} not found`);
-    }
-    const practitioner = practitionerSnapshot.data() as Practitioner;
-
-    // Process photos if provided
-    let processedPhotos: string[] = [];
-    if (data.photos && data.photos.length > 0) {
-      processedPhotos = await this.processMediaArray(data.photos, procedureId, 'procedure-photos');
-    }
-
-    // If no photos provided and technology has a photoTemplate, use it as default photo
-    if (processedPhotos.length === 0 && technology.photoTemplate) {
-      console.log(`[ProcedureService] Using technology photoTemplate as default photo for consultation: ${technology.photoTemplate}`);
-      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
-      if (photoTemplateUrl) {
-        processedPhotos.push(photoTemplateUrl);
-      } else {
-        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
-      }
-    }
-
-    // Transform productsMetadata from validation format to ProcedureProduct format
-    // For consultations, this will return empty array since no products are provided
-    const transformedProductsMetadata = await this.transformProductsMetadata(
-      data.productsMetadata,
-      data.technologyId,
-    );
-
-    // Create aggregated clinic info for the procedure document
-    const clinicInfo = {
-      id: clinicSnapshot.id,
-      name: clinic.name,
-      description: clinic.description || '',
-      featuredPhoto:
-        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? typeof clinic.featuredPhotos[0] === 'string'
-            ? clinic.featuredPhotos[0]
-            : ''
-          : typeof clinic.coverPhoto === 'string'
-          ? clinic.coverPhoto
-          : '',
-      location: clinic.location,
-      contactInfo: clinic.contactInfo,
-    };
-
-    // Create aggregated doctor info for the procedure document
-    const doctorInfo = {
-      id: practitionerSnapshot.id,
-      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
-      description: practitioner.basicInfo.bio || '',
-      photo:
-        typeof practitioner.basicInfo.profileImageUrl === 'string'
-          ? practitioner.basicInfo.profileImageUrl
-          : '',
-      rating: practitioner.reviewInfo?.averageRating || 0,
-      services: practitioner.procedures || [],
-    };
-
-    // Create the procedure object
-    const { productsMetadata: _, ...dataWithoutProductsMetadata } = data;
-    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
-      id: procedureId,
-      ...dataWithoutProductsMetadata,
-      nameLower: (data as any).nameLower || data.name.toLowerCase(),
-      photos: processedPhotos,
-      category,
-      subcategory,
-      technology,
-      // No product field for consultations (Firestore doesn't allow undefined, so we omit it entirely)
-      productsMetadata: transformedProductsMetadata, // Empty array for consultations
-      blockingConditions: technology.blockingConditions,
-      contraindications: technology.contraindications || [],
-      contraindicationIds: technology.contraindications?.map(c => c.id) || [],
-      treatmentBenefits: technology.benefits,
-      treatmentBenefitIds: Array.isArray(technology.benefits) 
-        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
-        : [],
-      preRequirements: technology.requirements.pre,
-      postRequirements: technology.requirements.post,
-      certificationRequirement: technology.certificationRequirement,
-      documentationTemplates: technology?.documentationTemplates || [],
-      clinicInfo,
-      doctorInfo,
-      reviewInfo: {
-        totalReviews: 0,
-        averageRating: 0,
-        effectivenessOfTreatment: 0,
-        outcomeExplanation: 0,
-        painManagement: 0,
-        followUpCare: 0,
-        valueForMoney: 0,
-        recommendationPercentage: 0,
-      },
-      isActive: true,
-    };
-
-    // Create the procedure document
-    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
-    await setDoc(procedureRef, {
-      ...newProcedure,
-      createdAt: serverTimestamp(),
-      updatedAt: serverTimestamp(),
-    });
-
-    // Return the created procedure (fetch again to get server timestamps)
-    const savedDoc = await getDoc(procedureRef);
-    return savedDoc.data() as Procedure;
-  }
-
-  /**
-   * Gets all procedures with minimal info for map display (id, name, clinicId, clinicName, address, latitude, longitude)
-   * This is optimized for mobile map usage to reduce payload size.
-   * @returns Array of minimal procedure info for map
-   */
-  async getProceduresForMap(): Promise<
-    {
-      id: string;
-      name: string;
-      clinicId: string | undefined;
-      clinicName: string | undefined;
-      address: string;
-      latitude: number | undefined;
-      longitude: number | undefined;
-    }[]
-  > {
-    const proceduresRef = collection(this.db, PROCEDURES_COLLECTION);
-    const snapshot = await getDocs(proceduresRef);
-    let procedures = snapshot.docs.map(doc => ({
-      id: doc.id,
-      ...doc.data(),
-    } as Procedure));
-
-    // Filter out procedures with draft/inactive practitioners
-    procedures = await this.filterDraftPractitionerProcedures(procedures);
-
-    const proceduresForMap = procedures.map(procedure => ({
-      id: procedure.id,
-      name: procedure.name,
-      clinicId: procedure.clinicInfo?.id,
-      clinicName: procedure.clinicInfo?.name,
-      address: procedure.clinicInfo?.location?.address || '',
-      latitude: procedure.clinicInfo?.location?.latitude,
-      longitude: procedure.clinicInfo?.location?.longitude,
-    }));
-    return proceduresForMap;
-  }
-
-  /**
-   * Gets procedures filtered by clinic and practitioner with optional family filter
-   * @param clinicBranchId Clinic branch ID to filter by
-   * @param practitionerId Practitioner ID to filter by
-   * @param filterByFamily If true, shows only procedures of the same family as the default procedure
-   * @param defaultProcedureId Optional default procedure ID to determine the family
-   * @returns Array of procedures
-   */
-  async getProceduresForConsultation(
-    clinicBranchId: string,
-    practitionerId: string,
-    filterByFamily: boolean = true,
-    defaultProcedureId?: string
-  ): Promise<Procedure[]> {
-    let familyToFilter: ProcedureFamily | null = null;
-
-    // If family filtering is enabled and we have a default procedure, get its family
-    if (filterByFamily && defaultProcedureId) {
-      const defaultProcedureRef = doc(this.db, PROCEDURES_COLLECTION, defaultProcedureId);
-      const defaultProcedureSnap = await getDoc(defaultProcedureRef);
-      
-      if (defaultProcedureSnap.exists()) {
-        const defaultProcedure = defaultProcedureSnap.data() as Procedure;
-        familyToFilter = defaultProcedure.family;
-      }
-    }
-
-    // Build query constraints
-    const constraints: QueryConstraint[] = [
-      where('clinicBranchId', '==', clinicBranchId),
-      where('practitionerId', '==', practitionerId),
-      where('isActive', '==', true),
-    ];
-
-    // Add family filter if applicable
-    if (filterByFamily && familyToFilter) {
-      constraints.push(where('family', '==', familyToFilter));
-    }
-
-    // Execute query
-    const proceduresQuery = query(
-      collection(this.db, PROCEDURES_COLLECTION),
-      ...constraints,
-      orderBy('name', 'asc')
-    );
-
-    const querySnapshot = await getDocs(proceduresQuery);
-    
-    let procedures = querySnapshot.docs.map(doc => ({
-      id: doc.id,
-      ...doc.data(),
-    } as Procedure));
-
-    // Filter out procedures with draft/inactive practitioners
-    procedures = await this.filterDraftPractitionerProcedures(procedures);
-    
-    return procedures;
-  }
-}
+import {
+  collection,
+  doc,
+  getDoc,
+  getDocs,
+  query,
+  where,
+  updateDoc,
+  setDoc,
+  deleteDoc,
+  Timestamp,
+  serverTimestamp,
+  DocumentData,
+  writeBatch,
+  arrayUnion,
+  arrayRemove,
+  FieldValue,
+  orderBy,
+  limit,
+  startAfter,
+  QueryConstraint,
+  documentId,
+} from 'firebase/firestore';
+import { BaseService } from '../base.service';
+import { enforceProcedureLimit } from '../tier-enforcement';
+import {
+  Procedure,
+  CreateProcedureData,
+  UpdateProcedureData,
+  PROCEDURES_COLLECTION,
+  ProcedureSummaryInfo,
+} from '../../types/procedure';
+import { createProcedureSchema, updateProcedureSchema } from '../../validations/procedure.schema';
+import { z } from 'zod';
+import { Auth } from 'firebase/auth';
+import { Firestore } from 'firebase/firestore';
+import { FirebaseApp } from 'firebase/app';
+import { Category, CATEGORIES_COLLECTION } from '../../backoffice/types/category.types';
+import { Subcategory, SUBCATEGORIES_COLLECTION } from '../../backoffice/types/subcategory.types';
+import { Technology, TECHNOLOGIES_COLLECTION } from '../../backoffice/types/technology.types';
+import { Product, PRODUCTS_COLLECTION } from '../../backoffice/types/product.types';
+import { CategoryService } from '../../backoffice/services/category.service';
+import { SubcategoryService } from '../../backoffice/services/subcategory.service';
+import { TechnologyService } from '../../backoffice/services/technology.service';
+import { ProductService } from '../../backoffice/services/product.service';
+import { Practitioner, PRACTITIONERS_COLLECTION } from '../../types/practitioner';
+import {
+  CertificationLevel,
+  CertificationSpecialty,
+  ProcedureFamily,
+  type TreatmentBenefitDynamic,
+} from '../../backoffice/types';
+import { Currency, PricingMeasure } from '../../backoffice/types/static/pricing.types';
+import { Clinic, CLINICS_COLLECTION } from '../../types/clinic';
+import { ProcedureReviewInfo } from '../../types/reviews';
+import { distanceBetween, geohashQueryBounds } from 'geofire-common';
+import { MediaService, MediaAccessLevel } from '../media/media.service';
+import type { ProcedureProduct } from '../../backoffice/types/procedure-product.types';
+
+import { PractitionerService } from '../practitioner/practitioner.service';
+import { PractitionerStatus } from '../../types/practitioner';
+
+export class ProcedureService extends BaseService {
+  private categoryService: CategoryService;
+  private subcategoryService: SubcategoryService;
+  private technologyService: TechnologyService;
+  private productService: ProductService;
+  private mediaService: MediaService;
+  private practitionerService?: PractitionerService;
+
+  constructor(
+    db: Firestore,
+    auth: Auth,
+    app: FirebaseApp,
+    categoryService: CategoryService,
+    subcategoryService: SubcategoryService,
+    technologyService: TechnologyService,
+    productService: ProductService,
+    mediaService: MediaService,
+  ) {
+    super(db, auth, app);
+    this.categoryService = categoryService;
+    this.subcategoryService = subcategoryService;
+    this.technologyService = technologyService;
+    this.productService = productService;
+    this.mediaService = mediaService;
+  }
+
+  setPractitionerService(practitionerService: PractitionerService) {
+    this.practitionerService = practitionerService;
+  }
+
+  /**
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
+   * @param procedures - Array of procedures to filter
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
+   */
+  private async filterDraftPractitionerProcedures(
+    procedures: Procedure[]
+  ): Promise<Procedure[]> {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
+    if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn('[ProcedureService] practitionerService not available - skipping filtering');
+      }
+      return procedures;
+    }
+
+    try {
+      // First, filter out procedures with no practitionerId
+      const proceduresWithPractitioner = procedures.filter((p) => 
+        p.practitionerId && p.practitionerId.trim() !== ''
+      );
+
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
+
+      // Get unique practitioner IDs from procedures
+      const practitionerIds = Array.from(
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
+      );
+
+      if (practitionerIds.length === 0) {
+        return [];
+      }
+
+      // Fetch all practitioners in parallel
+      const practitionerPromises = practitionerIds.map((id) =>
+        this.practitionerService!.getPractitioner(id).catch(() => null)
+      );
+      const practitioners = await Promise.all(practitionerPromises);
+
+      // Create a map of practitioner ID to practitioner data
+      const practitionerMap = new Map<string, Practitioner>();
+      practitioners.forEach((practitioner, index) => {
+        if (practitioner) {
+          practitionerMap.set(practitionerIds[index], practitioner);
+        }
+      });
+
+      // Filter out procedures that:
+      // 1. Have no practitionerId (already filtered above, but double-check)
+      // 2. Have a practitioner that doesn't exist
+      // 3. Have a practitioner with DRAFT status
+      // 4. Have a practitioner that is not active (isActive === false)
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        // Check if practitioner exists
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+
+        // Check if practitioner is DRAFT
+        if (practitioner.status === PractitionerStatus.DRAFT) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+
+        // Check if practitioner is active (must be true to show procedure)
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+
+        return true;
+      });
+
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
+        console.log(
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ` +
+          `${noPractitionerCount} with no practitionerId, ` +
+          `${invalidPractitionerCount} with missing/draft/inactive practitioners`
+        );
+      }
+
+      return filteredProcedures;
+    } catch (error) {
+      console.error(
+        '[ProcedureService] Error filtering practitioner procedures:',
+        error
+      );
+      // On error, return original procedures to avoid breaking functionality
+      return procedures;
+    }
+  }
+
+  /**
+   * Process media resource (string URL or File object)
+   * @param media String URL or File object
+   * @param ownerId Owner ID for the media (usually procedureId)
+   * @param collectionName Collection name for organizing files
+   * @returns URL string after processing
+   */
+  private async processMedia(
+    media: string | File | Blob | null | undefined,
+    ownerId: string,
+    collectionName: string,
+  ): Promise<string | null> {
+    if (!media) return null;
+
+    // If already a string URL, return it directly
+    if (typeof media === 'string') {
+      return media;
+    }
+
+    // If it's a File, upload it using MediaService
+    if (media instanceof File || media instanceof Blob) {
+      console.log(`[ProcedureService] Uploading ${collectionName} media for ${ownerId}`);
+      const metadata = await this.mediaService.uploadMedia(
+        media,
+        ownerId,
+        MediaAccessLevel.PUBLIC,
+        collectionName,
+      );
+      return metadata.url;
+    }
+
+    return null;
+  }
+
+  /**
+   * Process array of media resources (strings or Files)
+   * @param mediaArray Array of string URLs or File objects
+   * @param ownerId Owner ID for the media
+   * @param collectionName Collection name for organizing files
+   * @returns Array of URL strings after processing
+   */
+  private async processMediaArray(
+    mediaArray: (string | File | Blob)[] | undefined,
+    ownerId: string,
+    collectionName: string,
+  ): Promise<string[]> {
+    if (!mediaArray || mediaArray.length === 0) return [];
+
+    const result: string[] = [];
+
+    for (const media of mediaArray) {
+      const processedUrl = await this.processMedia(media, ownerId, collectionName);
+      if (processedUrl) {
+        result.push(processedUrl);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Transforms validated procedure product data (with productId) to ProcedureProduct objects (with full product)
+   * @param productsMetadata Array of validated procedure product data (optional)
+   * @param technologyId Technology ID to fetch products from
+   * @returns Array of ProcedureProduct objects with full product information
+   */
+  private async transformProductsMetadata(
+    productsMetadata: {
+      productId: string;
+      price: number;
+      currency: Currency;
+      pricingMeasure: PricingMeasure;
+      isDefault?: boolean;
+    }[] | undefined,
+    technologyId: string,
+  ): Promise<ProcedureProduct[]> {
+    // Return empty array if no products metadata provided (for product-free procedures like consultations)
+    if (!productsMetadata || productsMetadata.length === 0) {
+      return [];
+    }
+
+    const transformedProducts: ProcedureProduct[] = [];
+
+    for (const productData of productsMetadata) {
+      // Fetch the full product object
+      const product = await this.productService.getById(technologyId, productData.productId);
+      if (!product) {
+        throw new Error(
+          `Product with ID ${productData.productId} not found for technology ${technologyId}`,
+        );
+      }
+
+      // Transform to ProcedureProduct
+      transformedProducts.push({
+        product,
+        price: productData.price,
+        currency: productData.currency,
+        pricingMeasure: productData.pricingMeasure,
+        isDefault: productData.isDefault,
+      });
+    }
+
+    return transformedProducts;
+  }
+
+  /**
+   * Creates a new procedure
+   * @param data - The data for creating a new procedure
+   * @returns The created procedure
+   */
+  async createProcedure(data: CreateProcedureData): Promise<Procedure> {
+    const validatedData = createProcedureSchema.parse(data);
+
+    // Check if this is a product-free procedure (e.g., free consultation)
+    const isProductFree = !validatedData.productId;
+
+    // Generate procedure ID first so we can use it for media uploads
+    const procedureId = this.generateId();
+
+    // Get references to related entities (Category, Subcategory, Technology, and optionally Product)
+    const baseEntitiesPromises: Promise<Category | Subcategory | Technology | Product | null>[] = [
+      this.categoryService.getById(validatedData.categoryId),
+      this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
+      this.technologyService.getById(validatedData.technologyId),
+    ];
+
+    // Only fetch product if productId is provided
+    if (!isProductFree) {
+      baseEntitiesPromises.push(
+        this.productService.getById(validatedData.technologyId, validatedData.productId!)
+      );
+    }
+
+    const results = await Promise.all(baseEntitiesPromises);
+    const category = results[0] as Category | null;
+    const subcategory = results[1] as Subcategory | null;
+    const technology = results[2] as Technology | null;
+    const product = isProductFree ? undefined : ((results[3] as Product | null) || undefined);
+
+    if (!category || !subcategory || !technology) {
+      throw new Error('One or more required base entities not found');
+    }
+
+    // For regular procedures, validate product exists
+    if (!isProductFree && !product) {
+      throw new Error('Product not found for regular procedure');
+    }
+
+    // Get clinic and practitioner information for aggregation
+    const clinicRef = doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId);
+    const clinicSnapshot = await getDoc(clinicRef);
+    if (!clinicSnapshot.exists()) {
+      throw new Error(`Clinic with ID ${validatedData.clinicBranchId} not found`);
+    }
+    const clinic = clinicSnapshot.data() as Clinic; // Assert type
+
+    // Enforce tier limit before creating procedure (per-provider, per-branch)
+    await enforceProcedureLimit(this.db, clinic.clinicGroupId, validatedData.clinicBranchId, validatedData.practitionerId);
+
+    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, validatedData.practitionerId);
+    const practitionerSnapshot = await getDoc(practitionerRef);
+    if (!practitionerSnapshot.exists()) {
+      throw new Error(`Practitioner with ID ${validatedData.practitionerId} not found`);
+    }
+    const practitioner = practitionerSnapshot.data() as Practitioner; // Assert type
+
+    // Check if practitioner already has a procedure with the same technology ID in this clinic branch
+    const existingProceduresQuery = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where('practitionerId', '==', validatedData.practitionerId),
+      where('clinicBranchId', '==', validatedData.clinicBranchId),
+      where('isActive', '==', true)
+    );
+    const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+    const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+    
+    const hasSameTechnology = existingProcedures.some(
+      proc => proc.technology?.id === validatedData.technologyId
+    );
+    if (hasSameTechnology) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch`
+      );
+    }
+
+    // Process photos if provided
+    let processedPhotos: string[] = [];
+    if (validatedData.photos && validatedData.photos.length > 0) {
+      processedPhotos = await this.processMediaArray(
+        validatedData.photos,
+        procedureId,
+        'procedure-photos',
+      );
+    }
+
+    // If no photos provided and technology has a photoTemplate, use it as default photo
+    if (processedPhotos.length === 0 && technology.photoTemplate) {
+      console.log(`[ProcedureService] Using technology photoTemplate as default photo: ${technology.photoTemplate}`);
+      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
+      if (photoTemplateUrl) {
+        processedPhotos.push(photoTemplateUrl);
+      } else {
+        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
+      }
+    }
+
+    // Transform productsMetadata from validation format to ProcedureProduct format
+    const transformedProductsMetadata = await this.transformProductsMetadata(
+      validatedData.productsMetadata,
+      validatedData.technologyId,
+    );
+
+    // Create aggregated clinic info for the procedure document
+    const clinicInfo = {
+      id: clinicSnapshot.id,
+      name: clinic.name,
+      description: clinic.description || '',
+      featuredPhoto:
+        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
+          ? typeof clinic.featuredPhotos[0] === 'string'
+            ? clinic.featuredPhotos[0]
+            : ''
+          : typeof clinic.coverPhoto === 'string'
+          ? clinic.coverPhoto
+          : '',
+      location: clinic.location,
+      contactInfo: clinic.contactInfo,
+    };
+
+    // Create aggregated doctor info for the procedure document
+    const doctorInfo = {
+      id: practitionerSnapshot.id,
+      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+      description: practitioner.basicInfo.bio || '',
+      photo:
+        typeof practitioner.basicInfo.profileImageUrl === 'string'
+          ? practitioner.basicInfo.profileImageUrl
+          : '', // Default to empty string if not a processed URL
+      rating: practitioner.reviewInfo?.averageRating || 0,
+      services: practitioner.procedures || [],
+    };
+
+    // Create the procedure object
+    const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
+    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
+      id: procedureId,
+      ...validatedDataWithoutProductsMetadata,
+      // Ensure nameLower is always set even if omitted by client
+      nameLower: (validatedData as any).nameLower || validatedData.name.toLowerCase(),
+      photos: processedPhotos,
+      category, // Embed full objects
+      subcategory,
+      technology,
+      ...(product && { product }), // Only include product field if it exists (Firestore doesn't allow undefined)
+      productsMetadata: transformedProductsMetadata, // Use transformed data, not original
+      blockingConditions: technology.blockingConditions,
+      contraindications: technology.contraindications || [],
+      contraindicationIds: technology.contraindications?.map(c => c.id) || [],
+      treatmentBenefits: technology.benefits,
+      treatmentBenefitIds: Array.isArray(technology.benefits) 
+        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
+        : [],
+      preRequirements: technology.requirements.pre,
+      postRequirements: technology.requirements.post,
+      certificationRequirement: technology.certificationRequirement,
+      documentationTemplates: technology?.documentationTemplates || [],
+      clinicInfo, // Embed aggregated info
+      doctorInfo, // Embed aggregated info
+      reviewInfo: {
+        // Default empty reviews
+        totalReviews: 0,
+        averageRating: 0,
+        effectivenessOfTreatment: 0,
+        outcomeExplanation: 0,
+        painManagement: 0,
+        followUpCare: 0,
+        valueForMoney: 0,
+        recommendationPercentage: 0,
+      },
+      isActive: true, // Default to active
+    };
+
+    // 🔥 DEBUG: Find undefined fields before writing to Firestore
+    console.log('🔥🔥🔥 CREATE PROCEDURE - Processing procedure:', procedureId);
+    console.log('🔥🔥🔥 FULL PROCEDURE OBJECT:', JSON.stringify(newProcedure, null, 2));
+    
+    const undefinedFields: string[] = [];
+    Object.entries(newProcedure).forEach(([key, value]) => {
+      if (value === undefined) {
+        undefinedFields.push(key);
+      }
+    });
+    if (undefinedFields.length > 0) {
+      console.error('🔥🔥🔥 UNDEFINED FIELDS DETECTED:', undefinedFields);
+      throw new Error(`Cannot write procedure with undefined fields: ${undefinedFields.join(', ')}`);
+    }
+    console.log('🔥🔥🔥 NO UNDEFINED FIELDS - Proceeding with setDoc');
+
+    // Create the procedure document
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
+    await setDoc(procedureRef, {
+      ...newProcedure,
+      createdAt: serverTimestamp(),
+      updatedAt: serverTimestamp(),
+    });
+
+    // Return the created procedure (fetch again to get server timestamps)
+    const savedDoc = await getDoc(procedureRef);
+    return savedDoc.data() as Procedure;
+  }
+
+  /**
+   * Validates if a practitioner can perform a procedure based on certification requirements.
+   * 
+   * @param procedure - The procedure to check
+   * @param practitioner - The practitioner to validate
+   * @returns true if practitioner can perform the procedure, false otherwise
+   */
+  canPractitionerPerformProcedure(procedure: Procedure, practitioner: Practitioner): boolean {
+    if (!practitioner.certification) {
+      return false;
+    }
+
+    const requiredCert = procedure.certificationRequirement;
+    const practitionerCert = practitioner.certification;
+
+    // Check certification level
+    const levelOrder = [
+      'aesthetician',
+      'nurse_assistant',
+      'nurse',
+      'nurse_practitioner',
+      'physician_assistant',
+      'doctor',
+      'specialist',
+      'plastic_surgeon',
+    ];
+
+    const practitionerLevelIndex = levelOrder.indexOf(practitionerCert.level);
+    const requiredLevelIndex = levelOrder.indexOf(requiredCert.minimumLevel);
+
+    if (practitionerLevelIndex < requiredLevelIndex) {
+      return false;
+    }
+
+    // Check required specialties
+    const requiredSpecialties = requiredCert.requiredSpecialties || [];
+    if (requiredSpecialties.length > 0) {
+      const practitionerSpecialties = practitionerCert.specialties || [];
+      const hasAllRequired = requiredSpecialties.every(specialty =>
+        practitionerSpecialties.includes(specialty)
+      );
+      if (!hasAllRequired) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Clones an existing procedure for a target practitioner.
+   * This creates a new procedure document with the same data as the source procedure,
+   * but linked to the target practitioner.
+   *
+   * @param sourceProcedureId - The ID of the procedure to clone
+   * @param targetPractitionerId - The ID of the practitioner to assign the cloned procedure to
+   * @param overrides - Optional overrides for the new procedure (e.g. price, duration, isActive)
+   * @returns The newly created procedure
+   */
+  async cloneProcedureForPractitioner(
+    sourceProcedureId: string,
+    targetPractitionerId: string,
+    overrides?: Partial<CreateProcedureData> & { isActive?: boolean }
+  ): Promise<Procedure> {
+    // 1. Fetch source procedure
+    const sourceProcedure = await this.getProcedure(sourceProcedureId);
+    if (!sourceProcedure) {
+      throw new Error(`Source procedure with ID ${sourceProcedureId} not found`);
+    }
+
+    // 2. Fetch target practitioner
+    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, targetPractitionerId);
+    const practitionerSnapshot = await getDoc(practitionerRef);
+    if (!practitionerSnapshot.exists()) {
+      throw new Error(`Target practitioner with ID ${targetPractitionerId} not found`);
+    }
+    const practitioner = practitionerSnapshot.data() as Practitioner;
+
+    // 3. Validate certification
+    if (!this.canPractitionerPerformProcedure(sourceProcedure, practitioner)) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} does not meet the certification requirements for this procedure`
+      );
+    }
+
+    // 4. Check if practitioner already has a procedure with the same technology ID in this clinic branch
+    const existingProceduresQuery = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where('practitionerId', '==', targetPractitionerId),
+      where('clinicBranchId', '==', sourceProcedure.clinicBranchId),
+      where('isActive', '==', true)
+    );
+    const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+    const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+    
+    const hasSameTechnology = existingProcedures.some(
+      proc => proc.technology?.id === sourceProcedure.technology?.id
+    );
+    if (hasSameTechnology) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${sourceProcedure.technology?.name || sourceProcedure.technology?.id}" in this clinic branch`
+      );
+    }
+
+    // 5. Prepare data for new procedure
+    const newProcedureId = this.generateId();
+
+    // Create aggregated doctor info for the new procedure
+    const doctorInfo = {
+      id: practitioner.id,
+      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+      description: practitioner.basicInfo.bio || '',
+      photo:
+        typeof practitioner.basicInfo.profileImageUrl === 'string'
+          ? practitioner.basicInfo.profileImageUrl
+          : '',
+      rating: practitioner.reviewInfo?.averageRating || 0,
+      services: practitioner.procedures || [],
+    };
+
+    // Construct the new procedure object
+    // We copy everything from source, but override specific fields
+    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
+      ...sourceProcedure,
+      id: newProcedureId,
+      practitionerId: targetPractitionerId,
+      doctorInfo, // Link to new doctor
+      
+      // Reset review info for the new procedure
+      reviewInfo: {
+        totalReviews: 0,
+        averageRating: 0,
+        effectivenessOfTreatment: 0,
+        outcomeExplanation: 0,
+        painManagement: 0,
+        followUpCare: 0,
+        valueForMoney: 0,
+        recommendationPercentage: 0,
+      },
+
+      // Apply any overrides if provided
+      ...(overrides?.price !== undefined && { price: overrides.price }),
+      ...(overrides?.duration !== undefined && { duration: overrides.duration }),
+      ...(overrides?.description !== undefined && { description: overrides.description }),
+      
+      // Ensure it's active by default unless specified otherwise
+      isActive: overrides?.isActive !== undefined ? overrides.isActive : true,
+    };
+
+    // 6. Save to Firestore
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, newProcedureId);
+    await setDoc(procedureRef, {
+      ...newProcedure,
+      createdAt: serverTimestamp(),
+      updatedAt: serverTimestamp(),
+    });
+
+    // 7. Return the new procedure
+    const savedDoc = await getDoc(procedureRef);
+    return savedDoc.data() as Procedure;
+  }
+
+  /**
+   * Clones an existing procedure for multiple target practitioners.
+   * This creates new procedure documents with the same data as the source procedure,
+   * but linked to each target practitioner.
+   *
+   * @param sourceProcedureId - The ID of the procedure to clone
+   * @param targetPractitionerIds - Array of practitioner IDs to assign the cloned procedure to
+   * @param overrides - Optional overrides for the new procedures (e.g. price, duration, isActive)
+   * @returns Array of newly created procedures
+   */
+  async bulkCloneProcedureForPractitioners(
+    sourceProcedureId: string,
+    targetPractitionerIds: string[],
+    overrides?: Partial<CreateProcedureData> & { isActive?: boolean }
+  ): Promise<Procedure[]> {
+    if (!targetPractitionerIds || targetPractitionerIds.length === 0) {
+      throw new Error('At least one target practitioner ID is required');
+    }
+
+    // 1. Fetch source procedure
+    const sourceProcedure = await this.getProcedure(sourceProcedureId);
+    if (!sourceProcedure) {
+      throw new Error(`Source procedure with ID ${sourceProcedureId} not found`);
+    }
+
+    // 2. Fetch all target practitioners
+    const practitionerPromises = targetPractitionerIds.map(id =>
+      getDoc(doc(this.db, PRACTITIONERS_COLLECTION, id))
+    );
+    const practitionerSnapshots = await Promise.all(practitionerPromises);
+
+    // 3. Validate all practitioners exist, can perform the procedure, and don't already have the same technology
+    const practitioners: Practitioner[] = [];
+    const sourceTechnologyId = sourceProcedure.technology?.id;
+    
+    for (let i = 0; i < practitionerSnapshots.length; i++) {
+      const snapshot = practitionerSnapshots[i];
+      if (!snapshot.exists()) {
+        throw new Error(`Target practitioner with ID ${targetPractitionerIds[i]} not found`);
+      }
+      const practitioner = snapshot.data() as Practitioner;
+      
+      if (!this.canPractitionerPerformProcedure(sourceProcedure, practitioner)) {
+        throw new Error(
+          `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} does not meet the certification requirements for this procedure`
+        );
+      }
+
+      // Check if practitioner already has a procedure with the same technology ID in this clinic branch
+      const existingProceduresQuery = query(
+        collection(this.db, PROCEDURES_COLLECTION),
+        where('practitionerId', '==', practitioner.id),
+        where('clinicBranchId', '==', sourceProcedure.clinicBranchId),
+        where('isActive', '==', true)
+      );
+      const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+      const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+      
+      const hasSameTechnology = existingProcedures.some(
+        proc => proc.technology?.id === sourceTechnologyId
+      );
+      if (hasSameTechnology) {
+        throw new Error(
+          `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${sourceProcedure.technology?.name || sourceTechnologyId}" in this clinic branch`
+        );
+      }
+      
+      practitioners.push(practitioner);
+    }
+
+    // 4. Create procedures in batch
+    const batch = writeBatch(this.db);
+    const newProcedures: Omit<Procedure, 'createdAt' | 'updatedAt'>[] = [];
+
+    for (const practitioner of practitioners) {
+      const newProcedureId = this.generateId();
+
+      // Create aggregated doctor info for the new procedure
+      const doctorInfo = {
+        id: practitioner.id,
+        name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+        description: practitioner.basicInfo.bio || '',
+        photo:
+          typeof practitioner.basicInfo.profileImageUrl === 'string'
+            ? practitioner.basicInfo.profileImageUrl
+            : '',
+        rating: practitioner.reviewInfo?.averageRating || 0,
+        services: practitioner.procedures || [],
+      };
+
+      // Construct the new procedure object
+      const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
+        ...sourceProcedure,
+        id: newProcedureId,
+        practitionerId: practitioner.id,
+        doctorInfo,
+        
+        // Reset review info for the new procedure
+        reviewInfo: {
+          totalReviews: 0,
+          averageRating: 0,
+          effectivenessOfTreatment: 0,
+          outcomeExplanation: 0,
+          painManagement: 0,
+          followUpCare: 0,
+          valueForMoney: 0,
+          recommendationPercentage: 0,
+        },
+
+        // Apply any overrides if provided
+        ...(overrides?.price !== undefined && { price: overrides.price }),
+        ...(overrides?.duration !== undefined && { duration: overrides.duration }),
+        ...(overrides?.description !== undefined && { description: overrides.description }),
+        
+        // Ensure it's active by default unless specified otherwise
+        isActive: overrides?.isActive !== undefined ? overrides.isActive : true,
+      };
+
+      newProcedures.push(newProcedure);
+
+      // Add to batch
+      const procedureRef = doc(this.db, PROCEDURES_COLLECTION, newProcedureId);
+      batch.set(procedureRef, {
+        ...newProcedure,
+        createdAt: serverTimestamp(),
+        updatedAt: serverTimestamp(),
+      });
+    }
+
+    // 5. Commit batch
+    await batch.commit();
+
+    // 6. Fetch and return the created procedures
+    const createdProcedures = await Promise.all(
+      newProcedures.map(p => this.getProcedure(p.id))
+    );
+
+    return createdProcedures.filter((p): p is Procedure => p !== null);
+  }
+
+  /**
+   * Creates multiple procedures for a list of practitioners based on common data.
+   * This method is optimized for bulk creation to reduce database reads and writes.
+   *
+   * @param baseData - The base data for the procedures to be created, omitting the practitionerId.
+   * @param practitionerIds - An array of practitioner IDs for whom the procedures will be created.
+   * @returns A promise that resolves to an array of the newly created procedures.
+   */
+  async bulkCreateProcedures(
+    baseData: Omit<CreateProcedureData, 'practitionerId'>,
+    practitionerIds: string[],
+  ): Promise<Procedure[]> {
+    // 1. Validation
+    if (!practitionerIds || practitionerIds.length === 0) {
+      throw new Error('Practitioner IDs array cannot be empty.');
+    }
+
+    // Check if this is a product-free procedure
+    const isProductFree = !baseData.productId;
+
+    // Add a dummy practitionerId for the validation schema to pass
+    const validationData = { ...baseData, practitionerId: practitionerIds[0] };
+    const validatedData = createProcedureSchema.parse(validationData);
+
+    // 2. Fetch common data once to avoid redundant reads
+    const baseEntitiesPromises: Promise<Category | Subcategory | Technology | Product | null>[] = [
+      this.categoryService.getById(validatedData.categoryId),
+      this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
+      this.technologyService.getById(validatedData.technologyId),
+    ];
+
+    // Only fetch product if productId is provided
+    if (!isProductFree) {
+      baseEntitiesPromises.push(
+        this.productService.getById(validatedData.technologyId, validatedData.productId!)
+      );
+    }
+
+    // Fetch clinic separately to maintain type safety
+    const clinicSnapshotPromise = getDoc(doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId));
+
+    const [baseResults, clinicSnapshot] = await Promise.all([
+      Promise.all(baseEntitiesPromises),
+      clinicSnapshotPromise
+    ]);
+    
+    const category = baseResults[0] as Category | null;
+    const subcategory = baseResults[1] as Subcategory | null;
+    const technology = baseResults[2] as Technology | null;
+    const product = isProductFree ? undefined : ((baseResults[3] as Product | null) || undefined);
+
+    if (!category || !subcategory || !technology) {
+      throw new Error('One or more required base entities not found');
+    }
+    
+    // For regular procedures, validate product exists
+    if (!isProductFree && !product) {
+      throw new Error('Product not found for regular procedure');
+    }
+    
+    if (!clinicSnapshot || !clinicSnapshot.exists()) {
+      throw new Error(`Clinic with ID ${validatedData.clinicBranchId} not found`);
+    }
+    const clinic = clinicSnapshot.data() as Clinic;
+
+    // Enforce tier limit for each practitioner (per-provider, per-branch)
+    for (const practitionerId of practitionerIds) {
+      await enforceProcedureLimit(this.db, clinic.clinicGroupId, validatedData.clinicBranchId, practitionerId);
+    }
+
+    // 3. Handle media uploads once for efficiency
+    let processedPhotos: string[] = [];
+    if (validatedData.photos && validatedData.photos.length > 0) {
+      const batchId = this.generateId(); // Use a single ID for all media in this batch
+      processedPhotos = await this.processMediaArray(
+        validatedData.photos,
+        batchId,
+        'procedure-photos-batch',
+      );
+    }
+
+    // If no photos provided and technology has a photoTemplate, use it as default photo
+    if (processedPhotos.length === 0 && technology.photoTemplate) {
+      console.log(`[ProcedureService] Using technology photoTemplate as default photo for bulk create: ${technology.photoTemplate}`);
+      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
+      if (photoTemplateUrl) {
+        processedPhotos.push(photoTemplateUrl);
+      } else {
+        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
+      }
+    }
+
+    // Transform productsMetadata from validation format to ProcedureProduct format
+    const transformedProductsMetadata = await this.transformProductsMetadata(
+      validatedData.productsMetadata,
+      validatedData.technologyId,
+    );
+
+    // 4. Fetch all practitioner data efficiently
+    const practitionersMap = new Map<string, Practitioner>();
+    // Use 'in' query in chunks of 30, as this is the Firestore limit
+    for (let i = 0; i < practitionerIds.length; i += 30) {
+      const chunk = practitionerIds.slice(i, i + 30);
+      const practitionersQuery = query(
+        collection(this.db, PRACTITIONERS_COLLECTION),
+        where(documentId(), 'in', chunk),
+      );
+      const practitionersSnapshot = await getDocs(practitionersQuery);
+      practitionersSnapshot.docs.forEach(doc => {
+        practitionersMap.set(doc.id, doc.data() as Practitioner);
+      });
+    }
+
+    // Verify all practitioners were found
+    if (practitionersMap.size !== practitionerIds.length) {
+      const foundIds = Array.from(practitionersMap.keys());
+      const notFoundIds = practitionerIds.filter(id => !foundIds.includes(id));
+      throw new Error(`The following practitioners were not found: ${notFoundIds.join(', ')}`);
+    }
+
+    // 5. Check for duplicates across all practitioners before creating any procedures
+    const duplicatePractitioners: string[] = [];
+    const duplicateChecks = await Promise.all(
+      practitionerIds.map(async (practitionerId) => {
+        const existingProceduresQuery = query(
+          collection(this.db, PROCEDURES_COLLECTION),
+          where('practitionerId', '==', practitionerId),
+          where('clinicBranchId', '==', validatedData.clinicBranchId),
+          where('isActive', '==', true)
+        );
+        const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+        const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+        
+        const hasSameTechnology = existingProcedures.some(
+          proc => proc.technology?.id === validatedData.technologyId
+        );
+        
+        return { practitionerId, hasSameTechnology };
+      })
+    );
+
+    // Collect all practitioners with duplicates
+    duplicateChecks.forEach(({ practitionerId, hasSameTechnology }) => {
+      if (hasSameTechnology) {
+        duplicatePractitioners.push(practitionerId);
+      }
+    });
+
+    // If any duplicates found, throw error listing all of them
+    if (duplicatePractitioners.length > 0) {
+      const duplicateNames = duplicatePractitioners
+        .map(id => {
+          const practitioner = practitionersMap.get(id)!;
+          return `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`;
+        })
+        .join(', ');
+      
+      throw new Error(
+        `The following practitioner(s) already have a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch: ${duplicateNames}. Please remove them from the selection and try again.`
+      );
+    }
+
+    // 6. Use a Firestore batch for atomic creation
+    const batch = writeBatch(this.db);
+    const createdProcedureIds: string[] = [];
+    const clinicInfo = {
+      id: clinicSnapshot.id,
+      name: clinic.name,
+      description: clinic.description || '',
+      featuredPhoto:
+        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
+          ? typeof clinic.featuredPhotos[0] === 'string'
+            ? clinic.featuredPhotos[0]
+            : ''
+          : typeof clinic.coverPhoto === 'string'
+          ? clinic.coverPhoto
+          : '',
+      location: clinic.location,
+      contactInfo: clinic.contactInfo,
+    };
+
+    for (const practitionerId of practitionerIds) {
+      const practitioner = practitionersMap.get(practitionerId)!;
+
+      const doctorInfo = {
+        id: practitioner.id,
+        name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+        description: practitioner.basicInfo.bio || '',
+        photo:
+          typeof practitioner.basicInfo.profileImageUrl === 'string'
+            ? practitioner.basicInfo.profileImageUrl
+            : '',
+        rating: practitioner.reviewInfo?.averageRating || 0,
+        services: practitioner.procedures || [],
+      };
+
+      const procedureId = this.generateId();
+      createdProcedureIds.push(procedureId);
+      const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
+
+      // Construct the new procedure, reusing common data
+      const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
+      const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
+        id: procedureId,
+        ...validatedDataWithoutProductsMetadata,
+        nameLower: (validatedData as any).nameLower || validatedData.name.toLowerCase(),
+        practitionerId: practitionerId, // Override practitionerId with the correct one
+        photos: processedPhotos,
+        category,
+        subcategory,
+        technology,
+        ...(product && { product }), // Only include product field if it exists (Firestore doesn't allow undefined)
+        productsMetadata: transformedProductsMetadata, // Use transformed data, not original
+        blockingConditions: technology.blockingConditions,
+        contraindications: technology.contraindications || [],
+        contraindicationIds: technology.contraindications?.map(c => c.id) || [],
+        treatmentBenefits: technology.benefits,
+        treatmentBenefitIds: Array.isArray(technology.benefits) 
+        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
+        : [],
+        preRequirements: technology.requirements.pre,
+        postRequirements: technology.requirements.post,
+        certificationRequirement: technology.certificationRequirement,
+        documentationTemplates: technology?.documentationTemplates || [],
+        clinicInfo,
+        doctorInfo, // Set specific doctor info
+        reviewInfo: {
+          totalReviews: 0,
+          averageRating: 0,
+          effectivenessOfTreatment: 0,
+          outcomeExplanation: 0,
+          painManagement: 0,
+          followUpCare: 0,
+          valueForMoney: 0,
+          recommendationPercentage: 0,
+        },
+        isActive: true,
+      };
+
+      // 🔥 DEBUG: Find undefined fields before writing to Firestore
+      console.log('🔥🔥🔥 BULK CREATE - Processing procedure:', procedureId, 'for practitioner:', practitionerId);
+      console.log('🔥🔥🔥 FULL PROCEDURE OBJECT:', JSON.stringify(newProcedure, null, 2));
+      
+      const undefinedFields: string[] = [];
+      Object.entries(newProcedure).forEach(([key, value]) => {
+        if (value === undefined) {
+          undefinedFields.push(key);
+        }
+      });
+      if (undefinedFields.length > 0) {
+        console.error('🔥🔥🔥 UNDEFINED FIELDS DETECTED:', undefinedFields);
+        throw new Error(`Cannot write procedure with undefined fields: ${undefinedFields.join(', ')}`);
+      }
+      console.log('🔥🔥🔥 NO UNDEFINED FIELDS - Proceeding with batch.set');
+
+      batch.set(procedureRef, {
+        ...newProcedure,
+        createdAt: serverTimestamp(),
+        updatedAt: serverTimestamp(),
+      });
+    }
+
+    // 7. Commit the atomic batch write
+    await batch.commit();
+
+    // 8. Fetch and return the newly created procedures
+    const fetchedProcedures: Procedure[] = [];
+    for (let i = 0; i < createdProcedureIds.length; i += 30) {
+      const chunk = createdProcedureIds.slice(i, i + 30);
+      const q = query(collection(this.db, PROCEDURES_COLLECTION), where(documentId(), 'in', chunk));
+      const snapshot = await getDocs(q);
+      snapshot.forEach(doc => {
+        fetchedProcedures.push(doc.data() as Procedure);
+      });
+    }
+
+    return fetchedProcedures;
+  }
+
+  /**
+   * Gets a procedure by ID
+   * @param id - The ID of the procedure to get
+   * @returns The procedure if found, null otherwise
+   */
+  async getProcedure(id: string): Promise<Procedure | null> {
+    const docRef = doc(this.db, PROCEDURES_COLLECTION, id);
+    const docSnap = await getDoc(docRef);
+
+    if (!docSnap.exists()) {
+      return null;
+    }
+
+    return docSnap.data() as Procedure;
+  }
+
+  /**
+   * Gets all procedures for a clinic branch
+   * @param clinicBranchId - The ID of the clinic branch
+   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status (default: false for admin views)
+   * @returns List of procedures
+   */
+  async getProceduresByClinicBranch(
+    clinicBranchId: string,
+    excludeDraftPractitioners: boolean = false
+  ): Promise<Procedure[]> {
+    const q = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where('clinicBranchId', '==', clinicBranchId),
+      where('isActive', '==', true),
+    );
+    const snapshot = await getDocs(q);
+    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
+    
+    // Filter out procedures from draft practitioners only if explicitly requested (for patient-facing apps)
+    if (excludeDraftPractitioners) {
+      return await this.filterDraftPractitionerProcedures(procedures);
+    }
+    
+    return procedures;
+  }
+
+  /**
+   * Gets all procedures for a practitioner
+   * @param practitionerId - The ID of the practitioner
+   * @param clinicBranchId - Optional clinic branch ID to filter by
+   * @param excludeDraftPractitioners - Whether to exclude procedures if the practitioner is in DRAFT status
+   * @returns List of procedures
+   */
+  async getProceduresByPractitioner(
+    practitionerId: string, 
+    clinicBranchId?: string,
+    excludeDraftPractitioners: boolean = true
+  ): Promise<Procedure[]> {
+    const constraints: QueryConstraint[] = [
+      where('practitionerId', '==', practitionerId),
+      where('isActive', '==', true),
+    ];
+    
+    if (clinicBranchId) {
+      constraints.push(where('clinicBranchId', '==', clinicBranchId));
+    }
+    
+    const q = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      ...constraints
+    );
+    const snapshot = await getDocs(q);
+    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
+
+    // If we need to exclude draft practitioners and have the service available
+    if (excludeDraftPractitioners && this.practitionerService) {
+      try {
+        const practitioner = await this.practitionerService.getPractitioner(practitionerId);
+        if (practitioner && practitioner.status === PractitionerStatus.DRAFT) {
+          console.log(`[ProcedureService] Excluding procedures for draft practitioner ${practitionerId}`);
+          return [];
+        }
+      } catch (error) {
+        console.error(`[ProcedureService] Error checking practitioner status for ${practitionerId}:`, error);
+        // On error, default to returning procedures to avoid breaking UI
+      }
+    }
+
+    return procedures;
+  }
+
+  /**
+   * Gets all inactive procedures for a practitioner
+   * @param practitionerId - The ID of the practitioner
+   * @returns List of inactive procedures
+   */
+  async getInactiveProceduresByPractitioner(practitionerId: string): Promise<Procedure[]> {
+    const q = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where('practitionerId', '==', practitionerId),
+      where('isActive', '==', false),
+    );
+    const snapshot = await getDocs(q);
+    return snapshot.docs.map(doc => doc.data() as Procedure);
+  }
+
+  /**
+   * Updates a procedure
+   * @param id - The ID of the procedure to update
+   * @param data - The data to update the procedure with
+   * @returns The updated procedure
+   */
+  async updateProcedure(id: string, data: UpdateProcedureData): Promise<Procedure> {
+    const validatedData = updateProcedureSchema.parse(data);
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
+    const procedureSnapshot = await getDoc(procedureRef);
+
+    if (!procedureSnapshot.exists()) {
+      throw new Error(`Procedure with ID ${id} not found`);
+    }
+
+    const existingProcedure = procedureSnapshot.data() as Procedure;
+    let updatedProcedureData: Partial<Procedure> = {};
+
+    // Copy validated simple fields
+    if (validatedData.name !== undefined) updatedProcedureData.name = validatedData.name;
+    if (validatedData.description !== undefined)
+      updatedProcedureData.description = validatedData.description;
+    if (validatedData.price !== undefined) updatedProcedureData.price = validatedData.price;
+    if (validatedData.currency !== undefined)
+      updatedProcedureData.currency = validatedData.currency;
+    if (validatedData.pricingMeasure !== undefined)
+      updatedProcedureData.pricingMeasure = validatedData.pricingMeasure;
+    if (validatedData.duration !== undefined)
+      updatedProcedureData.duration = validatedData.duration;
+    if (validatedData.isActive !== undefined)
+      updatedProcedureData.isActive = validatedData.isActive;
+
+    let practitionerChanged = false;
+    let clinicChanged = false;
+    const oldPractitionerId = existingProcedure.practitionerId;
+    const oldClinicId = existingProcedure.clinicBranchId;
+    let newPractitioner: Practitioner | null = null;
+    let newClinic: Clinic | null = null;
+
+    // Process photos if provided
+    if (validatedData.photos !== undefined) {
+      updatedProcedureData.photos = await this.processMediaArray(
+        validatedData.photos,
+        id,
+        'procedure-photos',
+      );
+    }
+
+    // Transform productsMetadata if provided
+    if (validatedData.productsMetadata !== undefined) {
+      const technologyId = validatedData.technologyId ?? existingProcedure.technology.id;
+      if (!technologyId) {
+        throw new Error('Technology ID is required for updating products metadata');
+      }
+      updatedProcedureData.productsMetadata = await this.transformProductsMetadata(
+        validatedData.productsMetadata,
+        technologyId,
+      );
+    }
+
+    // --- Prepare updates and fetch new related data if IDs change ---
+
+    // Handle Practitioner Change
+    if (validatedData.practitionerId && validatedData.practitionerId !== oldPractitionerId) {
+      practitionerChanged = true;
+      const newPractitionerRef = doc(
+        this.db,
+        PRACTITIONERS_COLLECTION,
+        validatedData.practitionerId,
+      );
+      const newPractitionerSnap = await getDoc(newPractitionerRef);
+      if (!newPractitionerSnap.exists())
+        throw new Error(`New Practitioner ${validatedData.practitionerId} not found`);
+      newPractitioner = newPractitionerSnap.data() as Practitioner;
+      // Update doctorInfo within the procedure document
+      updatedProcedureData.doctorInfo = {
+        id: newPractitioner.id,
+        name: `${newPractitioner.basicInfo.firstName} ${newPractitioner.basicInfo.lastName}`,
+        description: newPractitioner.basicInfo.bio || '',
+        photo:
+          typeof newPractitioner.basicInfo.profileImageUrl === 'string'
+            ? newPractitioner.basicInfo.profileImageUrl
+            : '', // Default to empty string if not a processed URL
+        rating: newPractitioner.reviewInfo?.averageRating || 0,
+        services: newPractitioner.procedures || [],
+      };
+    }
+
+    // Handle Clinic Change
+    if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
+      clinicChanged = true;
+      const newClinicRef = doc(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId);
+      const newClinicSnap = await getDoc(newClinicRef);
+      if (!newClinicSnap.exists())
+        throw new Error(`New Clinic ${validatedData.clinicBranchId} not found`);
+      newClinic = newClinicSnap.data() as Clinic;
+      // Update clinicInfo within the procedure document
+      updatedProcedureData.clinicInfo = {
+        id: newClinic.id,
+        name: newClinic.name,
+        description: newClinic.description || '',
+        featuredPhoto:
+          newClinic.featuredPhotos && newClinic.featuredPhotos.length > 0
+            ? typeof newClinic.featuredPhotos[0] === 'string'
+              ? newClinic.featuredPhotos[0]
+              : ''
+            : typeof newClinic.coverPhoto === 'string'
+            ? newClinic.coverPhoto
+            : '',
+        location: newClinic.location,
+        contactInfo: newClinic.contactInfo,
+      };
+    }
+
+    // Handle Category/Subcategory/Technology/Product Changes
+    let finalCategoryId = existingProcedure.category.id;
+    if (validatedData.name) {
+      updatedProcedureData.nameLower = validatedData.name.toLowerCase();
+    }
+    if (validatedData.categoryId) {
+      const category = await this.categoryService.getById(validatedData.categoryId);
+      if (!category) throw new Error(`Category ${validatedData.categoryId} not found`);
+      updatedProcedureData.category = category;
+      finalCategoryId = category.id; // Update finalCategoryId if category changed
+    }
+
+    // Only fetch subcategory if its ID is provided AND we have a valid finalCategoryId
+    if (validatedData.subcategoryId && finalCategoryId) {
+      const subcategory = await this.subcategoryService.getById(
+        finalCategoryId,
+        validatedData.subcategoryId,
+      );
+      if (!subcategory)
+        throw new Error(
+          `Subcategory ${validatedData.subcategoryId} not found for category ${finalCategoryId}`,
+        );
+      updatedProcedureData.subcategory = subcategory;
+    } else if (validatedData.subcategoryId) {
+      console.warn('Attempted to update subcategory without a valid categoryId');
+    }
+
+    let finalTechnologyId = existingProcedure.technology.id;
+    if (validatedData.technologyId) {
+      const technology = await this.technologyService.getById(validatedData.technologyId);
+      if (!technology) throw new Error(`Technology ${validatedData.technologyId} not found`);
+      updatedProcedureData.technology = technology;
+      finalTechnologyId = technology.id; // Update finalTechnologyId if technology changed
+      // Update related fields derived from technology
+      updatedProcedureData.blockingConditions = technology.blockingConditions;
+      updatedProcedureData.contraindications = technology.contraindications || [];
+      updatedProcedureData.contraindicationIds = technology.contraindications?.map(c => c.id) || [];
+      updatedProcedureData.treatmentBenefits = technology.benefits;
+      updatedProcedureData.treatmentBenefitIds = Array.isArray(technology.benefits)
+        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
+        : [];
+      updatedProcedureData.preRequirements = technology.requirements.pre;
+      updatedProcedureData.postRequirements = technology.requirements.post;
+      updatedProcedureData.certificationRequirement = technology.certificationRequirement;
+      updatedProcedureData.documentationTemplates = technology.documentationTemplates || [];
+    }
+
+    // Only fetch product if its ID is provided AND we have a valid finalTechnologyId
+    if (validatedData.productId && finalTechnologyId) {
+      const product = await this.productService.getById(finalTechnologyId, validatedData.productId);
+      if (!product)
+        throw new Error(
+          `Product ${validatedData.productId} not found for technology ${finalTechnologyId}`,
+        );
+      updatedProcedureData.product = product;
+    } else if (validatedData.productId) {
+      console.warn('Attempted to update product without a valid technologyId');
+    }
+
+    // Update the procedure document
+    await updateDoc(procedureRef, {
+      ...updatedProcedureData,
+      updatedAt: serverTimestamp(),
+    });
+
+    // Return the updated procedure
+    const updatedSnapshot = await getDoc(procedureRef);
+    return updatedSnapshot.data() as Procedure;
+  }
+
+  /**
+   * Deactivates a procedure (soft delete)
+   * @param id - The ID of the procedure to deactivate
+   */
+  async deactivateProcedure(id: string): Promise<void> {
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
+    const procedureSnap = await getDoc(procedureRef);
+    if (!procedureSnap.exists()) {
+      console.warn(`Procedure ${id} not found for deactivation.`);
+      return;
+    }
+
+    // Mark procedure as inactive
+    await updateDoc(procedureRef, {
+      isActive: false,
+      updatedAt: serverTimestamp(),
+    });
+  }
+
+  /**
+   * Deletes a procedure permanently
+   * @param id - The ID of the procedure to delete
+   * @returns A boolean indicating if the deletion was successful
+   */
+  async deleteProcedure(id: string): Promise<boolean> {
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, id);
+    const procedureSnapshot = await getDoc(procedureRef);
+
+    if (!procedureSnapshot.exists()) {
+      // Already deleted or never existed
+      return false;
+    }
+
+    // Delete the procedure document
+    await deleteDoc(procedureRef);
+    return true;
+  }
+
+  /**
+   * Gets all procedures that a practitioner is certified to perform
+   * @param practitioner - The practitioner's profile
+   * @returns Object containing allowed technologies, families, categories, subcategories
+   */
+  async getAllowedTechnologies(practitioner: Practitioner): Promise<{
+    technologies: Technology[];
+    families: ProcedureFamily[];
+    categories: string[];
+    subcategories: string[];
+  }> {
+    // This logic depends on TechnologyService and remains valid
+    const { technologies, families, categories, subcategories } =
+      await this.technologyService.getAllowedTechnologies(practitioner);
+
+    return {
+      technologies,
+      families,
+      categories,
+      subcategories,
+    };
+  }
+
+  /**
+   * Gets all procedures with optional pagination
+   *
+   * @param pagination - Optional number of procedures per page (0 or undefined returns all)
+   * @param lastDoc - Optional last document for pagination (if continuing from a previous page)
+   * @param excludeDraftPractitioners - Whether to exclude procedures from draft practitioners (default: true)
+   * @returns Object containing procedures array and the last document for pagination
+   */
+  async getAllProcedures(
+    pagination?: number,
+    lastDoc?: any,
+    excludeDraftPractitioners: boolean = true,
+  ): Promise<{ procedures: Procedure[]; lastDoc: any }> {
+    try {
+      const proceduresCollection = collection(this.db, PROCEDURES_COLLECTION);
+      let proceduresQuery = query(proceduresCollection);
+
+      // Apply pagination if specified
+      if (pagination && pagination > 0) {
+        const { limit, startAfter } = await import('firebase/firestore'); // Use dynamic import if needed top-level
+
+        if (lastDoc) {
+          proceduresQuery = query(
+            proceduresCollection,
+            orderBy('name'), // Use imported orderBy
+            startAfter(lastDoc),
+            limit(pagination),
+          );
+        } else {
+          proceduresQuery = query(proceduresCollection, orderBy('name'), limit(pagination)); // Use imported orderBy
+        }
+      } else {
+        proceduresQuery = query(proceduresCollection, orderBy('name')); // Use imported orderBy
+      }
+
+      const proceduresSnapshot = await getDocs(proceduresQuery);
+
+      let procedures = proceduresSnapshot.docs.map(doc => {
+        const data = doc.data() as Procedure;
+        return {
+          ...data,
+          id: doc.id, // Ensure ID is present
+        };
+      });
+
+      // Filter out procedures from draft practitioners if requested
+      if (excludeDraftPractitioners) {
+        procedures = await this.filterDraftPractitionerProcedures(procedures);
+      }
+
+      // Fix lastDoc - if we got fewer documents from Firestore than requested, no more pages
+      const lastDocForPagination = 
+        pagination && pagination > 0 && proceduresSnapshot.docs.length < pagination
+          ? null
+          : proceduresSnapshot.docs.length > 0
+          ? proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1]
+          : null;
+
+      return {
+        procedures,
+        lastDoc: lastDocForPagination,
+      };
+    } catch (error) {
+      console.error('[PROCEDURE_SERVICE] Error getting all procedures:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Creates a serializable cursor from a DocumentSnapshot or returns the cursor values.
+   * This format can be passed through React Native state/Redux without losing data.
+   *
+   * @param doc - The Firestore DocumentSnapshot
+   * @param orderByField - The field used in orderBy clause
+   * @returns Serializable cursor object with values needed for startAfter
+   */
+  private createSerializableCursor(
+    doc: any,
+    orderByField: string = 'createdAt',
+  ): { __cursor: true; values: any[]; id: string; orderByField: string } | null {
+    if (!doc) return null;
+
+    const data = typeof doc.data === 'function' ? doc.data() : doc;
+    const docId = doc.id || data?.id;
+
+    if (!docId) return null;
+
+    // Get the value of the orderBy field
+    let orderByValue = data?.[orderByField];
+
+    // Handle Firestore Timestamp
+    if (orderByValue && typeof orderByValue.toDate === 'function') {
+      orderByValue = orderByValue.toMillis();
+    } else if (orderByValue && orderByValue.seconds) {
+      // Serialized Timestamp
+      orderByValue = orderByValue.seconds * 1000 + (orderByValue.nanoseconds || 0) / 1000000;
+    }
+
+    return {
+      __cursor: true,
+      values: [orderByValue],
+      id: docId,
+      orderByField,
+    };
+  }
+
+  /**
+   * Converts a serializable cursor back to values for startAfter.
+   * Handles both native DocumentSnapshots and serialized cursor objects.
+   *
+   * @param lastDoc - Either a DocumentSnapshot or a serializable cursor object
+   * @param orderByField - The field used in orderBy clause (for validation)
+   * @returns Values to spread into startAfter, or null if invalid
+   */
+  private getCursorValuesForStartAfter(
+    lastDoc: any,
+    orderByField: string = 'createdAt',
+  ): any[] | null {
+    if (!lastDoc) return null;
+
+    // If it's a native DocumentSnapshot with data() method
+    if (typeof lastDoc.data === 'function') {
+      return [lastDoc];
+    }
+
+    // If it's our serializable cursor format
+    if (lastDoc.__cursor && Array.isArray(lastDoc.values)) {
+      // Reconstruct Timestamp if needed for createdAt
+      if (orderByField === 'createdAt' && typeof lastDoc.values[0] === 'number') {
+        const timestamp = Timestamp.fromMillis(lastDoc.values[0]);
+        return [timestamp];
+      }
+      return lastDoc.values;
+    }
+
+    // If it's an array of values directly
+    if (Array.isArray(lastDoc)) {
+      return lastDoc;
+    }
+
+    // Fallback: try to use the object's orderByField value
+    if (lastDoc[orderByField]) {
+      let value = lastDoc[orderByField];
+      if (typeof value === 'number' && orderByField === 'createdAt') {
+        value = Timestamp.fromMillis(value);
+      } else if (value.seconds && orderByField === 'createdAt') {
+        value = new Timestamp(value.seconds, value.nanoseconds || 0);
+      }
+      return [value];
+    }
+
+    console.warn('[PROCEDURE_SERVICE] Could not parse lastDoc cursor:', typeof lastDoc);
+    return null;
+  }
+
+  /**
+   * Searches and filters procedures based on multiple criteria
+   *
+   * @note Frontend can now send either a DocumentSnapshot or a serializable cursor object.
+   * The serializable cursor format is: { __cursor: true, values: [...], id: string, orderByField: string }
+   *
+   * @param filters - Various filters to apply
+   * @param filters.nameSearch - Optional search text for procedure name
+   * @param filters.treatmentBenefitIds - Optional array of treatment benefits to filter by
+   * @param filters.procedureFamily - Optional procedure family to filter by
+   * @param filters.procedureCategory - Optional procedure category to filter by
+   * @param filters.procedureSubcategory - Optional procedure subcategory to filter by
+   * @param filters.procedureTechnology - Optional procedure technology to filter by
+   * @param filters.location - Optional location for distance-based search
+   * @param filters.radiusInKm - Optional radius in kilometers (required if location is provided)
+   * @param filters.minPrice - Optional minimum price
+   * @param filters.maxPrice - Optional maximum price
+   * @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.isActive - Optional filter for active procedures only
+   * @returns Filtered procedures and the last document for pagination
+   */
+  async getProceduresByFilters(filters: {
+    nameSearch?: string;
+    treatmentBenefits?: string[];
+    procedureFamily?: ProcedureFamily;
+    procedureCategory?: string;
+    procedureSubcategory?: string;
+    procedureTechnology?: string;
+    location?: { latitude: number; longitude: number };
+    radiusInKm?: number;
+    minPrice?: number;
+    maxPrice?: number;
+    minRating?: number;
+    maxRating?: number;
+    pagination?: number;
+    lastDoc?: any;
+    isActive?: boolean;
+    practitionerId?: string;
+    clinicId?: string;
+    excludeDraftPractitioners?: boolean;
+  }): Promise<{
+    procedures: (Procedure & { distance?: number })[];
+    lastDoc: any;
+  }> {
+    try {
+      console.log('[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies');
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners)
+
+      // Geo query debug i validacija
+      if (filters.location && filters.radiusInKm) {
+        console.log('[PROCEDURE_SERVICE] Executing geo query:', {
+          location: filters.location,
+          radius: filters.radiusInKm,
+          serviceName: 'ProcedureService',
+        });
+
+        // Validacija location podataka
+        if (!filters.location.latitude || !filters.location.longitude) {
+          console.warn('[PROCEDURE_SERVICE] Invalid location data:', filters.location);
+          filters.location = undefined;
+          filters.radiusInKm = undefined;
+        }
+      }
+
+      // Handle geo queries separately (they work differently)
+      const isGeoQuery = filters.location && filters.radiusInKm && filters.radiusInKm > 0;
+      if (isGeoQuery) {
+        return this.handleGeoQuery(filters);
+      }
+
+      // Base constraints (used in all strategies)
+      const getBaseConstraints = () => {
+        const constraints: QueryConstraint[] = [];
+
+        // Active status filter
+        if (filters.isActive !== undefined) {
+          constraints.push(where('isActive', '==', filters.isActive));
+        } else {
+          constraints.push(where('isActive', '==', true));
+        }
+
+        // Filter constraints
+        if (filters.procedureFamily) {
+          constraints.push(where('family', '==', filters.procedureFamily));
+        }
+        if (filters.procedureCategory) {
+          constraints.push(where('category.id', '==', filters.procedureCategory));
+        }
+        if (filters.procedureSubcategory) {
+          constraints.push(where('subcategory.id', '==', filters.procedureSubcategory));
+        }
+        if (filters.procedureTechnology) {
+          constraints.push(where('technology.id', '==', filters.procedureTechnology));
+        }
+        if (filters.practitionerId) {
+          constraints.push(where('practitionerId', '==', filters.practitionerId));
+        }
+        if (filters.clinicId) {
+          constraints.push(where('clinicBranchId', '==', filters.clinicId));
+        }
+        if (filters.minPrice !== undefined) {
+          constraints.push(where('price', '>=', filters.minPrice));
+        }
+        if (filters.maxPrice !== undefined) {
+          constraints.push(where('price', '<=', filters.maxPrice));
+        }
+        if (filters.minRating !== undefined) {
+          constraints.push(where('reviewInfo.averageRating', '>=', filters.minRating));
+        }
+        if (filters.maxRating !== undefined) {
+          constraints.push(where('reviewInfo.averageRating', '<=', filters.maxRating));
+        }
+        if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+          const benefitIdsToMatch = filters.treatmentBenefits;
+          constraints.push(where('treatmentBenefitIds', 'array-contains-any', benefitIdsToMatch));
+        }
+
+        return constraints;
+      };
+
+      // Strategy 1: Try nameLower search if nameSearch exists
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        try {
+          console.log('[PROCEDURE_SERVICE] Strategy 1: Trying nameLower search');
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          const constraints = getBaseConstraints();
+          
+          // Check if we have nested field filters that might conflict with orderBy
+          const hasNestedFilters = !!(filters.procedureTechnology || filters.procedureCategory || filters.procedureSubcategory);
+          
+          if (hasNestedFilters) {
+            console.log('[PROCEDURE_SERVICE] Strategy 1: Has nested filters, will apply client-side after query');
+          }
+          
+          constraints.push(where('nameLower', '>=', searchTerm));
+          constraints.push(where('nameLower', '<=', searchTerm + '\uf8ff'));
+          constraints.push(orderBy('nameLower'));
+
+          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
+          if (filters.lastDoc) {
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'nameLower');
+            if (cursorValues) {
+              constraints.push(startAfter(...cursorValues));
+              console.log('[PROCEDURE_SERVICE] Strategy 1: Using cursor for pagination');
+            }
+          }
+          constraints.push(limit(filters.pagination || 10));
+
+          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+          const querySnapshot = await getDocs(q);
+          let procedures = querySnapshot.docs.map(
+            doc => ({ ...doc.data(), id: doc.id } as Procedure),
+          );
+          
+          // Apply client-side filters for nested fields if needed
+          if (hasNestedFilters) {
+            procedures = this.applyInMemoryFilters(procedures, filters);
+          }
+          
+          // Filter out procedures from draft practitioners if requested
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
+          
+          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+
+          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
+            return { procedures, lastDoc: null };
+          }
+          
+          // Return serializable cursor for pagination
+          const lastDocSnapshot = querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'nameLower');
+          
+          return { procedures, lastDoc: serializableCursor };
+        } catch (error) {
+          console.log('[PROCEDURE_SERVICE] Strategy 1 failed:', error);
+        }
+      }
+
+      // Strategy 2: Try name field search as fallback
+      if (filters.nameSearch && filters.nameSearch.trim()) {
+        try {
+          console.log('[PROCEDURE_SERVICE] Strategy 2: Trying name field search');
+          const searchTerm = filters.nameSearch.trim().toLowerCase();
+          const constraints = getBaseConstraints();
+          
+          // Check if we have nested field filters that might conflict with orderBy
+          const hasNestedFilters = !!(filters.procedureTechnology || filters.procedureCategory || filters.procedureSubcategory);
+          
+          if (hasNestedFilters) {
+            console.log('[PROCEDURE_SERVICE] Strategy 2: Has nested filters, will apply client-side after query');
+          }
+          
+          constraints.push(where('name', '>=', searchTerm));
+          constraints.push(where('name', '<=', searchTerm + '\uf8ff'));
+          constraints.push(orderBy('name'));
+
+          // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
+          if (filters.lastDoc) {
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'name');
+            if (cursorValues) {
+              constraints.push(startAfter(...cursorValues));
+              console.log('[PROCEDURE_SERVICE] Strategy 2: Using cursor for pagination');
+            }
+          }
+          constraints.push(limit(filters.pagination || 10));
+
+          const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+          const querySnapshot = await getDocs(q);
+          let procedures = querySnapshot.docs.map(
+            doc => ({ ...doc.data(), id: doc.id } as Procedure),
+          );
+          
+          // Apply client-side filters for nested fields if needed
+          if (hasNestedFilters) {
+            procedures = this.applyInMemoryFilters(procedures, filters);
+          }
+          
+          // Filter out procedures from draft practitioners
+          if(filters.excludeDraftPractitioners){
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
+          
+          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+
+          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
+            return { procedures, lastDoc: null };
+          }
+          
+          // Return serializable cursor for pagination
+          const lastDocSnapshot = querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'name');
+          
+          return { procedures, lastDoc: serializableCursor };
+        } catch (error) {
+          console.log('[PROCEDURE_SERVICE] Strategy 2 failed:', error);
+        }
+      }
+
+      // Strategy 3: orderBy createdAt with client-side filtering
+      // NOTE: This strategy excludes nested field filters (technology.id, category.id, subcategory.id)
+      // from Firestore query because Firestore doesn't support orderBy on different field
+      // when using where on nested fields without a composite index.
+      // These filters are applied client-side instead.
+      try {
+        console.log(
+          '[PROCEDURE_SERVICE] Strategy 3: Using createdAt orderBy with client-side filtering',
+          {
+            procedureTechnology: filters.procedureTechnology,
+            hasTechnologyFilter: !!filters.procedureTechnology,
+          },
+        );
+        
+        // Build constraints WITHOUT nested field filters (these will be applied client-side)
+        const constraints: QueryConstraint[] = [];
+        
+        // Active status filter
+        if (filters.isActive !== undefined) {
+          constraints.push(where('isActive', '==', filters.isActive));
+        } else {
+          constraints.push(where('isActive', '==', true));
+        }
+        
+        // Only include non-nested field filters in Firestore query
+        if (filters.procedureFamily) {
+          constraints.push(where('family', '==', filters.procedureFamily));
+        }
+        if (filters.practitionerId) {
+          constraints.push(where('practitionerId', '==', filters.practitionerId));
+        }
+        if (filters.clinicId) {
+          constraints.push(where('clinicBranchId', '==', filters.clinicId));
+        }
+        if (filters.minPrice !== undefined) {
+          constraints.push(where('price', '>=', filters.minPrice));
+        }
+        if (filters.maxPrice !== undefined) {
+          constraints.push(where('price', '<=', filters.maxPrice));
+        }
+        if (filters.minRating !== undefined) {
+          constraints.push(where('reviewInfo.averageRating', '>=', filters.minRating));
+        }
+        if (filters.maxRating !== undefined) {
+          constraints.push(where('reviewInfo.averageRating', '<=', filters.maxRating));
+        }
+        if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+          const benefitIdsToMatch = filters.treatmentBenefits;
+          constraints.push(where('treatmentBenefitIds', 'array-contains-any', benefitIdsToMatch));
+        }
+        
+        // NOTE: We intentionally EXCLUDE these nested field filters from Firestore query:
+        // - filters.procedureTechnology (technology.id)
+        // - filters.procedureCategory (category.id)
+        // - filters.procedureSubcategory (subcategory.id)
+        // These will be applied client-side in applyInMemoryFilters
+        
+        console.log(
+          '[PROCEDURE_SERVICE] Strategy 3 Firestore constraints (nested filters excluded):',
+          constraints.map(c => (c as any).fieldPath || 'unknown'),
+        );
+        constraints.push(orderBy('createdAt', 'desc'));
+
+        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
+        if (filters.lastDoc) {
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
+          if (cursorValues) {
+            constraints.push(startAfter(...cursorValues));
+            console.log('[PROCEDURE_SERVICE] Strategy 3: Using cursor for pagination');
+          }
+        }
+        constraints.push(limit(filters.pagination || 10));
+
+        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let procedures = querySnapshot.docs.map(
+          doc => ({ ...doc.data(), id: doc.id } as Procedure),
+        );
+
+        // Apply all client-side filters using centralized function
+        console.log('[PROCEDURE_SERVICE] Before applyInMemoryFilters (Strategy 3):', {
+          procedureCount: procedures.length,
+          procedureTechnology: filters.procedureTechnology,
+          filtersObject: {
+            procedureTechnology: filters.procedureTechnology,
+            procedureFamily: filters.procedureFamily,
+            procedureCategory: filters.procedureCategory,
+            procedureSubcategory: filters.procedureSubcategory,
+          },
+        });
+        procedures = this.applyInMemoryFilters(procedures, filters);
+        
+        // Filter out procedures from draft practitioners
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
+        
+        console.log('[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):', {
+          procedureCount: procedures.length,
+          queryDocCount: querySnapshot.docs.length,
+        });
+
+        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+
+        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
+          return { procedures, lastDoc: null };
+        }
+        
+        // Return serializable cursor for pagination
+        const lastDocSnapshot = querySnapshot.docs.length > 0 
+          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
+          : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
+        
+        return { procedures, lastDoc: serializableCursor };
+      } catch (error) {
+        console.log('[PROCEDURE_SERVICE] Strategy 3 failed:', error);
+      }
+
+      // Strategy 4: Minimal query fallback
+      try {
+        console.log('[PROCEDURE_SERVICE] Strategy 4: Minimal query fallback');
+        const constraints: QueryConstraint[] = [
+          where('isActive', '==', filters.isActive !== undefined ? filters.isActive : true),
+          orderBy('createdAt', 'desc'),
+        ];
+        if (filters.practitionerId) {
+          constraints.push(where('practitionerId', '==', filters.practitionerId));
+        }
+        if (filters.clinicId) {
+          constraints.push(where('clinicBranchId', '==', filters.clinicId));
+        }
+
+        // Handle lastDoc cursor - supports both native DocumentSnapshot and serializable cursor
+        if (filters.lastDoc) {
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, 'createdAt');
+          if (cursorValues) {
+            constraints.push(startAfter(...cursorValues));
+            console.log('[PROCEDURE_SERVICE] Strategy 4: Using cursor for pagination');
+          }
+        }
+        constraints.push(limit(filters.pagination || 10));
+
+        const q = query(collection(this.db, PROCEDURES_COLLECTION), ...constraints);
+        const querySnapshot = await getDocs(q);
+        let procedures = querySnapshot.docs.map(
+          doc => ({ ...doc.data(), id: doc.id } as Procedure),
+        );
+
+        // Apply all client-side filters using centralized function
+        procedures = this.applyInMemoryFilters(procedures, filters);
+        
+        // Filter out procedures from draft practitioners
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
+
+        console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+
+        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
+          return { procedures, lastDoc: null };
+        }
+        
+        // Return serializable cursor for pagination
+        const lastDocSnapshot = querySnapshot.docs.length > 0 
+          ? querySnapshot.docs[querySnapshot.docs.length - 1] 
+          : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, 'createdAt');
+        
+        return { procedures, lastDoc: serializableCursor };
+      } catch (error) {
+        console.log('[PROCEDURE_SERVICE] Strategy 4 failed:', error);
+      }
+
+      // All strategies failed
+      console.log('[PROCEDURE_SERVICE] All strategies failed, returning empty result');
+      return { procedures: [], lastDoc: null };
+    } catch (error) {
+      console.error('[PROCEDURE_SERVICE] Error filtering procedures:', error);
+      return { procedures: [], lastDoc: null };
+    }
+  }
+
+  /**
+   * Applies in-memory filters to procedures array
+   * Used when Firestore queries fail or for complex filtering
+   */
+  private applyInMemoryFilters(
+    procedures: Procedure[],
+    filters: any,
+  ): (Procedure & { distance?: number })[] {
+    let filteredProcedures = [...procedures]; // Create copy to avoid mutating original
+
+    // Debug: Log what filters we received
+    console.log('[PROCEDURE_SERVICE] applyInMemoryFilters called:', {
+      procedureCount: procedures.length,
+      procedureTechnology: filters.procedureTechnology,
+      hasTechnologyFilter: !!filters.procedureTechnology,
+      allFilterKeys: Object.keys(filters).filter(k => filters[k] !== undefined && filters[k] !== null),
+    });
+
+    // Name search filter
+    if (filters.nameSearch && filters.nameSearch.trim()) {
+      const searchTerm = filters.nameSearch.trim().toLowerCase();
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const name = (procedure.name || '').toLowerCase();
+        const nameLower = procedure.nameLower || '';
+        return name.includes(searchTerm) || nameLower.includes(searchTerm);
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied name filter, results: ${filteredProcedures.length}`);
+    }
+
+    // Price filtering
+    if (filters.minPrice !== undefined || filters.maxPrice !== undefined) {
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const price = procedure.price || 0;
+        if (filters.minPrice !== undefined && price < filters.minPrice) return false;
+        if (filters.maxPrice !== undefined && price > filters.maxPrice) return false;
+        return true;
+      });
+      console.log(
+        `[PROCEDURE_SERVICE] Applied price filter (${filters.minPrice}-${filters.maxPrice}), results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Rating filtering
+    if (filters.minRating !== undefined || filters.maxRating !== undefined) {
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const rating = procedure.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(
+        `[PROCEDURE_SERVICE] Applied rating filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Treatment benefits filtering
+    if (filters.treatmentBenefits && filters.treatmentBenefits.length > 0) {
+      const benefitIdsToMatch = filters.treatmentBenefits;
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const procedureBenefitIds = procedure.treatmentBenefitIds || [];
+        return benefitIdsToMatch.some((benefitId: string) =>
+          procedureBenefitIds.includes(benefitId),
+        );
+      });
+      console.log(
+        `[PROCEDURE_SERVICE] Applied benefits filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Procedure family filtering
+    if (filters.procedureFamily) {
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.family === filters.procedureFamily,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied family filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Category filtering
+    if (filters.procedureCategory) {
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.category?.id === filters.procedureCategory,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied category filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Subcategory filtering
+    if (filters.procedureSubcategory) {
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.subcategory?.id === filters.procedureSubcategory,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied subcategory filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Technology filtering
+    if (filters.procedureTechnology) {
+      const beforeCount = filteredProcedures.length;
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.technology?.id === filters.procedureTechnology,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied technology filter (${filters.procedureTechnology}), before: ${beforeCount}, after: ${filteredProcedures.length}`,
+      );
+      // Log sample technology IDs for debugging
+      if (beforeCount > filteredProcedures.length) {
+        const filteredOut = procedures
+          .filter(p => p.technology?.id !== filters.procedureTechnology)
+          .slice(0, 3)
+          .map(p => ({ id: p.id, techId: p.technology?.id, name: p.name }));
+        console.log('[PROCEDURE_SERVICE] Filtered out sample procedures:', filteredOut);
+      }
+    }
+
+    // Practitioner filtering
+    if (filters.practitionerId) {
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.practitionerId === filters.practitionerId,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied practitioner filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Clinic filtering
+    if (filters.clinicId) {
+      filteredProcedures = filteredProcedures.filter(
+        procedure => procedure.clinicBranchId === filters.clinicId,
+      );
+      console.log(
+        `[PROCEDURE_SERVICE] Applied clinic filter, results: ${filteredProcedures.length}`,
+      );
+    }
+
+    // Geo-radius filter
+    if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+      filteredProcedures = filteredProcedures.filter(procedure => {
+        const clinicLocation = procedure.clinicInfo?.location;
+        if (!clinicLocation?.latitude || !clinicLocation?.longitude) {
+          return false;
+        }
+
+        const distance = distanceBetween(
+          [location.latitude, location.longitude],
+          [clinicLocation.latitude, clinicLocation.longitude],
+        ); // Already returns km
+
+        // Attach distance for frontend sorting/display
+        (procedure as any).distance = distance;
+
+        return distance <= radiusInKm;
+      });
+      console.log(`[PROCEDURE_SERVICE] Applied geo filter, results: ${filteredProcedures.length}`);
+
+      // Sort by distance when geo filtering is applied
+      filteredProcedures.sort((a, b) => ((a as any).distance || 0) - ((b as any).distance || 0));
+    }
+
+    return filteredProcedures as (Procedure & { distance?: number })[];
+  }
+
+  private handleGeoQuery(filters: any): Promise<{
+    procedures: (Procedure & { distance?: number })[];
+    lastDoc: any;
+  }> {
+    console.log('[PROCEDURE_SERVICE] Executing geo query with geohash bounds');
+    try {
+      const location = filters.location;
+      const radiusInKm = filters.radiusInKm;
+
+      if (!location || !radiusInKm) {
+        return Promise.resolve({ procedures: [], lastDoc: null });
+      }
+
+      const bounds = geohashQueryBounds([location.latitude, location.longitude], radiusInKm * 1000);
+
+      const fetches = bounds.map(b => {
+        const constraints: QueryConstraint[] = [
+          where('clinicInfo.location.geohash', '>=', b[0]),
+          where('clinicInfo.location.geohash', '<=', b[1]),
+          where('isActive', '==', filters.isActive !== undefined ? filters.isActive : true),
+        ];
+        if (filters.practitionerId) {
+          constraints.push(where('practitionerId', '==', filters.practitionerId));
+        }
+        if (filters.clinicId) {
+          constraints.push(where('clinicBranchId', '==', filters.clinicId));
+        }
+        return getDocs(query(collection(this.db, PROCEDURES_COLLECTION), ...constraints));
+      });
+
+      return Promise.all(fetches)
+        .then(snaps => {
+          const collected: Procedure[] = [];
+          snaps.forEach(snap => {
+            snap.docs.forEach(d => collected.push({ ...(d.data() as Procedure), id: d.id }));
+          });
+
+          // Deduplicate by id
+          const uniqueMap = new Map<string, Procedure>();
+          for (const p of collected) {
+            uniqueMap.set(p.id, p);
+          }
+          let procedures = Array.from(uniqueMap.values());
+
+          // Apply remaining filters including precise distance and sorting
+          procedures = this.applyInMemoryFilters(procedures, filters);
+
+          // Manual pagination
+          const pageSize = filters.pagination || 10;
+          let startIndex = 0;
+          if (
+            filters.lastDoc &&
+            typeof filters.lastDoc === 'object' &&
+            (filters.lastDoc as any).id
+          ) {
+            const idx = procedures.findIndex(p => p.id === (filters.lastDoc as any).id);
+            if (idx >= 0) startIndex = idx + 1;
+          }
+          const page = procedures.slice(startIndex, startIndex + pageSize);
+          const newLastDoc = page.length === pageSize ? page[page.length - 1] : null;
+
+          console.log(
+            `[PROCEDURE_SERVICE] Geo query success: ${page.length} (of ${procedures.length}) within ${radiusInKm}km`,
+          );
+          return { procedures: page, lastDoc: newLastDoc };
+        })
+        .catch(err => {
+          console.error('[PROCEDURE_SERVICE] Geo bounds fetch failed:', err);
+          return { procedures: [], lastDoc: null };
+        });
+    } catch (error) {
+      console.error('[PROCEDURE_SERVICE] Geo query failed:', error);
+      return Promise.resolve({ procedures: [], lastDoc: null });
+    }
+  }
+
+  /**
+   * Creates a consultation procedure without requiring a product
+   * This is a special method for consultation procedures that don't use products
+   * @param data - The data for creating a consultation procedure (without productId)
+   * @returns The created procedure
+   */
+  async createConsultationProcedure(
+    data: Omit<CreateProcedureData, 'productId'>,
+  ): Promise<Procedure> {
+    // Generate procedure ID first so we can use it for media uploads
+    const procedureId = this.generateId();
+
+    // Get references to related entities (Category, Subcategory, Technology)
+    // For consultation, we don't need a product
+    const [category, subcategory, technology] = await Promise.all([
+      this.categoryService.getByIdInternal(data.categoryId),
+      this.subcategoryService.getByIdInternal(data.categoryId, data.subcategoryId),
+      this.technologyService.getByIdInternal(data.technologyId),
+    ]);
+
+    if (!category || !subcategory || !technology) {
+      throw new Error('One or more required base entities not found');
+    }
+
+    // Get clinic and practitioner information for aggregation
+    const clinicRef = doc(this.db, CLINICS_COLLECTION, data.clinicBranchId);
+    const clinicSnapshot = await getDoc(clinicRef);
+    if (!clinicSnapshot.exists()) {
+      throw new Error(`Clinic with ID ${data.clinicBranchId} not found`);
+    }
+    const clinic = clinicSnapshot.data() as Clinic;
+
+    const practitionerRef = doc(this.db, PRACTITIONERS_COLLECTION, data.practitionerId);
+    const practitionerSnapshot = await getDoc(practitionerRef);
+    if (!practitionerSnapshot.exists()) {
+      throw new Error(`Practitioner with ID ${data.practitionerId} not found`);
+    }
+    const practitioner = practitionerSnapshot.data() as Practitioner;
+
+    // Process photos if provided
+    let processedPhotos: string[] = [];
+    if (data.photos && data.photos.length > 0) {
+      processedPhotos = await this.processMediaArray(data.photos, procedureId, 'procedure-photos');
+    }
+
+    // If no photos provided and technology has a photoTemplate, use it as default photo
+    if (processedPhotos.length === 0 && technology.photoTemplate) {
+      console.log(`[ProcedureService] Using technology photoTemplate as default photo for consultation: ${technology.photoTemplate}`);
+      const photoTemplateUrl = await this.mediaService.getMediaDownloadUrl(technology.photoTemplate);
+      if (photoTemplateUrl) {
+        processedPhotos.push(photoTemplateUrl);
+      } else {
+        console.warn(`[ProcedureService] Could not fetch photoTemplate URL for media ID: ${technology.photoTemplate}`);
+      }
+    }
+
+    // Transform productsMetadata from validation format to ProcedureProduct format
+    // For consultations, this will return empty array since no products are provided
+    const transformedProductsMetadata = await this.transformProductsMetadata(
+      data.productsMetadata,
+      data.technologyId,
+    );
+
+    // Create aggregated clinic info for the procedure document
+    const clinicInfo = {
+      id: clinicSnapshot.id,
+      name: clinic.name,
+      description: clinic.description || '',
+      featuredPhoto:
+        clinic.featuredPhotos && clinic.featuredPhotos.length > 0
+          ? typeof clinic.featuredPhotos[0] === 'string'
+            ? clinic.featuredPhotos[0]
+            : ''
+          : typeof clinic.coverPhoto === 'string'
+          ? clinic.coverPhoto
+          : '',
+      location: clinic.location,
+      contactInfo: clinic.contactInfo,
+    };
+
+    // Create aggregated doctor info for the procedure document
+    const doctorInfo = {
+      id: practitionerSnapshot.id,
+      name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
+      description: practitioner.basicInfo.bio || '',
+      photo:
+        typeof practitioner.basicInfo.profileImageUrl === 'string'
+          ? practitioner.basicInfo.profileImageUrl
+          : '',
+      rating: practitioner.reviewInfo?.averageRating || 0,
+      services: practitioner.procedures || [],
+    };
+
+    // Create the procedure object
+    const { productsMetadata: _, ...dataWithoutProductsMetadata } = data;
+    const newProcedure: Omit<Procedure, 'createdAt' | 'updatedAt'> = {
+      id: procedureId,
+      ...dataWithoutProductsMetadata,
+      nameLower: (data as any).nameLower || data.name.toLowerCase(),
+      photos: processedPhotos,
+      category,
+      subcategory,
+      technology,
+      // No product field for consultations (Firestore doesn't allow undefined, so we omit it entirely)
+      productsMetadata: transformedProductsMetadata, // Empty array for consultations
+      blockingConditions: technology.blockingConditions,
+      contraindications: technology.contraindications || [],
+      contraindicationIds: technology.contraindications?.map(c => c.id) || [],
+      treatmentBenefits: technology.benefits,
+      treatmentBenefitIds: Array.isArray(technology.benefits) 
+        ? technology.benefits.map(b => typeof b === 'string' ? b : b.id)
+        : [],
+      preRequirements: technology.requirements.pre,
+      postRequirements: technology.requirements.post,
+      certificationRequirement: technology.certificationRequirement,
+      documentationTemplates: technology?.documentationTemplates || [],
+      clinicInfo,
+      doctorInfo,
+      reviewInfo: {
+        totalReviews: 0,
+        averageRating: 0,
+        effectivenessOfTreatment: 0,
+        outcomeExplanation: 0,
+        painManagement: 0,
+        followUpCare: 0,
+        valueForMoney: 0,
+        recommendationPercentage: 0,
+      },
+      isActive: true,
+    };
+
+    // Create the procedure document
+    const procedureRef = doc(this.db, PROCEDURES_COLLECTION, procedureId);
+    await setDoc(procedureRef, {
+      ...newProcedure,
+      createdAt: serverTimestamp(),
+      updatedAt: serverTimestamp(),
+    });
+
+    // Return the created procedure (fetch again to get server timestamps)
+    const savedDoc = await getDoc(procedureRef);
+    return savedDoc.data() as Procedure;
+  }
+
+  /**
+   * Gets all procedures with minimal info for map display (id, name, clinicId, clinicName, address, latitude, longitude)
+   * This is optimized for mobile map usage to reduce payload size.
+   * @returns Array of minimal procedure info for map
+   */
+  async getProceduresForMap(): Promise<
+    {
+      id: string;
+      name: string;
+      clinicId: string | undefined;
+      clinicName: string | undefined;
+      address: string;
+      latitude: number | undefined;
+      longitude: number | undefined;
+    }[]
+  > {
+    const proceduresRef = collection(this.db, PROCEDURES_COLLECTION);
+    const snapshot = await getDocs(proceduresRef);
+    let procedures = snapshot.docs.map(doc => ({
+      id: doc.id,
+      ...doc.data(),
+    } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+
+    const proceduresForMap = procedures.map(procedure => ({
+      id: procedure.id,
+      name: procedure.name,
+      clinicId: procedure.clinicInfo?.id,
+      clinicName: procedure.clinicInfo?.name,
+      address: procedure.clinicInfo?.location?.address || '',
+      latitude: procedure.clinicInfo?.location?.latitude,
+      longitude: procedure.clinicInfo?.location?.longitude,
+    }));
+    return proceduresForMap;
+  }
+
+  /**
+   * Gets procedures filtered by clinic and practitioner with optional family filter
+   * @param clinicBranchId Clinic branch ID to filter by
+   * @param practitionerId Practitioner ID to filter by
+   * @param filterByFamily If true, shows only procedures of the same family as the default procedure
+   * @param defaultProcedureId Optional default procedure ID to determine the family
+   * @returns Array of procedures
+   */
+  async getProceduresForConsultation(
+    clinicBranchId: string,
+    practitionerId: string,
+    filterByFamily: boolean = true,
+    defaultProcedureId?: string
+  ): Promise<Procedure[]> {
+    let familyToFilter: ProcedureFamily | null = null;
+
+    // If family filtering is enabled and we have a default procedure, get its family
+    if (filterByFamily && defaultProcedureId) {
+      const defaultProcedureRef = doc(this.db, PROCEDURES_COLLECTION, defaultProcedureId);
+      const defaultProcedureSnap = await getDoc(defaultProcedureRef);
+      
+      if (defaultProcedureSnap.exists()) {
+        const defaultProcedure = defaultProcedureSnap.data() as Procedure;
+        familyToFilter = defaultProcedure.family;
+      }
+    }
+
+    // Build query constraints
+    const constraints: QueryConstraint[] = [
+      where('clinicBranchId', '==', clinicBranchId),
+      where('practitionerId', '==', practitionerId),
+      where('isActive', '==', true),
+    ];
+
+    // Add family filter if applicable
+    if (filterByFamily && familyToFilter) {
+      constraints.push(where('family', '==', familyToFilter));
+    }
+
+    // Execute query
+    const proceduresQuery = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      ...constraints,
+      orderBy('name', 'asc')
+    );
+
+    const querySnapshot = await getDocs(proceduresQuery);
+    
+    let procedures = querySnapshot.docs.map(doc => ({
+      id: doc.id,
+      ...doc.data(),
+    } as Procedure));
+
+    // Filter out procedures with draft/inactive practitioners
+    procedures = await this.filterDraftPractitionerProcedures(procedures);
+    
+    return procedures;
+  }
+}