@blackcode_sa/metaestetics-api 1.12.46 → 1.12.47

package/dist/index.mjs

@@ -529,7 +529,8 @@ var recommendedProcedureTimeframeSchema = z3.object({
 });
 var recommendedProcedureSchema = z3.object({
   procedure: extendedProcedureInfoSchema,
-  note: z3.string().min(1, "Note is required").max(MAX_STRING_LENGTH_LONG, "Note too long"),
+  note: z3.string().max(MAX_STRING_LENGTH_LONG, "Note too long"),
+  // Note is now optional (no min length)
   timeframe: recommendedProcedureTimeframeSchema
 });
 var appointmentMetadataSchema = z3.object({
@@ -1739,7 +1740,7 @@ async function aggregateProductsFromProcedure(db, procedureId, existingProducts)
   }
   const procedureData = procedureSnap.data();
   const productsMetadata = procedureData.productsMetadata || [];
-  const newProducts = productsMetadata.map((pp) => {
+  const newProducts = productsMetadata.filter((pp) => pp && pp.product).map((pp) => {
     const product = pp.product;
     return {
       productId: product.id,
@@ -1792,7 +1793,7 @@ async function createExtendedProcedureInfo(db, procedureId) {
     // Access embedded technology
     procedureTechnologyName: data.technology.name,
     // Access embedded technology
-    procedureProducts: (data.productsMetadata || []).map((pp) => ({
+    procedureProducts: (data.productsMetadata || []).filter((pp) => pp && pp.product).map((pp) => ({
       productId: pp.product.id,
       // Access embedded product
       productName: pp.product.name,
@@ -1808,9 +1809,7 @@ async function addExtendedProcedureUtil(db, appointmentId, procedureId) {
   var _a;
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   const metadata = initializeMetadata(appointment);
-  const existingProcedure = (_a = metadata.extendedProcedures) == null ? void 0 : _a.find(
-    (p) => p.procedureId === procedureId
-  );
+  const existingProcedure = (_a = metadata.extendedProcedures) == null ? void 0 : _a.find((p) => p.procedureId === procedureId);
   if (existingProcedure) {
     throw new Error(`Procedure ${procedureId} is already added to this appointment`);
   }
@@ -1841,7 +1840,10 @@ async function addExtendedProcedureUtil(db, appointmentId, procedureId) {
     );
     updatedLinkedFormIds = [...updatedLinkedFormIds, ...formInitResult.allLinkedFormIds];
     updatedLinkedForms = [...updatedLinkedForms, ...formInitResult.initializedFormsInfo];
-    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...formInitResult.pendingUserFormsIds];
+    updatedPendingUserFormsIds = [
+      ...updatedPendingUserFormsIds,
+      ...formInitResult.pendingUserFormsIds
+    ];
   }
   const extendedProcedures = [...metadata.extendedProcedures || [], extendedProcedureInfo];
   const appointmentRef = doc5(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -1861,9 +1863,7 @@ async function removeExtendedProcedureUtil(db, appointmentId, procedureId) {
   if (!metadata.extendedProcedures || metadata.extendedProcedures.length === 0) {
     throw new Error("No extended procedures found for this appointment");
   }
-  const procedureIndex = metadata.extendedProcedures.findIndex(
-    (p) => p.procedureId === procedureId
-  );
+  const procedureIndex = metadata.extendedProcedures.findIndex((p) => p.procedureId === procedureId);
   if (procedureIndex === -1) {
     throw new Error(`Extended procedure ${procedureId} not found in this appointment`);
   }
@@ -1871,6 +1871,20 @@ async function removeExtendedProcedureUtil(db, appointmentId, procedureId) {
   const updatedProducts = (metadata.appointmentProducts || []).filter(
     (p) => p.procedureId !== procedureId
   );
+  const updatedZonesData = { ...metadata.zonesData || {} };
+  let productsRemovedFromZones = 0;
+  Object.keys(updatedZonesData).forEach((zoneId) => {
+    const originalLength = updatedZonesData[zoneId].length;
+    updatedZonesData[zoneId] = updatedZonesData[zoneId].filter((item) => {
+      if (item.type === "note") return true;
+      if (item.type === "item" && item.belongingProcedureId !== procedureId) return true;
+      return false;
+    });
+    productsRemovedFromZones += originalLength - updatedZonesData[zoneId].length;
+  });
+  console.log(
+    `\u{1F5D1}\uFE0F [removeExtendedProcedure] Removed ${productsRemovedFromZones} products from zones for procedure ${procedureId}`
+  );
   const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
   const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter(
     (formId) => !removedFormIds.includes(formId)
@@ -1885,6 +1899,7 @@ async function removeExtendedProcedureUtil(db, appointmentId, procedureId) {
   await updateDoc4(appointmentRef, {
     "metadata.extendedProcedures": metadata.extendedProcedures,
     "metadata.appointmentProducts": updatedProducts,
+    "metadata.zonesData": updatedZonesData,
     linkedFormIds: updatedLinkedFormIds,
     linkedForms: updatedLinkedForms,
     pendingUserFormsIds: updatedPendingUserFormsIds,
@@ -1923,7 +1938,7 @@ async function createExtendedProcedureInfoForRecommended(db, procedureId) {
     procedureSubCategoryName: data.subcategory.name,
     procedureTechnologyId: data.technology.id,
     procedureTechnologyName: data.technology.name,
-    procedureProducts: (data.productsMetadata || []).map((pp) => ({
+    procedureProducts: (data.productsMetadata || []).filter((pp) => pp && pp.product).map((pp) => ({
       productId: pp.product.id,
       productName: pp.product.name,
       brandId: pp.product.brandId,
@@ -8747,15 +8762,8 @@ var PractitionerService = class extends BaseService {
         price: 0,
         currency: "EUR" /* EUR */,
         pricingMeasure: "per_session" /* PER_SESSION */,
-        productsMetadata: [
-          {
-            productId: "free-consultation-product",
-            price: 0,
-            currency: "EUR" /* EUR */,
-            pricingMeasure: "per_session" /* PER_SESSION */,
-            isDefault: true
-          }
-        ],
+        productsMetadata: void 0,
+        // No products needed for consultations
         duration: 30,
         // 30 minutes consultation
         practitionerId,
@@ -16562,11 +16570,11 @@ var createProcedureSchema = z26.object({
   categoryId: z26.string().min(1),
   subcategoryId: z26.string().min(1),
   technologyId: z26.string().min(1),
-  productId: z26.string().min(1),
+  productId: z26.string().min(1).optional(),
   price: z26.number().min(0),
   currency: z26.nativeEnum(Currency),
   pricingMeasure: z26.nativeEnum(PricingMeasure),
-  productsMetadata: z26.array(procedureProductDataSchema).min(1),
+  productsMetadata: z26.array(procedureProductDataSchema).min(1).optional(),
   duration: z26.number().min(1).max(480),
   // Max 8 hours
   practitionerId: z26.string().min(1),
@@ -16603,10 +16611,10 @@ var procedureSchema = z26.object({
   // We'll validate the full subcategory object separately
   technology: z26.any(),
   // We'll validate the full technology object separately
-  product: z26.any(),
-  // We'll validate the full product object separately
-  productsMetadata: z26.array(storedProcedureProductSchema).min(1),
-  // Use stored format schema
+  product: z26.any().optional(),
+  // We'll validate the full product object separately (optional for consultations)
+  productsMetadata: z26.array(storedProcedureProductSchema).optional(),
+  // Use stored format schema (optional for consultations)
   price: z26.number().min(0),
   currency: z26.nativeEnum(Currency),
   pricingMeasure: z26.nativeEnum(PricingMeasure),
@@ -16699,11 +16707,14 @@ var ProcedureService = class extends BaseService {
   }
   /**
    * Transforms validated procedure product data (with productId) to ProcedureProduct objects (with full product)
-   * @param productsMetadata Array of validated procedure product data
+   * @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
    */
   async transformProductsMetadata(productsMetadata, technologyId) {
+    if (!productsMetadata || productsMetadata.length === 0) {
+      return [];
+    }
     const transformedProducts = [];
     for (const productData of productsMetadata) {
       const product = await this.productService.getById(technologyId, productData.productId);
@@ -16730,12 +16741,16 @@ var ProcedureService = class extends BaseService {
   async createProcedure(data) {
     var _a, _b, _c;
     const validatedData = createProcedureSchema.parse(data);
+    if (!validatedData.productId) {
+      throw new Error("productId is required for regular procedures. Use createConsultationProcedure for product-free procedures.");
+    }
     const procedureId = this.generateId();
     const [category, subcategory, technology, product] = await Promise.all([
       this.categoryService.getById(validatedData.categoryId),
       this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
       this.technologyService.getById(validatedData.technologyId),
       this.productService.getById(validatedData.technologyId, validatedData.productId)
+      // Safe: validated above
     ]);
     if (!category || !subcategory || !technology || !product) {
       throw new Error("One or more required base entities not found");
@@ -16844,6 +16859,9 @@ var ProcedureService = class extends BaseService {
     if (!practitionerIds || practitionerIds.length === 0) {
       throw new Error("Practitioner IDs array cannot be empty.");
     }
+    if (!baseData.productId) {
+      throw new Error("productId is required for regular procedures. Use createConsultationProcedure for product-free procedures.");
+    }
     const validationData = { ...baseData, practitionerId: practitionerIds[0] };
     const validatedData = createProcedureSchema.parse(validationData);
     const [category, subcategory, technology, product, clinicSnapshot] = await Promise.all([
@@ -16851,6 +16869,7 @@ var ProcedureService = class extends BaseService {
       this.subcategoryService.getById(validatedData.categoryId, validatedData.subcategoryId),
       this.technologyService.getById(validatedData.technologyId),
       this.productService.getById(validatedData.technologyId, validatedData.productId),
+      // Safe: validated above
       getDoc37(doc36(this.db, CLINICS_COLLECTION, validatedData.clinicBranchId))
     ]);
     if (!category || !subcategory || !technology || !product) {
@@ -17711,20 +17730,6 @@ var ProcedureService = class extends BaseService {
       rating: ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0,
       services: practitioner.procedures || []
     };
-    const consultationProduct = {
-      id: "consultation-no-product",
-      name: "No Product Required",
-      description: "Consultation procedures do not require specific products",
-      brandId: "consultation-brand",
-      brandName: "Consultation",
-      technologyId: data.technologyId,
-      technologyName: technology.name,
-      categoryId: technology.categoryId,
-      subcategoryId: technology.subcategoryId,
-      isActive: true,
-      createdAt: /* @__PURE__ */ new Date(),
-      updatedAt: /* @__PURE__ */ new Date()
-    };
     const { productsMetadata: _, ...dataWithoutProductsMetadata } = data;
     const newProcedure = {
       id: procedureId,
@@ -17734,10 +17739,10 @@ var ProcedureService = class extends BaseService {
       category,
       subcategory,
       technology,
-      product: consultationProduct,
-      // Use placeholder product
+      product: void 0,
+      // No product needed for consultations
       productsMetadata: transformedProductsMetadata,
-      // Use transformed data, not original
+      // Empty array for consultations
       blockingConditions: technology.blockingConditions,
       contraindications: technology.contraindications || [],
       contraindicationIds: ((_b = technology.contraindications) == null ? void 0 : _b.map((c) => c.id)) || [],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.12.46",
+  "version": "1.12.47",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/admin/booking/booking.admin.ts

@@ -1004,29 +1004,33 @@ export class BookingAdmin {
       procedureTechnologyName: procedureTechnology?.name || "",
       procedureProductBrandId: procedureProduct?.brandId || "",
       procedureProductBrandName: procedureProduct?.brandName || "",
-      procedureProducts: productsMetadata.map((pp: any) => ({
-        productId: pp.product.id,
-        productName: pp.product.name,
-        brandId: pp.product.brandId,
-        brandName: pp.product.brandName,
-      })),
+      procedureProducts: productsMetadata
+        .filter((pp: any) => pp && pp.product) // Safety check for product-free procedures
+        .map((pp: any) => ({
+          productId: pp.product.id,
+          productName: pp.product.name,
+          brandId: pp.product.brandId,
+          brandName: pp.product.brandName,
+        })),
     };
   }
 
   private _generateAppointmentProductsFromProcedure(procedure: Procedure): any[] {
     const productsMetadata = procedure.productsMetadata || [];
     
-    return productsMetadata.map((pp: any) => {
-      const product = pp.product;
-      return {
-        productId: product.id,
-        productName: product.name,
-        brandId: product.brandId,
-        brandName: product.brandName,
-        procedureId: procedure.id,
-        price: pp.price,
-        currency: pp.currency,
-        unitOfMeasurement: pp.pricingMeasure,
+    return productsMetadata
+      .filter((pp: any) => pp && pp.product) // Safety check for product-free procedures
+      .map((pp: any) => {
+        const product = pp.product;
+        return {
+          productId: product.id,
+          productName: product.name,
+          brandId: product.brandId,
+          brandName: product.brandName,
+          procedureId: procedure.id,
+          price: pp.price,
+          currency: pp.currency,
+          unitOfMeasurement: pp.pricingMeasure,
       };
     });
   }

package/src/admin/free-consultation/free-consultation-utils.admin.ts

@@ -7,11 +7,11 @@ import {
 import { CATEGORIES_COLLECTION } from '../../backoffice/types/category.types';
 import { SUBCATEGORIES_COLLECTION } from '../../backoffice/types/subcategory.types';
 import { TECHNOLOGIES_COLLECTION } from '../../backoffice/types/technology.types';
-import { PRODUCTS_COLLECTION } from '../../backoffice/types/product.types';
 
 /**
  * Ensures that the free consultation infrastructure exists in the database
- * Creates category, subcategory, technology, and product if they don't exist
+ * Creates category, subcategory, and technology if they don't exist
+ * Note: Consultations are product-free procedures, so no product is created
  * @param db - Firestore database instance (optional, defaults to admin.firestore())
  * @returns Promise<boolean> - Always returns true after ensuring infrastructure exists
  */
@@ -54,7 +54,7 @@ export async function freeConsultationInfrastructure(
 
 /**
  * Creates the complete free consultation infrastructure
- * Creates category, subcategory, technology, and product in the correct order
+ * Creates category, subcategory, and technology (no product needed)
  * @param db - Firestore database instance
  */
 async function createFreeConsultationInfrastructure(db: admin.firestore.Firestore): Promise<void> {
@@ -125,33 +125,6 @@ async function createFreeConsultationInfrastructure(db: admin.firestore.Firestor
   };
   batch.set(technologyRef, technologyData);
 
-  // 4. Create Product: "free-consultation-product"
-  const productRef = db
-    .collection(TECHNOLOGIES_COLLECTION)
-    .doc('free-consultation-tech')
-    .collection(PRODUCTS_COLLECTION)
-    .doc('free-consultation-product');
-
-  const productData = {
-    id: 'free-consultation-product',
-    name: 'Free Consultation Service',
-    description: 'No physical product required for consultation services',
-    brandId: 'consultation-brand',
-    brandName: 'Consultation Services',
-    technologyId: 'free-consultation-tech',
-    technologyName: 'Free Consultation Technology',
-    categoryId: 'consultation',
-    subcategoryId: 'free-consultation',
-    isActive: true,
-    createdAt: now,
-    updatedAt: now,
-    technicalDetails: 'Virtual consultation service - no physical product required',
-    warnings: [],
-    indications: ['Initial patient assessment', 'Treatment planning', 'Patient education'],
-    contraindications: [],
-  };
-  batch.set(productRef, productData);
-
   // Commit all changes atomically
   await batch.commit();
 
@@ -159,5 +132,5 @@ async function createFreeConsultationInfrastructure(db: admin.firestore.Firestor
   console.log('  ✓ Category: consultation');
   console.log('  ✓ Subcategory: free-consultation');
   console.log('  ✓ Technology: free-consultation-tech');
-  console.log('  ✓ Product: free-consultation-product');
+  console.log('  ℹ No product needed - consultations are product-free procedures');
 }

package/src/services/appointment/utils/appointment.utils.ts

@@ -135,8 +135,8 @@ export async function fetchAggregatedInfoUtil(
       categoryName: procedureData.category?.name || '',
       subcategoryName: procedureData.subcategory?.name || '',
       technologyName: procedureData.technology?.name || '',
-      brandName: procedureData.product?.brand || '',
-      productName: procedureData.product?.name || '',
+      brandName: procedureData.product?.brandName || '', // Safe: optional chaining
+      productName: procedureData.product?.name || '', // Safe: optional chaining
       price: procedureData.price || 0,
       pricingMeasure: procedureData.pricingMeasure,
       currency: procedureData.currency,

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

@@ -7,7 +7,10 @@ import {
 } from '../../../types/appointment';
 import { getAppointmentOrThrow, initializeMetadata } from './zone-management.utils';
 import { PROCEDURES_COLLECTION } from '../../../types/procedure';
-import { initializeFormsForExtendedProcedure, removeFormsForExtendedProcedure } from './form-initialization.utils';
+import {
+  initializeFormsForExtendedProcedure,
+  removeFormsForExtendedProcedure,
+} from './form-initialization.utils';
 
 /**
  * Aggregates products from a procedure into appointmentProducts
@@ -19,7 +22,7 @@ import { initializeFormsForExtendedProcedure, removeFormsForExtendedProcedure }
 async function aggregateProductsFromProcedure(
   db: Firestore,
   procedureId: string,
-  existingProducts: AppointmentProductMetadata[]
+  existingProducts: AppointmentProductMetadata[],
 ): Promise<AppointmentProductMetadata[]> {
   const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
   const procedureSnap = await getDoc(procedureRef);
@@ -34,21 +37,24 @@ async function aggregateProductsFromProcedure(
   const productsMetadata = procedureData.productsMetadata || [];
 
   // Map procedure products to AppointmentProductMetadata
-  const newProducts: AppointmentProductMetadata[] = productsMetadata.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
-    };
-  });
+  // 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>();
@@ -78,7 +84,7 @@ async function aggregateProductsFromProcedure(
  */
 async function createExtendedProcedureInfo(
   db: Firestore,
-  procedureId: string
+  procedureId: string,
 ): Promise<ExtendedProcedureInfo> {
   const procedureRef = doc(db, PROCEDURES_COLLECTION, procedureId);
   const procedureSnap = await getDoc(procedureRef);
@@ -92,19 +98,21 @@ async function createExtendedProcedureInfo(
   return {
     procedureId: procedureId,
     procedureName: data.name,
-    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
+    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 || []).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
-    })),
+    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
+      })),
   };
 }
 
@@ -119,15 +127,13 @@ async function createExtendedProcedureInfo(
 export async function addExtendedProcedureUtil(
   db: Firestore,
   appointmentId: string,
-  procedureId: 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
-  );
+  const existingProcedure = metadata.extendedProcedures?.find(p => p.procedureId === procedureId);
   if (existingProcedure) {
     throw new Error(`Procedure ${procedureId} is already added to this appointment`);
   }
@@ -138,18 +144,18 @@ export async function addExtendedProcedureUtil(
   // 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 || []
+    metadata.appointmentProducts || [],
   );
 
   // Initialize forms for extended procedure
@@ -165,13 +171,16 @@ export async function addExtendedProcedureUtil(
       procedureData.documentationTemplates,
       appointment.patientId,
       appointment.practitionerId,
-      appointment.clinicBranchId
+      appointment.clinicBranchId,
     );
 
     // Merge form IDs and info
     updatedLinkedFormIds = [...updatedLinkedFormIds, ...formInitResult.allLinkedFormIds];
     updatedLinkedForms = [...updatedLinkedForms, ...formInitResult.initializedFormsInfo];
-    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...formInitResult.pendingUserFormsIds];
+    updatedPendingUserFormsIds = [
+      ...updatedPendingUserFormsIds,
+      ...formInitResult.pendingUserFormsIds,
+    ];
   }
 
   // Add extended procedure
@@ -193,7 +202,10 @@ export async function addExtendedProcedureUtil(
 
 /**
  * Removes an extended procedure from an appointment
- * Also removes associated products from appointmentProducts
+ * 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
@@ -202,7 +214,7 @@ export async function addExtendedProcedureUtil(
 export async function removeExtendedProcedureUtil(
   db: Firestore,
   appointmentId: string,
-  procedureId: string
+  procedureId: string,
 ): Promise<Appointment> {
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   const metadata = initializeMetadata(appointment);
@@ -212,9 +224,7 @@ export async function removeExtendedProcedureUtil(
   }
 
   // Find and remove the procedure
-  const procedureIndex = metadata.extendedProcedures.findIndex(
-    p => p.procedureId === procedureId
-  );
+  const procedureIndex = metadata.extendedProcedures.findIndex(p => p.procedureId === procedureId);
   if (procedureIndex === -1) {
     throw new Error(`Extended procedure ${procedureId} not found in this appointment`);
   }
@@ -222,23 +232,42 @@ export async function removeExtendedProcedureUtil(
   // Remove procedure
   metadata.extendedProcedures.splice(procedureIndex, 1);
 
-  // Remove products associated with this procedure
+  // Remove products associated with this procedure from appointmentProducts
   const updatedProducts = (metadata.appointmentProducts || []).filter(
-    p => p.procedureId !== procedureId
+    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
   const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter(
-    formId => !removedFormIds.includes(formId)
+    formId => !removedFormIds.includes(formId),
   );
   const updatedLinkedForms = (appointment.linkedForms || []).filter(
-    form => !removedFormIds.includes(form.formId)
+    form => !removedFormIds.includes(form.formId),
   );
   const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter(
-    formId => !removedFormIds.includes(formId)
+    formId => !removedFormIds.includes(formId),
   );
 
   // Update appointment
@@ -246,6 +275,7 @@ export async function removeExtendedProcedureUtil(
   await updateDoc(appointmentRef, {
     'metadata.extendedProcedures': metadata.extendedProcedures,
     'metadata.appointmentProducts': updatedProducts,
+    'metadata.zonesData': updatedZonesData,
     linkedFormIds: updatedLinkedFormIds,
     linkedForms: updatedLinkedForms,
     pendingUserFormsIds: updatedPendingUserFormsIds,
@@ -263,7 +293,7 @@ export async function removeExtendedProcedureUtil(
  */
 export async function getExtendedProceduresUtil(
   db: Firestore,
-  appointmentId: string
+  appointmentId: string,
 ): Promise<ExtendedProcedureInfo[]> {
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   return appointment.metadata?.extendedProcedures || [];
@@ -277,9 +307,8 @@ export async function getExtendedProceduresUtil(
  */
 export async function getAppointmentProductsUtil(
   db: Firestore,
-  appointmentId: string
+  appointmentId: string,
 ): Promise<AppointmentProductMetadata[]> {
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   return appointment.metadata?.appointmentProducts || [];
 }
-

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

@@ -38,12 +38,14 @@ async function createExtendedProcedureInfoForRecommended(
     procedureSubCategoryName: data.subcategory.name,
     procedureTechnologyId: data.technology.id,
     procedureTechnologyName: data.technology.name,
-    procedureProducts: (data.productsMetadata || []).map((pp: any) => ({
-      productId: pp.product.id,
-      productName: pp.product.name,
-      brandId: pp.product.brandId,
-      brandName: pp.product.brandName,
-    })),
+    procedureProducts: (data.productsMetadata || [])
+      .filter((pp: any) => pp && pp.product) // Safety check for product-free procedures
+      .map((pp: any) => ({
+        productId: pp.product.id,
+        productName: pp.product.name,
+        brandId: pp.product.brandId,
+        brandName: pp.product.brandName,
+      })),
   };
 }