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

package/src/services/appointment/utils/extended-procedure.utils.ts

@@ -1,354 +1,354 @@
-import { Firestore, updateDoc, serverTimestamp, doc, getDoc } from 'firebase/firestore';
-import {
-  Appointment,
-  ExtendedProcedureInfo,
-  AppointmentProductMetadata,
-  APPOINTMENTS_COLLECTION,
-  LinkedFormInfo,
-} from '../../../types/appointment';
-import { getAppointmentOrThrow, initializeMetadata } from './zone-management.utils';
-import { PROCEDURES_COLLECTION } from '../../../types/procedure';
-import {
-  initializeFormsForExtendedProcedure,
-  removeFormsForExtendedProcedure,
-} from './form-initialization.utils';
-
-/**
- * Aggregates products from a procedure into appointmentProducts
- * @param db Firestore instance
- * @param procedureId Procedure ID to fetch
- * @param existingProducts Current appointment products
- * @returns Updated appointment products array
- */
-async function aggregateProductsFromProcedure(
-  db: Firestore,
-  procedureId: string,
-  existingProducts: AppointmentProductMetadata[],
-): Promise<AppointmentProductMetadata[]> {
-  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
-  const procedureSnap = await getDoc(procedureRef);
-
-  if (!procedureSnap.exists()) {
-    throw new Error(`Procedure with ID ${procedureId} not found`);
-  }
-
-  const procedureData = procedureSnap.data();
-
-  // Get procedure products from productsMetadata array
-  const productsMetadata = procedureData.productsMetadata || [];
-
-  // Map procedure products to AppointmentProductMetadata
-  // Filter out any entries without products (safety check for product-free procedures like consultations)
-  const newProducts: AppointmentProductMetadata[] = productsMetadata
-    .filter((pp: any) => pp && pp.product)
-    .map((pp: any) => {
-    // Each item in productsMetadata is a ProcedureProduct with embedded Product
-    const product = pp.product;
-
-    return {
-      productId: product.id,
-      productName: product.name,
-      brandId: product.brandId,
-      brandName: product.brandName,
-      procedureId: procedureId,
-      price: pp.price, // Price from ProcedureProduct
-      currency: pp.currency, // Currency from ProcedureProduct
-      unitOfMeasurement: pp.pricingMeasure, // PricingMeasure from ProcedureProduct
-    };
-  });
-
-  // Merge with existing products, avoiding duplicates
-  const productMap = new Map<string, AppointmentProductMetadata>();
-
-  // Add existing products
-  existingProducts.forEach(p => {
-    const key = `${p.productId}-${p.procedureId}`;
-    productMap.set(key, p);
-  });
-
-  // Add new products
-  newProducts.forEach(p => {
-    const key = `${p.productId}-${p.procedureId}`;
-    if (!productMap.has(key)) {
-      productMap.set(key, p);
-    }
-  });
-
-  return Array.from(productMap.values());
-}
-
-/**
- * Creates ExtendedProcedureInfo from procedure document
- * @param db Firestore instance
- * @param procedureId Procedure ID
- * @returns Extended procedure info
- */
-async function createExtendedProcedureInfo(
-  db: Firestore,
-  procedureId: string,
-): Promise<ExtendedProcedureInfo> {
-  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
-  const procedureSnap = await getDoc(procedureRef);
-
-  if (!procedureSnap.exists()) {
-    throw new Error(`Procedure with ID ${procedureId} not found`);
-  }
-
-  const data = procedureSnap.data();
-
-  return {
-    procedureId: procedureId,
-    procedureName: data.name,
-    procedureDescription: data.description || '',
-    procedurePrice: data.price || 0,
-    procedureFamily: data.family, // Use embedded family object
-    procedureCategoryId: data.category.id, // Access embedded category
-    procedureCategoryName: data.category.name, // Access embedded category
-    procedureSubCategoryId: data.subcategory.id, // Access embedded subcategory
-    procedureSubCategoryName: data.subcategory.name, // Access embedded subcategory
-    procedureTechnologyId: data.technology.id, // Access embedded technology
-    procedureTechnologyName: data.technology.name, // Access embedded technology
-    procedureProducts: (data.productsMetadata || [])
-      .filter((pp: any) => pp && pp.product) // Safety check for product-free procedures
-      .map((pp: any) => ({
-      productId: pp.product.id, // Access embedded product
-      productName: pp.product.name, // Access embedded product
-      brandId: pp.product.brandId, // Access embedded product
-      brandName: pp.product.brandName, // Access embedded product
-    })),
-  };
-}
-
-/**
- * Adds an extended procedure to an appointment
- * Automatically aggregates products into appointmentProducts
- * @param db Firestore instance
- * @param appointmentId Appointment ID
- * @param procedureId Procedure ID to add
- * @returns Updated appointment
- */
-export async function addExtendedProcedureUtil(
-  db: Firestore,
-  appointmentId: string,
-  procedureId: string,
-): Promise<Appointment> {
-  const appointment = await getAppointmentOrThrow(db, appointmentId);
-  const metadata = initializeMetadata(appointment);
-
-  // Check if procedure is already added
-  const existingProcedure = metadata.extendedProcedures?.find(p => p.procedureId === procedureId);
-  if (existingProcedure) {
-    throw new Error(`Procedure ${procedureId} is already added to this appointment`);
-  }
-
-  // Create extended procedure info
-  const extendedProcedureInfo = await createExtendedProcedureInfo(db, procedureId);
-
-  // Get procedure data for forms and products
-  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
-  const procedureSnap = await getDoc(procedureRef);
-
-  if (!procedureSnap.exists()) {
-    throw new Error(`Procedure with ID ${procedureId} not found`);
-  }
-
-  const procedureData = procedureSnap.data();
-
-  // Aggregate products
-  const updatedProducts = await aggregateProductsFromProcedure(
-    db,
-    procedureId,
-    metadata.appointmentProducts || [],
-  );
-
-  // Initialize forms for extended procedure
-  let updatedLinkedFormIds = appointment.linkedFormIds || [];
-  let updatedLinkedForms = appointment.linkedForms || [];
-  let updatedPendingUserFormsIds = appointment.pendingUserFormsIds || [];
-
-  if (procedureData.documentationTemplates && procedureData.documentationTemplates.length > 0) {
-    const formInitResult = await initializeFormsForExtendedProcedure(
-      db,
-      appointmentId,
-      procedureId,
-      procedureData.documentationTemplates,
-      appointment.patientId,
-      appointment.practitionerId,
-      appointment.clinicBranchId,
-    );
-
-    // Merge form IDs and info with deduplication
-    // Deduplicate linkedFormIds by formId
-    const existingFormIds = new Set(updatedLinkedFormIds);
-    const newFormIds = formInitResult.allLinkedFormIds.filter(id => !existingFormIds.has(id));
-    updatedLinkedFormIds = [...updatedLinkedFormIds, ...newFormIds];
-    
-    // Deduplicate linkedForms by formId (keep existing entries, add only new ones)
-    const existingFormIdsInLinkedForms = new Set(updatedLinkedForms.map(f => f.formId));
-    const newLinkedForms = formInitResult.initializedFormsInfo.filter(
-      form => !existingFormIdsInLinkedForms.has(form.formId)
-    );
-    updatedLinkedForms = [...updatedLinkedForms, ...newLinkedForms];
-    
-    // Deduplicate pendingUserFormsIds
-    const existingPendingIds = new Set(updatedPendingUserFormsIds);
-    const newPendingIds = formInitResult.pendingUserFormsIds.filter(
-      id => !existingPendingIds.has(id)
-    );
-    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...newPendingIds];
-  }
-
-  // Add extended procedure
-  const extendedProcedures = [...(metadata.extendedProcedures || []), extendedProcedureInfo];
-
-  // Update appointment
-  const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  await updateDoc(appointmentRef, {
-    'metadata.extendedProcedures': extendedProcedures,
-    'metadata.appointmentProducts': updatedProducts,
-    linkedFormIds: updatedLinkedFormIds,
-    linkedForms: updatedLinkedForms,
-    pendingUserFormsIds: updatedPendingUserFormsIds,
-    updatedAt: serverTimestamp(),
-  });
-
-  return getAppointmentOrThrow(db, appointmentId);
-}
-
-/**
- * Removes an extended procedure from an appointment
- * Also removes:
- * - Associated products from appointmentProducts
- * - Associated products from zonesData (all zones)
- * - Associated forms
- * @param db Firestore instance
- * @param appointmentId Appointment ID
- * @param procedureId Procedure ID to remove
- * @returns Updated appointment
- */
-export async function removeExtendedProcedureUtil(
-  db: Firestore,
-  appointmentId: string,
-  procedureId: string,
-): Promise<Appointment> {
-  const appointment = await getAppointmentOrThrow(db, appointmentId);
-  const metadata = initializeMetadata(appointment);
-
-  if (!metadata.extendedProcedures || metadata.extendedProcedures.length === 0) {
-    throw new Error('No extended procedures found for this appointment');
-  }
-
-  // Find and remove the procedure
-  const procedureIndex = metadata.extendedProcedures.findIndex(p => p.procedureId === procedureId);
-  if (procedureIndex === -1) {
-    throw new Error(`Extended procedure ${procedureId} not found in this appointment`);
-  }
-
-  // Remove procedure
-  metadata.extendedProcedures.splice(procedureIndex, 1);
-
-  // Remove products associated with this procedure from appointmentProducts
-  const updatedProducts = (metadata.appointmentProducts || []).filter(
-    p => p.procedureId !== procedureId,
-  );
-
-  // Remove products from zonesData that belong to this procedure
-  const updatedZonesData = { ...(metadata.zonesData || {}) };
-  let productsRemovedFromZones = 0;
-
-  Object.keys(updatedZonesData).forEach(zoneId => {
-    const originalLength = updatedZonesData[zoneId].length;
-    updatedZonesData[zoneId] = updatedZonesData[zoneId].filter(item => {
-      // Keep notes and items that don't belong to this procedure
-      if (item.type === 'note') return true;
-      if (item.type === 'item' && item.belongingProcedureId !== procedureId) return true;
-      return false;
-    });
-    productsRemovedFromZones += originalLength - updatedZonesData[zoneId].length;
-  });
-
-  console.log(
-    `🗑️ [removeExtendedProcedure] Removed ${productsRemovedFromZones} products from zones for procedure ${procedureId}`,
-  );
-
-  // Remove forms associated with this procedure
-  const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
-
-  // Update appointment form arrays - remove forms that were deleted
-  // Also deduplicate to clean up any existing duplicates
-  const removedFormIdsSet = new Set(removedFormIds);
-  
-  // Deduplicate and filter linkedFormIds
-  const linkedFormIdsSet = new Set<string>();
-  const updatedLinkedFormIds = (appointment.linkedFormIds || [])
-    .filter(formId => {
-      if (removedFormIdsSet.has(formId)) return false;
-      if (linkedFormIdsSet.has(formId)) return false; // Deduplicate
-      linkedFormIdsSet.add(formId);
-      return true;
-    });
-  
-  // Deduplicate and filter linkedForms by formId
-  const linkedFormsMap = new Map<string, LinkedFormInfo>();
-  (appointment.linkedForms || []).forEach(form => {
-    if (!removedFormIdsSet.has(form.formId)) {
-      // Keep the first occurrence if duplicates exist
-      if (!linkedFormsMap.has(form.formId)) {
-        linkedFormsMap.set(form.formId, form);
-      }
-    }
-  });
-  const updatedLinkedForms = Array.from(linkedFormsMap.values());
-  
-  // Deduplicate and filter pendingUserFormsIds
-  const pendingIdsSet = new Set<string>();
-  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || [])
-    .filter(formId => {
-      if (removedFormIdsSet.has(formId)) return false;
-      if (pendingIdsSet.has(formId)) return false; // Deduplicate
-      pendingIdsSet.add(formId);
-      return true;
-    });
-
-  // Update appointment
-  const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  await updateDoc(appointmentRef, {
-    'metadata.extendedProcedures': metadata.extendedProcedures,
-    'metadata.appointmentProducts': updatedProducts,
-    'metadata.zonesData': updatedZonesData,
-    linkedFormIds: updatedLinkedFormIds,
-    linkedForms: updatedLinkedForms,
-    pendingUserFormsIds: updatedPendingUserFormsIds,
-    updatedAt: serverTimestamp(),
-  });
-
-  return getAppointmentOrThrow(db, appointmentId);
-}
-
-/**
- * Gets all extended procedures for an appointment
- * @param db Firestore instance
- * @param appointmentId Appointment ID
- * @returns Array of extended procedures
- */
-export async function getExtendedProceduresUtil(
-  db: Firestore,
-  appointmentId: string,
-): Promise<ExtendedProcedureInfo[]> {
-  const appointment = await getAppointmentOrThrow(db, appointmentId);
-  return appointment.metadata?.extendedProcedures || [];
-}
-
-/**
- * Gets all aggregated products for an appointment
- * @param db Firestore instance
- * @param appointmentId Appointment ID
- * @returns Array of appointment products
- */
-export async function getAppointmentProductsUtil(
-  db: Firestore,
-  appointmentId: string,
-): Promise<AppointmentProductMetadata[]> {
-  const appointment = await getAppointmentOrThrow(db, appointmentId);
-  return appointment.metadata?.appointmentProducts || [];
-}
+import { Firestore, updateDoc, serverTimestamp, doc, getDoc } from 'firebase/firestore';
+import {
+  Appointment,
+  ExtendedProcedureInfo,
+  AppointmentProductMetadata,
+  APPOINTMENTS_COLLECTION,
+  LinkedFormInfo,
+} from '../../../types/appointment';
+import { getAppointmentOrThrow, initializeMetadata } from './zone-management.utils';
+import { PROCEDURES_COLLECTION } from '../../../types/procedure';
+import {
+  initializeFormsForExtendedProcedure,
+  removeFormsForExtendedProcedure,
+} from './form-initialization.utils';
+
+/**
+ * Aggregates products from a procedure into appointmentProducts
+ * @param db Firestore instance
+ * @param procedureId Procedure ID to fetch
+ * @param existingProducts Current appointment products
+ * @returns Updated appointment products array
+ */
+async function aggregateProductsFromProcedure(
+  db: Firestore,
+  procedureId: string,
+  existingProducts: AppointmentProductMetadata[],
+): Promise<AppointmentProductMetadata[]> {
+  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
+  const procedureSnap = await getDoc(procedureRef);
+
+  if (!procedureSnap.exists()) {
+    throw new Error(`Procedure with ID ${procedureId} not found`);
+  }
+
+  const procedureData = procedureSnap.data();
+
+  // Get procedure products from productsMetadata array
+  const productsMetadata = procedureData.productsMetadata || [];
+
+  // Map procedure products to AppointmentProductMetadata
+  // Filter out any entries without products (safety check for product-free procedures like consultations)
+  const newProducts: AppointmentProductMetadata[] = productsMetadata
+    .filter((pp: any) => pp && pp.product)
+    .map((pp: any) => {
+    // Each item in productsMetadata is a ProcedureProduct with embedded Product
+    const product = pp.product;
+
+    return {
+      productId: product.id,
+      productName: product.name,
+      brandId: product.brandId,
+      brandName: product.brandName,
+      procedureId: procedureId,
+      price: pp.price, // Price from ProcedureProduct
+      currency: pp.currency, // Currency from ProcedureProduct
+      unitOfMeasurement: pp.pricingMeasure, // PricingMeasure from ProcedureProduct
+    };
+  });
+
+  // Merge with existing products, avoiding duplicates
+  const productMap = new Map<string, AppointmentProductMetadata>();
+
+  // Add existing products
+  existingProducts.forEach(p => {
+    const key = `${p.productId}-${p.procedureId}`;
+    productMap.set(key, p);
+  });
+
+  // Add new products
+  newProducts.forEach(p => {
+    const key = `${p.productId}-${p.procedureId}`;
+    if (!productMap.has(key)) {
+      productMap.set(key, p);
+    }
+  });
+
+  return Array.from(productMap.values());
+}
+
+/**
+ * Creates ExtendedProcedureInfo from procedure document
+ * @param db Firestore instance
+ * @param procedureId Procedure ID
+ * @returns Extended procedure info
+ */
+async function createExtendedProcedureInfo(
+  db: Firestore,
+  procedureId: string,
+): Promise<ExtendedProcedureInfo> {
+  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
+  const procedureSnap = await getDoc(procedureRef);
+
+  if (!procedureSnap.exists()) {
+    throw new Error(`Procedure with ID ${procedureId} not found`);
+  }
+
+  const data = procedureSnap.data();
+
+  return {
+    procedureId: procedureId,
+    procedureName: data.name,
+    procedureDescription: data.description || '',
+    procedurePrice: data.price || 0,
+    procedureFamily: data.family, // Use embedded family object
+    procedureCategoryId: data.category.id, // Access embedded category
+    procedureCategoryName: data.category.name, // Access embedded category
+    procedureSubCategoryId: data.subcategory.id, // Access embedded subcategory
+    procedureSubCategoryName: data.subcategory.name, // Access embedded subcategory
+    procedureTechnologyId: data.technology.id, // Access embedded technology
+    procedureTechnologyName: data.technology.name, // Access embedded technology
+    procedureProducts: (data.productsMetadata || [])
+      .filter((pp: any) => pp && pp.product) // Safety check for product-free procedures
+      .map((pp: any) => ({
+      productId: pp.product.id, // Access embedded product
+      productName: pp.product.name, // Access embedded product
+      brandId: pp.product.brandId, // Access embedded product
+      brandName: pp.product.brandName, // Access embedded product
+    })),
+  };
+}
+
+/**
+ * Adds an extended procedure to an appointment
+ * Automatically aggregates products into appointmentProducts
+ * @param db Firestore instance
+ * @param appointmentId Appointment ID
+ * @param procedureId Procedure ID to add
+ * @returns Updated appointment
+ */
+export async function addExtendedProcedureUtil(
+  db: Firestore,
+  appointmentId: string,
+  procedureId: string,
+): Promise<Appointment> {
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  const metadata = initializeMetadata(appointment);
+
+  // Check if procedure is already added
+  const existingProcedure = metadata.extendedProcedures?.find(p => p.procedureId === procedureId);
+  if (existingProcedure) {
+    throw new Error(`Procedure ${procedureId} is already added to this appointment`);
+  }
+
+  // Create extended procedure info
+  const extendedProcedureInfo = await createExtendedProcedureInfo(db, procedureId);
+
+  // Get procedure data for forms and products
+  const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
+  const procedureSnap = await getDoc(procedureRef);
+
+  if (!procedureSnap.exists()) {
+    throw new Error(`Procedure with ID ${procedureId} not found`);
+  }
+
+  const procedureData = procedureSnap.data();
+
+  // Aggregate products
+  const updatedProducts = await aggregateProductsFromProcedure(
+    db,
+    procedureId,
+    metadata.appointmentProducts || [],
+  );
+
+  // Initialize forms for extended procedure
+  let updatedLinkedFormIds = appointment.linkedFormIds || [];
+  let updatedLinkedForms = appointment.linkedForms || [];
+  let updatedPendingUserFormsIds = appointment.pendingUserFormsIds || [];
+
+  if (procedureData.documentationTemplates && procedureData.documentationTemplates.length > 0) {
+    const formInitResult = await initializeFormsForExtendedProcedure(
+      db,
+      appointmentId,
+      procedureId,
+      procedureData.documentationTemplates,
+      appointment.patientId,
+      appointment.practitionerId,
+      appointment.clinicBranchId,
+    );
+
+    // Merge form IDs and info with deduplication
+    // Deduplicate linkedFormIds by formId
+    const existingFormIds = new Set(updatedLinkedFormIds);
+    const newFormIds = formInitResult.allLinkedFormIds.filter(id => !existingFormIds.has(id));
+    updatedLinkedFormIds = [...updatedLinkedFormIds, ...newFormIds];
+    
+    // Deduplicate linkedForms by formId (keep existing entries, add only new ones)
+    const existingFormIdsInLinkedForms = new Set(updatedLinkedForms.map(f => f.formId));
+    const newLinkedForms = formInitResult.initializedFormsInfo.filter(
+      form => !existingFormIdsInLinkedForms.has(form.formId)
+    );
+    updatedLinkedForms = [...updatedLinkedForms, ...newLinkedForms];
+    
+    // Deduplicate pendingUserFormsIds
+    const existingPendingIds = new Set(updatedPendingUserFormsIds);
+    const newPendingIds = formInitResult.pendingUserFormsIds.filter(
+      id => !existingPendingIds.has(id)
+    );
+    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...newPendingIds];
+  }
+
+  // Add extended procedure
+  const extendedProcedures = [...(metadata.extendedProcedures || []), extendedProcedureInfo];
+
+  // Update appointment
+  const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
+  await updateDoc(appointmentRef, {
+    'metadata.extendedProcedures': extendedProcedures,
+    'metadata.appointmentProducts': updatedProducts,
+    linkedFormIds: updatedLinkedFormIds,
+    linkedForms: updatedLinkedForms,
+    pendingUserFormsIds: updatedPendingUserFormsIds,
+    updatedAt: serverTimestamp(),
+  });
+
+  return getAppointmentOrThrow(db, appointmentId);
+}
+
+/**
+ * Removes an extended procedure from an appointment
+ * Also removes:
+ * - Associated products from appointmentProducts
+ * - Associated products from zonesData (all zones)
+ * - Associated forms
+ * @param db Firestore instance
+ * @param appointmentId Appointment ID
+ * @param procedureId Procedure ID to remove
+ * @returns Updated appointment
+ */
+export async function removeExtendedProcedureUtil(
+  db: Firestore,
+  appointmentId: string,
+  procedureId: string,
+): Promise<Appointment> {
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  const metadata = initializeMetadata(appointment);
+
+  if (!metadata.extendedProcedures || metadata.extendedProcedures.length === 0) {
+    throw new Error('No extended procedures found for this appointment');
+  }
+
+  // Find and remove the procedure
+  const procedureIndex = metadata.extendedProcedures.findIndex(p => p.procedureId === procedureId);
+  if (procedureIndex === -1) {
+    throw new Error(`Extended procedure ${procedureId} not found in this appointment`);
+  }
+
+  // Remove procedure
+  metadata.extendedProcedures.splice(procedureIndex, 1);
+
+  // Remove products associated with this procedure from appointmentProducts
+  const updatedProducts = (metadata.appointmentProducts || []).filter(
+    p => p.procedureId !== procedureId,
+  );
+
+  // Remove products from zonesData that belong to this procedure
+  const updatedZonesData = { ...(metadata.zonesData || {}) };
+  let productsRemovedFromZones = 0;
+
+  Object.keys(updatedZonesData).forEach(zoneId => {
+    const originalLength = updatedZonesData[zoneId].length;
+    updatedZonesData[zoneId] = updatedZonesData[zoneId].filter(item => {
+      // Keep notes and items that don't belong to this procedure
+      if (item.type === 'note') return true;
+      if (item.type === 'item' && item.belongingProcedureId !== procedureId) return true;
+      return false;
+    });
+    productsRemovedFromZones += originalLength - updatedZonesData[zoneId].length;
+  });
+
+  console.log(
+    `🗑️ [removeExtendedProcedure] Removed ${productsRemovedFromZones} products from zones for procedure ${procedureId}`,
+  );
+
+  // Remove forms associated with this procedure
+  const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
+
+  // Update appointment form arrays - remove forms that were deleted
+  // Also deduplicate to clean up any existing duplicates
+  const removedFormIdsSet = new Set(removedFormIds);
+  
+  // Deduplicate and filter linkedFormIds
+  const linkedFormIdsSet = new Set<string>();
+  const updatedLinkedFormIds = (appointment.linkedFormIds || [])
+    .filter(formId => {
+      if (removedFormIdsSet.has(formId)) return false;
+      if (linkedFormIdsSet.has(formId)) return false; // Deduplicate
+      linkedFormIdsSet.add(formId);
+      return true;
+    });
+  
+  // Deduplicate and filter linkedForms by formId
+  const linkedFormsMap = new Map<string, LinkedFormInfo>();
+  (appointment.linkedForms || []).forEach(form => {
+    if (!removedFormIdsSet.has(form.formId)) {
+      // Keep the first occurrence if duplicates exist
+      if (!linkedFormsMap.has(form.formId)) {
+        linkedFormsMap.set(form.formId, form);
+      }
+    }
+  });
+  const updatedLinkedForms = Array.from(linkedFormsMap.values());
+  
+  // Deduplicate and filter pendingUserFormsIds
+  const pendingIdsSet = new Set<string>();
+  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || [])
+    .filter(formId => {
+      if (removedFormIdsSet.has(formId)) return false;
+      if (pendingIdsSet.has(formId)) return false; // Deduplicate
+      pendingIdsSet.add(formId);
+      return true;
+    });
+
+  // Update appointment
+  const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
+  await updateDoc(appointmentRef, {
+    'metadata.extendedProcedures': metadata.extendedProcedures,
+    'metadata.appointmentProducts': updatedProducts,
+    'metadata.zonesData': updatedZonesData,
+    linkedFormIds: updatedLinkedFormIds,
+    linkedForms: updatedLinkedForms,
+    pendingUserFormsIds: updatedPendingUserFormsIds,
+    updatedAt: serverTimestamp(),
+  });
+
+  return getAppointmentOrThrow(db, appointmentId);
+}
+
+/**
+ * Gets all extended procedures for an appointment
+ * @param db Firestore instance
+ * @param appointmentId Appointment ID
+ * @returns Array of extended procedures
+ */
+export async function getExtendedProceduresUtil(
+  db: Firestore,
+  appointmentId: string,
+): Promise<ExtendedProcedureInfo[]> {
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  return appointment.metadata?.extendedProcedures || [];
+}
+
+/**
+ * Gets all aggregated products for an appointment
+ * @param db Firestore instance
+ * @param appointmentId Appointment ID
+ * @returns Array of appointment products
+ */
+export async function getAppointmentProductsUtil(
+  db: Firestore,
+  appointmentId: string,
+): Promise<AppointmentProductMetadata[]> {
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  return appointment.metadata?.appointmentProducts || [];
+}