npm - @blackcode_sa/metaestetics-api - Versions diffs - 1.14.56 → 1.14.58 - Mend

@blackcode_sa/metaestetics-api 1.14.56 → 1.14.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/admin/index.d.mts +9 -2
package/dist/admin/index.d.ts +9 -2
package/dist/admin/index.js +366 -2
package/dist/admin/index.mjs +366 -2
package/dist/index.d.mts +24 -3
package/dist/index.d.ts +24 -3
package/dist/index.js +195 -42
package/dist/index.mjs +324 -168
package/package.json +1 -1
package/src/admin/mailing/appointment/appointment.mailing.service.ts +383 -2
package/src/services/appointment/appointment.service.ts +41 -9
package/src/services/appointment/utils/extended-procedure.utils.ts +1 -0
package/src/services/appointment/utils/form-initialization.utils.ts +2 -0
package/src/services/appointment/utils/zone-management.utils.ts +50 -3
package/src/services/appointment/utils/zone-photo.utils.ts +39 -1
package/src/services/procedure/procedure.service.ts +137 -40
package/src/types/appointment/index.ts +4 -2
package/src/validations/appointment.schema.ts +2 -1

package/package.json CHANGED Viewed

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

package/src/admin/mailing/appointment/appointment.mailing.service.ts CHANGED Viewed

@@ -411,6 +411,285 @@ const clinicAppointmentRequestedTemplate = `
 </html>
 `;
