@blackcode_sa/metaestetics-api 1.14.47 → 1.14.50

package/dist/admin/index.d.mts

@@ -1711,6 +1711,7 @@ interface ZoneItemData {
     parentZone: string;
     subzones: string[];
     notes?: string;
+    notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
     createdAt?: string;

package/dist/admin/index.d.ts

@@ -1711,6 +1711,7 @@ interface ZoneItemData {
     parentZone: string;
     subzones: string[];
     notes?: string;
+    notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
     createdAt?: string;

package/dist/index.d.mts

@@ -5648,6 +5648,7 @@ interface ZoneItemData {
     parentZone: string;
     subzones: string[];
     notes?: string;
+    notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
     createdAt?: string;
@@ -7735,6 +7736,16 @@ declare class AppointmentService extends BaseService {
      * @returns The updated appointment
      */
     updateZonePhotoNoteVisibility(appointmentId: string, zoneId: string, photoIndex: number, noteType: 'before' | 'after', visibleToPatient: boolean, doctorId: string): Promise<Appointment>;
+    /**
+     * Updates visibility of notes for a zone item (product or standalone note)
+     *
+     * @param appointmentId ID of the appointment
+     * @param zoneId Zone ID
+     * @param itemIndex Index of the item in the zone
+     * @param notesVisibleToPatient Whether the notes should be visible to patient
+     * @returns The updated appointment
+     */
+    updateZoneItemNoteVisibility(appointmentId: string, zoneId: string, itemIndex: number, notesVisibleToPatient: boolean): Promise<Appointment>;
     /**
      * Gets a specific photo entry from a zone
      *

package/dist/index.d.ts

@@ -5648,6 +5648,7 @@ interface ZoneItemData {
     parentZone: string;
     subzones: string[];
     notes?: string;
+    notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
     createdAt?: string;
@@ -7735,6 +7736,16 @@ declare class AppointmentService extends BaseService {
      * @returns The updated appointment
      */
     updateZonePhotoNoteVisibility(appointmentId: string, zoneId: string, photoIndex: number, noteType: 'before' | 'after', visibleToPatient: boolean, doctorId: string): Promise<Appointment>;
+    /**
+     * Updates visibility of notes for a zone item (product or standalone note)
+     *
+     * @param appointmentId ID of the appointment
+     * @param zoneId Zone ID
+     * @param itemIndex Index of the item in the zone
+     * @param notesVisibleToPatient Whether the notes should be visible to patient
+     * @returns The updated appointment
+     */
+    updateZoneItemNoteVisibility(appointmentId: string, zoneId: string, itemIndex: number, notesVisibleToPatient: boolean): Promise<Appointment>;
     /**
      * Gets a specific photo entry from a zone
      *

package/dist/index.js

@@ -4996,21 +4996,15 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       );
       continue;
     }
-    if (templateRef.isUserForm) {
-      console.log(
-        `[FormInit] Skipping user form ${templateRef.templateId} for extended procedure ${procedureId}.`
-      );
-      continue;
-    }
     const isRequired = templateRef.isRequired;
-    const formSubcollectionPath = DOCTOR_FORMS_SUBCOLLECTION;
+    const isUserForm = templateRef.isUserForm || false;
+    const formSubcollectionPath = isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
     const appointmentRef = (0, import_firestore9.doc)(db, APPOINTMENTS_COLLECTION, appointmentId);
     const formsCollectionRef = (0, import_firestore9.collection)(appointmentRef, formSubcollectionPath);
     const filledDocumentData = {
       templateId: templateRef.templateId,
       templateVersion: template.version,
-      isUserForm: false,
-      // Always false for extended procedures
+      isUserForm,
       isRequired,
       appointmentId,
       procedureId,
@@ -5025,14 +5019,16 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
     try {
       const docRef = await (0, import_firestore9.addDoc)(formsCollectionRef, filledDocumentData);
       const filledDocumentId = docRef.id;
+      if (isUserForm && isRequired) {
+        pendingUserFormsIds.push(filledDocumentId);
+      }
       allLinkedFormIds.push(filledDocumentId);
       const linkedForm = {
         formId: filledDocumentId,
         templateId: template.id,
         templateVersion: template.version,
         title: template.title,
-        isUserForm: false,
-        // Always false for extended procedures
+        isUserForm,
         isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: "pending" /* PENDING */,
@@ -5040,7 +5036,7 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       };
       initializedFormsInfo.push(linkedForm);
       console.log(
-        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
+        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}, isUserForm: ${isUserForm}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
       );
     } catch (error) {
       console.error(
@@ -5074,6 +5070,26 @@ async function removeFormsForExtendedProcedure(db, appointmentId, procedureId) {
       );
     }
   }
+  const userFormsRef = (0, import_firestore9.collection)(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = (0, import_firestore9.query)(
+    userFormsRef,
+    (0, import_firestore9.where)("procedureId", "==", procedureId)
+  );
+  const userFormsSnap = await (0, import_firestore9.getDocs)(userFormsQuery);
+  for (const formDoc of userFormsSnap.docs) {
+    try {
+      await (0, import_firestore9.deleteDoc)(formDoc.ref);
+      removedFormIds.push(formDoc.id);
+      console.log(
+        `[FormInit] Removed user form ${formDoc.id} for extended procedure ${procedureId} from appointment ${appointmentId}.`
+      );
+    } catch (error) {
+      console.error(
+        `[FormInit] Error removing user form ${formDoc.id}:`,
+        error
+      );
+    }
+  }
   return removedFormIds;
 }
 
@@ -7005,6 +7021,28 @@ var AppointmentService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * Updates visibility of notes for a zone item (product or standalone note)
+   *
+   * @param appointmentId ID of the appointment
+   * @param zoneId Zone ID
+   * @param itemIndex Index of the item in the zone
+   * @param notesVisibleToPatient Whether the notes should be visible to patient
+   * @returns The updated appointment
+   */
+  async updateZoneItemNoteVisibility(appointmentId, zoneId, itemIndex, notesVisibleToPatient) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Updating zone item note visibility at index ${itemIndex} for zone ${zoneId} to ${notesVisibleToPatient}`
+      );
+      return await updateZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, {
+        notesVisibleToPatient
+      });
+    } catch (error) {
+      console.error(`[APPOINTMENT_SERVICE] Error updating zone item note visibility:`, error);
+      throw error;
+    }
+  }
   /**
    * Gets a specific photo entry from a zone
    *
@@ -7033,7 +7071,13 @@ var AppointmentService = class extends BaseService {
    * @returns The updated appointment
    */
   async updateFinalizationNotes(appointmentId, sharedNotes, internalNotes) {
+    var _a, _b, _c;
     try {
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] updateFinalizationNotes called:", {
+        appointmentId,
+        sharedNotes,
+        internalNotes
+      });
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment ${appointmentId} not found`);
@@ -7050,23 +7094,40 @@ var AppointmentService = class extends BaseService {
         finalizationNotesInternal: null,
         finalizationNotes: null
       };
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] Current metadata:", {
+        finalizationNotesShared: currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal: currentMetadata.finalizationNotesInternal,
+        finalizationNotes: currentMetadata.finalizationNotes
+      });
+      const metadataUpdate = {
+        selectedZones: currentMetadata.selectedZones,
+        zonePhotos: currentMetadata.zonePhotos,
+        zonesData: currentMetadata.zonesData || null,
+        appointmentProducts: currentMetadata.appointmentProducts || [],
+        extendedProcedures: currentMetadata.extendedProcedures || [],
+        recommendedProcedures: currentMetadata.recommendedProcedures || [],
+        finalbilling: currentMetadata.finalbilling,
+        finalizationNotesShared: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal: internalNotes !== void 0 ? internalNotes : currentMetadata.finalizationNotesInternal,
+        // Keep deprecated field for backward compatibility during migration
+        finalizationNotes: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
+      };
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] Update data metadata:", {
+        finalizationNotesShared: metadataUpdate.finalizationNotesShared,
+        finalizationNotesInternal: metadataUpdate.finalizationNotesInternal,
+        finalizationNotes: metadataUpdate.finalizationNotes
+      });
       const updateData = {
-        metadata: {
-          selectedZones: currentMetadata.selectedZones,
-          zonePhotos: currentMetadata.zonePhotos,
-          zonesData: currentMetadata.zonesData || null,
-          appointmentProducts: currentMetadata.appointmentProducts || [],
-          extendedProcedures: currentMetadata.extendedProcedures || [],
-          recommendedProcedures: currentMetadata.recommendedProcedures || [],
-          finalbilling: currentMetadata.finalbilling,
-          finalizationNotesShared: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotesShared,
-          finalizationNotesInternal: internalNotes !== void 0 ? internalNotes : currentMetadata.finalizationNotesInternal,
-          // Keep deprecated field for backward compatibility during migration
-          finalizationNotes: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
-        },
+        metadata: metadataUpdate,
         updatedAt: (0, import_firestore14.serverTimestamp)()
       };