+const appointmentRescheduledProposalTemplate = `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Appointment Reschedule Proposal</title>
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: linear-gradient(135deg, #a48a76 0%, #67574A 100%);
+            min-height: 100vh;
+        }
+        .email-container {
+            max-width: 600px;
+            margin: 0 auto;
+            background: #ffffff;
+            border-radius: 20px;
+            overflow: hidden;
+            box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+            margin-top: 40px;
+            margin-bottom: 40px;
+        }
+        .header {
+            background: linear-gradient(135deg, #ff9800 0%, #f57c00 100%);
+            padding: 40px 30px;
+            text-align: center;
+            color: white;
+        }
+        .header h1 {
+            margin: 0;
+            font-size: 28px;
+            font-weight: 300;
+            letter-spacing: 1px;
+        }
+        .header .subtitle {
+            margin: 10px 0 0 0;
+            font-size: 16px;
+            opacity: 0.9;
+            font-weight: 300;
+        }
+        .content {
+            padding: 40px 30px;
+        }
+        .greeting {
+            font-size: 18px;
+            color: #333;
+            margin-bottom: 25px;
+            font-weight: 400;
+        }
+        .info-box {
+            background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
+            border-radius: 15px;
+            padding: 25px;
+            margin: 25px 0;
+            border-left: 5px solid #ff9800;
+        }
+        .info-box p {
+            margin: 0;
+            color: #e65100;
+            font-size: 15px;
+            font-weight: 500;
+            line-height: 1.6;
+        }
+        .time-comparison {
+            display: grid;
+            gap: 20px;
+            margin: 25px 0;
+        }
+        .time-card {
+            background: linear-gradient(135deg, #f8f6f5 0%, #f5f3f2 100%);
+            border-radius: 15px;
+            padding: 25px;
+            border-left: 5px solid #a48a76;
+        }
+        .time-card.old-time {
+            border-left-color: #9e9e9e;
+            opacity: 0.8;
+        }
+        .time-card.new-time {
+            border-left-color: #ff9800;
+            background: linear-gradient(135deg, #fff8e1 0%, #ffe0b2 100%);
+        }
+        .time-label {
+            font-size: 14px;
+            font-weight: 600;
+            color: #666;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            margin-bottom: 10px;
+        }
+        .time-label.old {
+            color: #757575;
+        }
+        .time-label.new {
+            color: #f57c00;
+        }
+        .appointment-card {
+            background: linear-gradient(135deg, #f8f6f5 0%, #f5f3f2 100%);
+            border-radius: 15px;
+            padding: 30px;
+            margin: 25px 0;
+            border-left: 5px solid #a48a76;
+        }
+        .appointment-title {
+            font-size: 20px;
+            color: #a48a76;
+            margin-bottom: 20px;
+            font-weight: 600;
+        }
+        .appointment-details {
+            display: grid;
+            gap: 15px;
+        }
+        .detail-row {
+            display: flex;
+            align-items: center;
+            padding: 8px 0;
+        }
+        .detail-label {
+            font-weight: 600;
+            color: #555;
+            min-width: 120px;
+            font-size: 14px;
+        }
+        .detail-value {
+            color: #333;
+            font-size: 16px;
+            font-weight: 500;
+        }
+        .procedure-name {
+            color: #67574A;
+            font-weight: 600;
+        }
+        .clinic-name {
+            color: #a48a76;
+            font-weight: 600;
+        }
+        .action-section {
+            background: linear-gradient(135deg, #e8f5e9 0%, #c8e6c9 100%);
+            border-radius: 15px;
+            padding: 30px;
+            margin: 30px 0;
+            text-align: center;
+            border-left: 5px solid #4caf50;
+        }
+        .action-section h3 {
+            margin: 0 0 15px 0;
+            color: #2e7d32;
+            font-weight: 600;
+            font-size: 18px;
+        }
+        .action-section p {
+            margin: 0 0 20px 0;
+            color: #555;
+            font-size: 15px;
+            line-height: 1.6;
+        }
+        .footer {
+            background: #f8f9fa;
+            padding: 25px 30px;
+            text-align: center;
+            color: #666;
+            font-size: 14px;
+            border-top: 1px solid #eee;
+        }
+        .logo {
+            font-size: 24px;
+            font-weight: 700;
+            color: white;
+            margin-bottom: 5px;
+        }
+        .divider {
+            height: 2px;
+            background: linear-gradient(90deg, #a48a76, #67574A);
+            margin: 25px 0;
+            border-radius: 1px;
+        }
+        .icon {
+            text-align: center;
+            margin: 20px 0;
+            font-size: 48px;
+        }
+        .arrow {
+            text-align: center;
+            font-size: 32px;
+            color: #ff9800;
+            margin: 10px 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="email-container">
+        <div class="header">
+            <div class="logo">MetaEstetics</div>
+            <h1>Appointment Reschedule Proposal</h1>
+            <div class="subtitle">Action Required</div>
+        </div>
+        <div class="content">
+            <div class="icon">📅</div>
+            <div class="greeting">
+                Dear <strong>{{patientName}}</strong>,
+            </div>
+            <p style="color: #555; font-size: 16px; line-height: 1.6; margin-bottom: 25px;">
+                We hope this message finds you well. We need to propose a new time for your upcoming appointment. Please review the details below and confirm if the new time works for you.
+            </p>
+            <div class="info-box">
+                <p><strong>⚠️ Important:</strong> Please respond to this reschedule proposal as soon as possible. Your appointment will remain pending until you confirm or reject the new time.</p>
+            </div>
+            <div class="appointment-card">
+                <div class="appointment-title">📋 Appointment Details</div>
+                <div class="appointment-details">
+                    <div class="detail-row">
+                        <div class="detail-label">Procedure:</div>
+                        <div class="detail-value procedure-name">{{procedureName}}</div>
+                    </div>
+                    <div class="detail-row">
+                        <div class="detail-label">Practitioner:</div>
+                        <div class="detail-value">{{practitionerName}}</div>
+                    </div>
+                    <div class="detail-row">
+                        <div class="detail-label">Location:</div>
+                        <div class="detail-value clinic-name">{{clinicName}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="time-comparison">
+                <div class="time-card old-time">
+                    <div class="time-label old">Previous Time</div>
+                    <div style="font-size: 18px; font-weight: 600; color: #424242; margin-bottom: 8px;">{{previousDate}}</div>
+                    <div style="font-size: 16px; color: #616161;">{{previousTime}}</div>
+                </div>
+                <div class="arrow">↓</div>
+                <div class="time-card new-time">
+                    <div class="time-label new">Proposed New Time</div>
+                    <div style="font-size: 18px; font-weight: 600; color: #e65100; margin-bottom: 8px;">{{newDate}}</div>
+                    <div style="font-size: 16px; color: #f57c00; font-weight: 500;">{{newTime}}</div>
+                </div>
+            </div>
+            <div class="divider"></div>
+            <div class="action-section">
+                <h3>What's Next?</h3>
+                <p>
+                    Please open the MetaEstetics app to accept or reject this reschedule proposal.
+                    If the new time works for you, simply tap "Accept Reschedule".
+                    If not, you can reject it and we'll work with you to find an alternative time.
+                </p>
+            </div>
+            <p style="color: #555; font-size: 14px; line-height: 1.6; margin-top: 25px;">
+                <strong>Need Help?</strong> If you have any questions or concerns about this reschedule, please contact us directly through the app or reach out to {{clinicName}}.
+            </p>
+        </div>
+        <div class="footer">
+            <p style="margin: 0 0 10px 0;">
+                <strong>MetaEstetics</strong> - Premium Aesthetic Services
+            </p>
+            <p style="margin: 0; font-size: 12px; color: #999;">
+                This is an automated message. Please do not reply to this email.
+            </p>
+        </div>
+    </div>
+</body>
+</html>
+`;
 // --- Interface Definitions for Email Data ---
 export interface AppointmentEmailDataBase {
@@ -707,13 +986,115 @@ export class AppointmentMailingService extends BaseMailingService {
     return Promise.resolve();
   }
+  /**
+   * Sends a reschedule proposal email to the patient
+   * @param data - Appointment reschedule proposal email data
+   * @returns Promise with the sending result
+   */
   async sendAppointmentRescheduledProposalEmail(
     data: AppointmentRescheduledProposalEmailData,
   ): Promise<any> {
     Logger.info(
-      `[AppointmentMailingService] Placeholder for sendAppointmentRescheduledProposalEmail to patient: ${data.patientProfile.id}`,
+      `[AppointmentMailingService] Preparing to send reschedule proposal email to patient: ${data.patientProfile.id}`,
     );
-    return Promise.resolve();
+    const recipientEmail = data.patientProfile.email;
+    if (!recipientEmail) {
+      Logger.error('[AppointmentMailingService] Patient email not found for reschedule proposal.', {
+        patientId: data.patientProfile.id,
+      });
+      throw new Error('Patient email address is missing.');
+    }
+    // Get clinic timezone from appointment data, default to UTC if not available
+    const clinicTimezone = data.appointment.clinic_tz || 'UTC';
+    Logger.debug('[AppointmentMailingService] Formatting appointment times for reschedule', {
+      clinicTimezone,
+      previousTime: data.previousStartTime.toDate().toISOString(),
+      newTime: data.appointment.appointmentStartTime.toDate().toISOString(),
+    });
+    // Format previous time
+    const previousFormattedTime = this.formatTimestampInClinicTimezone(
+      data.previousStartTime,
+      clinicTimezone,
+      'time',
+    );
+    const previousFormattedDate = this.formatTimestampInClinicTimezone(
+      data.previousStartTime,
+      clinicTimezone,
+      'date',
+    );
+    const previousTimezoneName = this.getTimezoneDisplayName(clinicTimezone);
+    // Format new proposed time
+    const newFormattedTime = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      'time',
+    );
+    const newFormattedDate = this.formatTimestampInClinicTimezone(
+      data.appointment.appointmentStartTime,
+      clinicTimezone,
+      'date',
+    );
+    const newTimezoneName = this.getTimezoneDisplayName(clinicTimezone);
+    const templateVariables = {
+      patientName: data.appointment.patientInfo.fullName,
+      procedureName: data.appointment.procedureInfo.name,
+      practitionerName: data.appointment.practitionerInfo.name,
+      clinicName: data.appointment.clinicInfo.name,
+      previousDate: previousFormattedDate,
+      previousTime: `${previousFormattedTime} (${previousTimezoneName})`,
+      newDate: newFormattedDate,
+      newTime: `${newFormattedTime} (${newTimezoneName})`,
+    };
+    const html = this.renderTemplate(appointmentRescheduledProposalTemplate, templateVariables);
+    const subject =
+      data.options?.customSubject ||
+      `Action Required: Reschedule Proposal for Your ${data.appointment.procedureInfo.name} Appointment`;
+    const fromAddress =
+      data.options?.fromAddress ||
+      `MetaEstetics <no-reply@${data.options?.mailgunDomain || this.DEFAULT_MAILGUN_DOMAIN}>`;
+    const domainToSendFrom = data.options?.mailgunDomain || this.DEFAULT_MAILGUN_DOMAIN;
+    const mailgunSendData = {
+      to: recipientEmail,
+      from: fromAddress,
+      subject,
+      html,
+    };
+    try {
+      const result = await this.sendEmail(domainToSendFrom, mailgunSendData);
+      await this.logEmailAttempt(
+        { to: recipientEmail, subject, templateName: 'appointment_rescheduled_proposal' },
+        true,
+      );
+      Logger.info(
+        `[AppointmentMailingService] Successfully sent reschedule proposal email to ${recipientEmail}`,
+      );
+      return result;
+    } catch (error) {
+      await this.logEmailAttempt(
+        {
+          to: recipientEmail,
+          subject,
+          templateName: 'appointment_rescheduled_proposal',
+        },
+        false,
+        error,
+      );
+      Logger.error(
+        `[AppointmentMailingService] Error sending reschedule proposal email to ${recipientEmail}:`,
+        error,
+      );
+      throw error;
+    }
   }
   async sendReviewRequestEmail(data: ReviewRequestEmailData): Promise<any> {

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

@@ -16,6 +16,7 @@ import {
   getCountFromServer,
   doc,
   getDoc,
+  updateDoc,
 } from 'firebase/firestore';
 import { Auth } from 'firebase/auth';
 import { FirebaseApp } from 'firebase/app';
@@ -2296,6 +2297,14 @@ export class AppointmentService extends BaseService {
         finalizationNotes: currentMetadata.finalizationNotes,
       });