-      return await this.updateAppointment(appointmentId, updateData);
+      const result = await this.updateAppointment(appointmentId, updateData);
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] After update, result metadata:", {
+        finalizationNotesShared: (_a = result.metadata) == null ? void 0 : _a.finalizationNotesShared,
+        finalizationNotesInternal: (_b = result.metadata) == null ? void 0 : _b.finalizationNotesInternal,
+        finalizationNotes: (_c = result.metadata) == null ? void 0 : _c.finalizationNotes
+      });
+      return result;
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error updating finalization notes:`, error);
       throw error;

package/dist/index.mjs

@@ -4882,21 +4882,15 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       );
       continue;
     }
-    if (templateRef.isUserForm) {
-      console.log(
-        `[FormInit] Skipping user form ${templateRef.templateId} for extended procedure ${procedureId}.`
-      );
-      continue;
-    }
     const isRequired = templateRef.isRequired;
-    const formSubcollectionPath = DOCTOR_FORMS_SUBCOLLECTION;
+    const isUserForm = templateRef.isUserForm || false;
+    const formSubcollectionPath = isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
     const appointmentRef = doc6(db, APPOINTMENTS_COLLECTION, appointmentId);
     const formsCollectionRef = collection5(appointmentRef, formSubcollectionPath);
     const filledDocumentData = {
       templateId: templateRef.templateId,
       templateVersion: template.version,
-      isUserForm: false,
-      // Always false for extended procedures
+      isUserForm,
       isRequired,
       appointmentId,
       procedureId,
@@ -4911,14 +4905,16 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
     try {
       const docRef = await addDoc(formsCollectionRef, filledDocumentData);
       const filledDocumentId = docRef.id;
+      if (isUserForm && isRequired) {
+        pendingUserFormsIds.push(filledDocumentId);
+      }
       allLinkedFormIds.push(filledDocumentId);
       const linkedForm = {
         formId: filledDocumentId,
         templateId: template.id,
         templateVersion: template.version,
         title: template.title,
-        isUserForm: false,
-        // Always false for extended procedures
+        isUserForm,
         isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: "pending" /* PENDING */,
@@ -4926,7 +4922,7 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       };
       initializedFormsInfo.push(linkedForm);
       console.log(
-        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
+        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}, isUserForm: ${isUserForm}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
       );
     } catch (error) {
       console.error(
@@ -4960,6 +4956,26 @@ async function removeFormsForExtendedProcedure(db, appointmentId, procedureId) {
       );
     }
   }
+  const userFormsRef = collection5(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = query5(
+    userFormsRef,
+    where5("procedureId", "==", procedureId)
+  );
+  const userFormsSnap = await getDocs5(userFormsQuery);
+  for (const formDoc of userFormsSnap.docs) {
+    try {
+      await deleteDoc2(formDoc.ref);
+      removedFormIds.push(formDoc.id);
+      console.log(
+        `[FormInit] Removed user form ${formDoc.id} for extended procedure ${procedureId} from appointment ${appointmentId}.`
+      );
+    } catch (error) {
+      console.error(
+        `[FormInit] Error removing user form ${formDoc.id}:`,
+        error
+      );
+    }
+  }
   return removedFormIds;
 }
 
@@ -6891,6 +6907,28 @@ var AppointmentService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * Updates visibility of notes for a zone item (product or standalone note)
+   *
+   * @param appointmentId ID of the appointment
+   * @param zoneId Zone ID
+   * @param itemIndex Index of the item in the zone
+   * @param notesVisibleToPatient Whether the notes should be visible to patient
+   * @returns The updated appointment
+   */
+  async updateZoneItemNoteVisibility(appointmentId, zoneId, itemIndex, notesVisibleToPatient) {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Updating zone item note visibility at index ${itemIndex} for zone ${zoneId} to ${notesVisibleToPatient}`
+      );
+      return await updateZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, {
+        notesVisibleToPatient
+      });
+    } catch (error) {
+      console.error(`[APPOINTMENT_SERVICE] Error updating zone item note visibility:`, error);
+      throw error;
+    }
+  }
   /**
    * Gets a specific photo entry from a zone
    *
@@ -6919,7 +6957,13 @@ var AppointmentService = class extends BaseService {
    * @returns The updated appointment
    */
   async updateFinalizationNotes(appointmentId, sharedNotes, internalNotes) {
+    var _a, _b, _c;
     try {
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] updateFinalizationNotes called:", {
+        appointmentId,
+        sharedNotes,
+        internalNotes
+      });
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment ${appointmentId} not found`);
@@ -6936,23 +6980,40 @@ var AppointmentService = class extends BaseService {
         finalizationNotesInternal: null,
         finalizationNotes: null
       };
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] Current metadata:", {
+        finalizationNotesShared: currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal: currentMetadata.finalizationNotesInternal,
+        finalizationNotes: currentMetadata.finalizationNotes
+      });
+      const metadataUpdate = {
+        selectedZones: currentMetadata.selectedZones,
+        zonePhotos: currentMetadata.zonePhotos,
+        zonesData: currentMetadata.zonesData || null,
+        appointmentProducts: currentMetadata.appointmentProducts || [],
+        extendedProcedures: currentMetadata.extendedProcedures || [],
+        recommendedProcedures: currentMetadata.recommendedProcedures || [],
+        finalbilling: currentMetadata.finalbilling,
+        finalizationNotesShared: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal: internalNotes !== void 0 ? internalNotes : currentMetadata.finalizationNotesInternal,
+        // Keep deprecated field for backward compatibility during migration
+        finalizationNotes: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
+      };
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] Update data metadata:", {
+        finalizationNotesShared: metadataUpdate.finalizationNotesShared,
+        finalizationNotesInternal: metadataUpdate.finalizationNotesInternal,
+        finalizationNotes: metadataUpdate.finalizationNotes
+      });
       const updateData = {
-        metadata: {
-          selectedZones: currentMetadata.selectedZones,
-          zonePhotos: currentMetadata.zonePhotos,
-          zonesData: currentMetadata.zonesData || null,
-          appointmentProducts: currentMetadata.appointmentProducts || [],
-          extendedProcedures: currentMetadata.extendedProcedures || [],
-          recommendedProcedures: currentMetadata.recommendedProcedures || [],
-          finalbilling: currentMetadata.finalbilling,
-          finalizationNotesShared: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotesShared,
-          finalizationNotesInternal: internalNotes !== void 0 ? internalNotes : currentMetadata.finalizationNotesInternal,
-          // Keep deprecated field for backward compatibility during migration
-          finalizationNotes: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
-        },
+        metadata: metadataUpdate,
         updatedAt: serverTimestamp7()
       };
-      return await this.updateAppointment(appointmentId, updateData);
+      const result = await this.updateAppointment(appointmentId, updateData);
+      console.log("\u{1F50D} [APPOINTMENT_SERVICE] After update, result metadata:", {
+        finalizationNotesShared: (_a = result.metadata) == null ? void 0 : _a.finalizationNotesShared,
+        finalizationNotesInternal: (_b = result.metadata) == null ? void 0 : _b.finalizationNotesInternal,
+        finalizationNotes: (_c = result.metadata) == null ? void 0 : _c.finalizationNotes
+      });
+      return result;
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error updating finalization notes:`, error);
       throw error;