+      // Convert empty strings to null for proper Firestore storage
+      const normalizedSharedNotes = sharedNotes !== undefined
+        ? (sharedNotes === '' || sharedNotes === null ? null : sharedNotes)
+        : currentMetadata.finalizationNotesShared;
+      const normalizedInternalNotes = internalNotes !== undefined
+        ? (internalNotes === '' || internalNotes === null ? null : internalNotes)
+        : currentMetadata.finalizationNotesInternal;
       const metadataUpdate = {
         selectedZones: currentMetadata.selectedZones,
         zonePhotos: currentMetadata.zonePhotos,
@@ -2304,14 +2313,12 @@ export class AppointmentService extends BaseService {
         extendedProcedures: currentMetadata.extendedProcedures || [],
         recommendedProcedures: currentMetadata.recommendedProcedures || [],
         finalbilling: currentMetadata.finalbilling,
-        finalizationNotesShared:
-          sharedNotes !== undefined ? sharedNotes : currentMetadata.finalizationNotesShared,
-        finalizationNotesInternal:
-          internalNotes !== undefined ? internalNotes : currentMetadata.finalizationNotesInternal,
+        finalizationNotesShared: normalizedSharedNotes,
+        finalizationNotesInternal: normalizedInternalNotes,
         // Keep deprecated field for backward compatibility during migration
         finalizationNotes:
-          sharedNotes !== undefined
-            ? sharedNotes
+          normalizedSharedNotes !== null && normalizedSharedNotes !== undefined
+            ? normalizedSharedNotes
             : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared,
       };
@@ -2319,14 +2326,39 @@ export class AppointmentService extends BaseService {
         finalizationNotesShared: metadataUpdate.finalizationNotesShared,
         finalizationNotesInternal: metadataUpdate.finalizationNotesInternal,
         finalizationNotes: metadataUpdate.finalizationNotes,
+        normalizedSharedNotes,
+        normalizedInternalNotes,
       });
-      const updateData: UpdateAppointmentData = {
-        metadata: metadataUpdate,
+      // Use direct Firestore update with dot notation to ensure fields are saved correctly
+      const appointmentRef = doc(this.db, APPOINTMENTS_COLLECTION, appointmentId);
+      const updateFields: any = {
+        'metadata.finalizationNotesShared': normalizedSharedNotes,
+        'metadata.finalizationNotesInternal': normalizedInternalNotes,
+        'metadata.finalizationNotes':
+          normalizedSharedNotes !== null && normalizedSharedNotes !== undefined
+            ? normalizedSharedNotes
+            : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared,
         updatedAt: serverTimestamp(),
       };
-      const result = await this.updateAppointment(appointmentId, updateData);
+      console.log('🔍 [APPOINTMENT_SERVICE] Direct Firestore update with dot notation:', {
+        appointmentId,
+        updateFields: {
+          'metadata.finalizationNotesShared': updateFields['metadata.finalizationNotesShared'],
+          'metadata.finalizationNotesInternal': updateFields['metadata.finalizationNotesInternal'],
+          'metadata.finalizationNotes': updateFields['metadata.finalizationNotes'],
+        },
+      });
+      // Update using dot notation to ensure nested fields are saved correctly
+      await updateDoc(appointmentRef, updateFields);
+      // Fetch and return the updated appointment
+      const result = await this.getAppointmentById(appointmentId);
+      if (!result) {
+        throw new Error(`Failed to retrieve updated appointment ${appointmentId}`);
+      }
       console.log('🔍 [APPOINTMENT_SERVICE] After update, result metadata:', {
         finalizationNotesShared: result.metadata?.finalizationNotesShared,

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

@@ -99,6 +99,7 @@ async function createExtendedProcedureInfo(
     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

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

@@ -218,6 +218,7 @@ export async function initializeFormsForExtendedProcedure(
             sortingOrder: templateRef.sortingOrder,
             status: existingForm.status || FilledDocumentStatus.PENDING,
             path: `${APPOINTMENTS_COLLECTION}/${appointmentId}/${formSubcollectionPath}/${existingForm.id}`,
+            procedureId: procedureId, // Track which procedure this form belongs to
           };
           initializedFormsInfo.push(linkedForm);
@@ -288,6 +289,7 @@ export async function initializeFormsForExtendedProcedure(
         sortingOrder: templateRef.sortingOrder,
         status: FilledDocumentStatus.PENDING,
         path: docRef.path,
+        procedureId: procedureId, // Track which procedure this form belongs to
       };
       initializedFormsInfo.push(linkedForm);

package/src/services/appointment/utils/zone-management.utils.ts CHANGED Viewed

@@ -278,19 +278,45 @@ export async function updateZoneItemUtil(
     throw new Error(`Invalid item index ${itemIndex} for zone ${zoneId}`);
   }
+  // Filter out undefined values from updates (Firestore doesn't store undefined)
+  // Keep null values as they're used to explicitly delete/clear fields
+  // Convert empty strings to null for consistency
+  const cleanUpdates = Object.fromEntries(
+    Object.entries(updates)
+      .filter(([_, value]) => value !== undefined)
+      .map(([key, value]) => [
+        key,
+        value === '' ? null : value, // Convert empty strings to null
+      ])
+  ) as Partial<ZoneItemData>;
+  console.log(`[updateZoneItemUtil] Updates received:`, {
+    itemIndex,
+    zoneId,
+    rawUpdates: updates,
+    cleanUpdates,
+    hasIonNumber: 'ionNumber' in cleanUpdates,
+    hasExpiryDate: 'expiryDate' in cleanUpdates,
+    ionNumberValue: cleanUpdates.ionNumber,
+    expiryDateValue: cleanUpdates.expiryDate,
+  });
   // Update item with updatedAt timestamp
   items[itemIndex] = {
     ...items[itemIndex],
-    ...updates,
+    ...cleanUpdates,
     updatedAt: new Date().toISOString(),
   };
-  console.log(`[updateZoneItemUtil] BEFORE recalculation:`, {
+  console.log(`[updateZoneItemUtil] Item after update:`, {
     itemIndex,
+    ionNumber: items[itemIndex].ionNumber,
+    expiryDate: items[itemIndex].expiryDate,
     quantity: items[itemIndex].quantity,
     priceOverrideAmount: items[itemIndex].priceOverrideAmount,
     price: items[itemIndex].price,
     oldSubtotal: items[itemIndex].subtotal,
+    allItemKeys: Object.keys(items[itemIndex]),
   });
   // Recalculate subtotal for this item
@@ -304,6 +330,18 @@ export async function updateZoneItemUtil(
   // Recalculate final billing with Swiss tax rate (8.1%)
   const finalbilling = calculateFinalBilling(metadata.zonesData, 0.081);
+  // Log what we're about to save to Firestore
+  console.log(`[updateZoneItemUtil] Saving to Firestore:`, {
+    appointmentId,
+    zoneId,
+    itemIndex,
+    itemToSave: items[itemIndex],
+    itemIonNumber: items[itemIndex].ionNumber,
+    itemExpiryDate: items[itemIndex].expiryDate,
+    zonesDataKeys: Object.keys(metadata.zonesData),
+    zoneItemsCount: metadata.zonesData[zoneId]?.length,
+  });
   // Update appointment
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
   await updateDoc(appointmentRef, {
@@ -312,7 +350,16 @@ export async function updateZoneItemUtil(
     updatedAt: serverTimestamp(),
   });
-  return getAppointmentOrThrow(db, appointmentId);
+  // Verify what was actually saved
+  const savedAppointment = await getAppointmentOrThrow(db, appointmentId);
+  const savedItem = savedAppointment.metadata?.zonesData?.[zoneId]?.[itemIndex];
+  console.log(`[updateZoneItemUtil] Verification after save:`, {
+    savedItemIonNumber: savedItem?.ionNumber,
+    savedItemExpiryDate: savedItem?.expiryDate,
+    savedItemKeys: savedItem ? Object.keys(savedItem) : [],
+  });
+  return savedAppointment;
 }
 /**

package/src/services/appointment/utils/zone-photo.utils.ts CHANGED Viewed

@@ -206,6 +206,7 @@ export async function getZonePhotoEntryUtil(
 /**
  * Updates visibility of a photo pair (before AND after together)
+ * Note: If photo pair visibility is disabled, note visibility is automatically disabled as well
  *
  * @param db Firestore instance
  * @param appointmentId Appointment ID
@@ -223,18 +224,27 @@ export async function updateZonePhotoVisibilityUtil(
   showToPatient: boolean,
   doctorId: string,
 ): Promise<Appointment> {
+  const updates: Partial<BeforeAfterPerZone> = { showToPatient };
+  // If hiding photo pair from patient, also hide notes (notes can't be visible if photos aren't)
+  if (!showToPatient) {
+    updates.beforeNoteVisibleToPatient = false;
+    updates.afterNoteVisibleToPatient = false;
+  }
   return updateZonePhotoEntryUtil(
     db,
     appointmentId,
     zoneId,
     photoIndex,
-    { showToPatient },
+    updates,
     doctorId,
   );
 }
 /**
  * Updates visibility of a photo note (before or after)
+ * Note: Notes can only be visible to patient if the photo pair itself is visible to patient
  *
  * @param db Firestore instance
  * @param appointmentId Appointment ID
@@ -244,6 +254,7 @@ export async function updateZonePhotoVisibilityUtil(
  * @param visibleToPatient Whether the note should be visible to patient
  * @param doctorId ID of the doctor making the change (for audit trail)
  * @returns Updated appointment
+ * @throws Error if trying to make note visible when photo pair is not visible
  */
 export async function updateZonePhotoNoteVisibilityUtil(
   db: Firestore,
@@ -254,6 +265,33 @@ export async function updateZonePhotoNoteVisibilityUtil(
   visibleToPatient: boolean,
   doctorId: string,
 ): Promise<Appointment> {
+  // Get current appointment to check if photo pair is visible
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  const zonePhotos = appointment.metadata?.zonePhotos as
+    | Record<string, BeforeAfterPerZone[]>
+    | undefined
+    | null;
+  if (!zonePhotos || !zonePhotos[zoneId] || !Array.isArray(zonePhotos[zoneId])) {
+    throw new Error(`No photos found for zone ${zoneId} in appointment ${appointmentId}`);
+  }
+  const zoneArray = zonePhotos[zoneId];
+  if (photoIndex < 0 || photoIndex >= zoneArray.length) {
+    throw new Error(`Invalid photo index ${photoIndex} for zone ${zoneId}. Must be between 0 and ${zoneArray.length - 1}`);
+  }
+  const photoEntry = zoneArray[photoIndex];
+  // Validate: Notes can only be visible if photo pair is visible
+  if (visibleToPatient && !photoEntry.showToPatient) {
+    throw new Error(
+      'Cannot make note visible to patient: The photo pair must be visible to the patient first. ' +
+      'Please enable "Show to Patient" for the photo pair before making notes visible.'
+    );
+  }
   const updates: Partial<BeforeAfterPerZone> =
     noteType === 'before'
       ? { beforeNoteVisibleToPatient: visibleToPatient }