package/package.json

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

package/src/services/appointment/appointment.service.ts

@@ -2200,6 +2200,34 @@ export class AppointmentService extends BaseService {
     }
   }
 
+  /**
+   * Updates visibility of notes for a zone item (product or standalone note)
+   *
+   * @param appointmentId ID of the appointment
+   * @param zoneId Zone ID
+   * @param itemIndex Index of the item in the zone
+   * @param notesVisibleToPatient Whether the notes should be visible to patient
+   * @returns The updated appointment
+   */
+  async updateZoneItemNoteVisibility(
+    appointmentId: string,
+    zoneId: string,
+    itemIndex: number,
+    notesVisibleToPatient: boolean,
+  ): Promise<Appointment> {
+    try {
+      console.log(
+        `[APPOINTMENT_SERVICE] Updating zone item note visibility at index ${itemIndex} for zone ${zoneId} to ${notesVisibleToPatient}`,
+      );
+      return await updateZoneItemUtil(this.db, appointmentId, zoneId, itemIndex, {
+        notesVisibleToPatient,
+      });
+    } catch (error) {
+      console.error(`[APPOINTMENT_SERVICE] Error updating zone item note visibility:`, error);
+      throw error;
+    }
+  }
+
   /**
    * Gets a specific photo entry from a zone
    *
@@ -2238,6 +2266,12 @@ export class AppointmentService extends BaseService {
     internalNotes?: string | null,
   ): Promise<Appointment> {
     try {
+      console.log('🔍 [APPOINTMENT_SERVICE] updateFinalizationNotes called:', {
+        appointmentId,
+        sharedNotes,
+        internalNotes,
+      });
+
       const appointment = await this.getAppointmentById(appointmentId);
       if (!appointment) {
         throw new Error(`Appointment ${appointmentId} not found`);
@@ -2256,29 +2290,51 @@ export class AppointmentService extends BaseService {
         finalizationNotes: null,
       };
 
+      console.log('🔍 [APPOINTMENT_SERVICE] Current metadata:', {
+        finalizationNotesShared: currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal: currentMetadata.finalizationNotesInternal,
+        finalizationNotes: currentMetadata.finalizationNotes,
+      });
+
+      const metadataUpdate = {
+        selectedZones: currentMetadata.selectedZones,
+        zonePhotos: currentMetadata.zonePhotos,
+        zonesData: currentMetadata.zonesData || null,
+        appointmentProducts: currentMetadata.appointmentProducts || [],
+        extendedProcedures: currentMetadata.extendedProcedures || [],
+        recommendedProcedures: currentMetadata.recommendedProcedures || [],
+        finalbilling: currentMetadata.finalbilling,
+        finalizationNotesShared:
+          sharedNotes !== undefined ? sharedNotes : currentMetadata.finalizationNotesShared,
+        finalizationNotesInternal:
+          internalNotes !== undefined ? internalNotes : currentMetadata.finalizationNotesInternal,
+        // Keep deprecated field for backward compatibility during migration
+        finalizationNotes:
+          sharedNotes !== undefined
+            ? sharedNotes
+            : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared,
+      };
+
+      console.log('🔍 [APPOINTMENT_SERVICE] Update data metadata:', {
+        finalizationNotesShared: metadataUpdate.finalizationNotesShared,
+        finalizationNotesInternal: metadataUpdate.finalizationNotesInternal,
+        finalizationNotes: metadataUpdate.finalizationNotes,
+      });
+
       const updateData: UpdateAppointmentData = {
-        metadata: {
-          selectedZones: currentMetadata.selectedZones,
-          zonePhotos: currentMetadata.zonePhotos,
-          zonesData: currentMetadata.zonesData || null,
-          appointmentProducts: currentMetadata.appointmentProducts || [],
-          extendedProcedures: currentMetadata.extendedProcedures || [],
-          recommendedProcedures: currentMetadata.recommendedProcedures || [],
-          finalbilling: currentMetadata.finalbilling,
-          finalizationNotesShared:
-            sharedNotes !== undefined ? sharedNotes : currentMetadata.finalizationNotesShared,
-          finalizationNotesInternal:
-            internalNotes !== undefined ? internalNotes : currentMetadata.finalizationNotesInternal,
-          // Keep deprecated field for backward compatibility during migration
-          finalizationNotes:
-            sharedNotes !== undefined
-              ? sharedNotes
-              : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared,
-        },
+        metadata: metadataUpdate,
         updatedAt: serverTimestamp(),
       };
 
-      return await this.updateAppointment(appointmentId, updateData);
+      const result = await this.updateAppointment(appointmentId, updateData);
+      
+      console.log('🔍 [APPOINTMENT_SERVICE] After update, result metadata:', {
+        finalizationNotesShared: result.metadata?.finalizationNotesShared,
+        finalizationNotesInternal: result.metadata?.finalizationNotesInternal,
+        finalizationNotes: result.metadata?.finalizationNotes,
+      });
+
+      return result;
     } catch (error) {
       console.error(`[APPOINTMENT_SERVICE] Error updating finalization notes:`, error);
       throw error;

package/src/services/appointment/utils/form-initialization.utils.ts

@@ -3,6 +3,7 @@ import {
   DocumentTemplate,
   FilledDocumentStatus,
   DOCTOR_FORMS_SUBCOLLECTION,
+  USER_FORMS_SUBCOLLECTION,
   DOCUMENTATION_TEMPLATES_COLLECTION,
 } from '../../../types/documentation-templates';
 import {
@@ -77,7 +78,7 @@ export async function initializeFormsForExtendedProcedure(
     }
   }
 
-  // Initialize forms for each template (only doctor forms for extended procedures)
+  // Initialize forms for each template (both user forms and doctor forms for extended procedures)
   for (const templateRef of technologyTemplates) {
     const template = templatesMap.get(templateRef.templateId);
     if (!template) {
@@ -87,16 +88,11 @@ export async function initializeFormsForExtendedProcedure(
       continue;
     }
 
-    // Skip user forms - only create doctor forms for extended procedures
-    if (templateRef.isUserForm) {
-      console.log(
-        `[FormInit] Skipping user form ${templateRef.templateId} for extended procedure ${procedureId}.`
-      );
-      continue;
-    }
-
     const isRequired = templateRef.isRequired;
-    const formSubcollectionPath = DOCTOR_FORMS_SUBCOLLECTION;
+    const isUserForm = templateRef.isUserForm || false;
+    const formSubcollectionPath = isUserForm
+      ? USER_FORMS_SUBCOLLECTION
+      : DOCTOR_FORMS_SUBCOLLECTION;
 
     // Create form document in subcollection
     const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -105,7 +101,7 @@ export async function initializeFormsForExtendedProcedure(
     const filledDocumentData = {
       templateId: templateRef.templateId,
       templateVersion: template.version,
-      isUserForm: false, // Always false for extended procedures
+      isUserForm: isUserForm,
       isRequired: isRequired,
       appointmentId: appointmentId,
       procedureId: procedureId,
@@ -122,7 +118,10 @@ export async function initializeFormsForExtendedProcedure(
       const docRef = await addDoc(formsCollectionRef, filledDocumentData);
       const filledDocumentId = docRef.id;
 
-      // No user forms for extended procedures, so no pending user forms
+      // Add to pendingUserFormsIds if it's a required user form
+      if (isUserForm && isRequired) {
+        pendingUserFormsIds.push(filledDocumentId);
+      }
 
       allLinkedFormIds.push(filledDocumentId);
 
@@ -131,7 +130,7 @@ export async function initializeFormsForExtendedProcedure(
         templateId: template.id,
         templateVersion: template.version,
         title: template.title,
-        isUserForm: false, // Always false for extended procedures
+        isUserForm: isUserForm,
         isRequired: isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: FilledDocumentStatus.PENDING,
@@ -140,7 +139,7 @@ export async function initializeFormsForExtendedProcedure(
       initializedFormsInfo.push(linkedForm);
 
       console.log(
-        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
+        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}, isUserForm: ${isUserForm}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
       );
     } catch (error) {
       console.error(
@@ -155,6 +154,7 @@ export async function initializeFormsForExtendedProcedure(
 
 /**
  * Removes all forms associated with a specific procedure from an appointment
+ * Removes both user forms and doctor forms
  * @param db Firestore instance
  * @param appointmentId Appointment ID
  * @param procedureId Procedure ID to remove forms for
@@ -167,11 +167,10 @@ export async function removeFormsForExtendedProcedure(
 ): Promise<string[]> {
   const removedFormIds: string[] = [];
 
-  // Only remove from doctor forms subcollection (no user forms for extended procedures)
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
 
-  // Query doctor forms for this procedure
+  // Remove from doctor forms subcollection
+  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
   const doctorFormsQuery = query(
     doctorFormsRef,
     where('procedureId', '==', procedureId)
@@ -193,6 +192,29 @@ export async function removeFormsForExtendedProcedure(
     }
   }
 
+  // Remove from user forms subcollection
+  const userFormsRef = collection(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = query(
+    userFormsRef,
+    where('procedureId', '==', procedureId)
+  );
+  const userFormsSnap = await getDocs(userFormsQuery);
+
+  for (const formDoc of userFormsSnap.docs) {
+    try {
+      await deleteDoc(formDoc.ref);
+      removedFormIds.push(formDoc.id);
+      console.log(
+        `[FormInit] Removed user form ${formDoc.id} for extended procedure ${procedureId} from appointment ${appointmentId}.`
+      );
+    } catch (error) {
+      console.error(
+        `[FormInit] Error removing user form ${formDoc.id}:`,
+        error
+      );
+    }
+  }
+
   return removedFormIds;
 }
 
@@ -211,9 +233,9 @@ export async function getFormsForExtendedProcedure(
   const formIds: string[] = [];
 
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
 
   // Query doctor forms for this procedure
+  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
   const doctorFormsQuery = query(
     doctorFormsRef,
     where('procedureId', '==', procedureId)
@@ -221,5 +243,14 @@ export async function getFormsForExtendedProcedure(
   const doctorFormsSnap = await getDocs(doctorFormsQuery);
   doctorFormsSnap.docs.forEach(doc => formIds.push(doc.id));
 
+  // Query user forms for this procedure
+  const userFormsRef = collection(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = query(
+    userFormsRef,
+    where('procedureId', '==', procedureId)
+  );
+  const userFormsSnap = await getDocs(userFormsQuery);
+  userFormsSnap.docs.forEach(doc => formIds.push(doc.id));
+
   return formIds;
 }

package/src/types/appointment/index.ts

@@ -166,6 +166,7 @@ export interface ZoneItemData {
   parentZone: string; // Zone key in format "category.zone" (e.g., "face.forehead")
   subzones: string[];
   notes?: string;
+  notesVisibleToPatient?: boolean; // Whether notes are visible to patient (privacy-first, default false)
   subtotal?: number;
   ionNumber?: string;
   createdAt?: string; // ISO timestamp