@blackcode_sa/metaestetics-api 1.11.0 → 1.11.2

package/dist/admin/index.d.mts

@@ -1516,7 +1516,8 @@ interface BeforeAfterPerZone {
     /** URL for after photo or null if not available */
     after: MediaResource | null;
     /** Optional note for the zone */
-    note: string | null;
+    afterNote?: string | null;
+    beforeNote?: string | null;
 }
 /**
  * Interface for billing information per zone
@@ -1538,6 +1539,8 @@ interface BillingPerZone {
     Subtotal: number;
     /** Optional billing note */
     Note: string | null;
+    /** Ion/Batch number for traceability */
+    IonNumber: string | null;
 }
 /**
  * Interface for final billing calculations of the appointment
@@ -1612,7 +1615,7 @@ interface Appointment {
     actualDurationMinutes?: number;
     /** Cancellation Details */
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     /** Notes */
     internalNotes?: string | null;
     patientNotes?: string | null;

package/dist/admin/index.d.ts

@@ -1516,7 +1516,8 @@ interface BeforeAfterPerZone {
     /** URL for after photo or null if not available */
     after: MediaResource | null;
     /** Optional note for the zone */
-    note: string | null;
+    afterNote?: string | null;
+    beforeNote?: string | null;
 }
 /**
  * Interface for billing information per zone
@@ -1538,6 +1539,8 @@ interface BillingPerZone {
     Subtotal: number;
     /** Optional billing note */
     Note: string | null;
+    /** Ion/Batch number for traceability */
+    IonNumber: string | null;
 }
 /**
  * Interface for final billing calculations of the appointment
@@ -1612,7 +1615,7 @@ interface Appointment {
     actualDurationMinutes?: number;
     /** Cancellation Details */
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     /** Notes */
     internalNotes?: string | null;
     patientNotes?: string | null;

package/dist/index.d.mts

@@ -2830,7 +2830,8 @@ interface BeforeAfterPerZone {
     /** URL for after photo or null if not available */
     after: MediaResource | null;
     /** Optional note for the zone */
-    note: string | null;
+    afterNote?: string | null;
+    beforeNote?: string | null;
 }
 /**
  * Interface for billing information per zone
@@ -2852,6 +2853,8 @@ interface BillingPerZone {
     Subtotal: number;
     /** Optional billing note */
     Note: string | null;
+    /** Ion/Batch number for traceability */
+    IonNumber: string | null;
 }
 /**
  * Interface for final billing calculations of the appointment
@@ -2926,7 +2929,7 @@ interface Appointment {
     actualDurationMinutes?: number;
     /** Cancellation Details */
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     /** Notes */
     internalNotes?: string | null;
     patientNotes?: string | null;
@@ -3006,7 +3009,7 @@ interface UpdateAppointmentData {
     procedureActualStartTime?: Timestamp | FieldValue | null;
     actualDurationMinutes?: number;
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     internalNotes?: string | null;
     patientNotes?: string | FieldValue | null;
     paymentStatus?: PaymentStatus;

package/dist/index.d.ts

@@ -2830,7 +2830,8 @@ interface BeforeAfterPerZone {
     /** URL for after photo or null if not available */
     after: MediaResource | null;
     /** Optional note for the zone */
-    note: string | null;
+    afterNote?: string | null;
+    beforeNote?: string | null;
 }
 /**
  * Interface for billing information per zone
@@ -2852,6 +2853,8 @@ interface BillingPerZone {
     Subtotal: number;
     /** Optional billing note */
     Note: string | null;
+    /** Ion/Batch number for traceability */
+    IonNumber: string | null;
 }
 /**
  * Interface for final billing calculations of the appointment
@@ -2926,7 +2929,7 @@ interface Appointment {
     actualDurationMinutes?: number;
     /** Cancellation Details */
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     /** Notes */
     internalNotes?: string | null;
     patientNotes?: string | null;
@@ -3006,7 +3009,7 @@ interface UpdateAppointmentData {
     procedureActualStartTime?: Timestamp | FieldValue | null;
     actualDurationMinutes?: number;
     cancellationReason?: string | null;
-    canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+    canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
     internalNotes?: string | null;
     patientNotes?: string | FieldValue | null;
     paymentStatus?: PaymentStatus;

package/dist/index.js

@@ -539,7 +539,8 @@ var finalizedDetailsSchema = import_zod3.z.object({
 var beforeAfterPerZoneSchema = import_zod3.z.object({
   before: mediaResourceSchema.nullable(),
   after: mediaResourceSchema.nullable(),
-  note: import_zod3.z.string().nullable()
+  afterNote: import_zod3.z.string().nullable().optional(),
+  beforeNote: import_zod3.z.string().nullable().optional()
 });
 var billingPerZoneSchema = import_zod3.z.object({
   Product: import_zod3.z.string().min(MIN_STRING_LENGTH, "Product name is required"),
@@ -549,7 +550,8 @@ var billingPerZoneSchema = import_zod3.z.object({
   UnitPrice: import_zod3.z.number().min(0, "Unit price must be non-negative"),
   UnitCurency: import_zod3.z.nativeEnum(Currency),
   Subtotal: import_zod3.z.number().min(0, "Subtotal must be non-negative"),
-  Note: import_zod3.z.string().nullable()
+  Note: import_zod3.z.string().nullable(),
+  IonNumber: import_zod3.z.string().nullable()
 });
 var finalBillingSchema = import_zod3.z.object({
   subtotalAll: import_zod3.z.number().min(0, "Subtotal all must be non-negative"),
@@ -620,10 +622,7 @@ var updateAppointmentSchema = import_zod3.z.object({
   practitionerId: import_zod3.z.string().min(MIN_STRING_LENGTH).optional(),
   clinic_tz: import_zod3.z.string().min(MIN_STRING_LENGTH).optional(),
   linkedForms: import_zod3.z.union([import_zod3.z.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), import_zod3.z.any()]).optional(),
-  media: import_zod3.z.union([
-    import_zod3.z.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH),
-    import_zod3.z.any()
-  ]).optional(),
+  media: import_zod3.z.union([import_zod3.z.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH), import_zod3.z.any()]).optional(),
   reviewInfo: import_zod3.z.union([patientReviewInfoSchema.nullable(), import_zod3.z.any()]).optional(),
   finalizedDetails: import_zod3.z.union([finalizedDetailsSchema.nullable(), import_zod3.z.any()]).optional(),
   isArchived: import_zod3.z.boolean().optional(),
@@ -664,10 +663,7 @@ var searchAppointmentsSchema = import_zod3.z.object({
     (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
     "End date must be a valid timestamp or Date object"
   ).optional(),
-  status: import_zod3.z.union([
-    appointmentStatusSchema,
-    import_zod3.z.array(appointmentStatusSchema).nonempty()
-  ]).optional(),
+  status: import_zod3.z.union([appointmentStatusSchema, import_zod3.z.array(appointmentStatusSchema).nonempty()]).optional(),
   limit: import_zod3.z.number().positive().int().optional().default(20),
   startAfter: import_zod3.z.any().optional()
 }).refine(

package/dist/index.mjs

@@ -411,7 +411,8 @@ var finalizedDetailsSchema = z3.object({
 var beforeAfterPerZoneSchema = z3.object({
   before: mediaResourceSchema.nullable(),
   after: mediaResourceSchema.nullable(),
-  note: z3.string().nullable()
+  afterNote: z3.string().nullable().optional(),
+  beforeNote: z3.string().nullable().optional()
 });
 var billingPerZoneSchema = z3.object({
   Product: z3.string().min(MIN_STRING_LENGTH, "Product name is required"),
@@ -421,7 +422,8 @@ var billingPerZoneSchema = z3.object({
   UnitPrice: z3.number().min(0, "Unit price must be non-negative"),
   UnitCurency: z3.nativeEnum(Currency),
   Subtotal: z3.number().min(0, "Subtotal must be non-negative"),
-  Note: z3.string().nullable()
+  Note: z3.string().nullable(),
+  IonNumber: z3.string().nullable()
 });
 var finalBillingSchema = z3.object({
   subtotalAll: z3.number().min(0, "Subtotal all must be non-negative"),
@@ -492,10 +494,7 @@ var updateAppointmentSchema = z3.object({
   practitionerId: z3.string().min(MIN_STRING_LENGTH).optional(),
   clinic_tz: z3.string().min(MIN_STRING_LENGTH).optional(),
   linkedForms: z3.union([z3.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), z3.any()]).optional(),
-  media: z3.union([
-    z3.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH),
-    z3.any()
-  ]).optional(),
+  media: z3.union([z3.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH), z3.any()]).optional(),
   reviewInfo: z3.union([patientReviewInfoSchema.nullable(), z3.any()]).optional(),
   finalizedDetails: z3.union([finalizedDetailsSchema.nullable(), z3.any()]).optional(),
   isArchived: z3.boolean().optional(),
@@ -536,10 +535,7 @@ var searchAppointmentsSchema = z3.object({
     (val) => val === void 0 || val instanceof Date || (val == null ? void 0 : val._seconds) !== void 0 || (val == null ? void 0 : val.seconds) !== void 0 || typeof val === "number" || typeof val === "string" || val && typeof val.toMillis === "function",
     "End date must be a valid timestamp or Date object"
   ).optional(),
-  status: z3.union([
-    appointmentStatusSchema,
-    z3.array(appointmentStatusSchema).nonempty()
-  ]).optional(),
+  status: z3.union([appointmentStatusSchema, z3.array(appointmentStatusSchema).nonempty()]).optional(),
   limit: z3.number().positive().int().optional().default(20),
   startAfter: z3.any().optional()
 }).refine(

package/package.json

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

package/src/types/appointment/index.ts

@@ -1,56 +1,49 @@
-import { Timestamp, FieldValue } from "firebase/firestore";
-import {
-  ClinicInfo,
-  PractitionerProfileInfo,
-  PatientProfileInfo,
-} from "../profile";
-import { ProcedureSummaryInfo } from "../procedure";
-import {
-  Currency,
-  type PricingMeasure,
-} from "../../backoffice/types/static/pricing.types";
-import { BlockingCondition } from "../../backoffice/types/static/blocking-condition.types";
-import { Contraindication } from "../../backoffice/types/static/contraindication.types";
-import { Requirement } from "../../backoffice/types/requirement.types";
-import { FilledDocumentStatus } from "../documentation-templates";
-import type { ProcedureFamily } from "../../backoffice";
-import type { MediaResource } from "../../services/media/media.service";
+import { Timestamp, FieldValue } from 'firebase/firestore';
+import { ClinicInfo, PractitionerProfileInfo, PatientProfileInfo } from '../profile';
+import { ProcedureSummaryInfo } from '../procedure';
+import { Currency, type PricingMeasure } from '../../backoffice/types/static/pricing.types';
+import { BlockingCondition } from '../../backoffice/types/static/blocking-condition.types';
+import { Contraindication } from '../../backoffice/types/static/contraindication.types';
+import { Requirement } from '../../backoffice/types/requirement.types';
+import { FilledDocumentStatus } from '../documentation-templates';
+import type { ProcedureFamily } from '../../backoffice';
+import type { MediaResource } from '../../services/media/media.service';
 
 /**
  * Enum defining the possible statuses of an appointment.
  */
 export enum AppointmentStatus {
-  PENDING = "pending", // Initial state after booking, before confirmation (if applicable)
-  CONFIRMED = "confirmed", // Confirmed by clinic/practitioner
-  CHECKED_IN = "checked_in", // Patient has arrived
-  IN_PROGRESS = "in_progress", // Procedure has started
-  COMPLETED = "completed", // Procedure finished successfully
-  CANCELED_PATIENT = "canceled_patient", // Canceled by the patient
-  CANCELED_PATIENT_RESCHEDULED = "canceled_patient_rescheduled", // Canceled by the patient and rescheduled by the clinic
-  CANCELED_CLINIC = "canceled_clinic", // Canceled by the clinic/practitioner
-  NO_SHOW = "no_show", // Patient did not attend
-  RESCHEDULED_BY_CLINIC = "rescheduled_by_clinic", // When appointment is rescheduled by the clinic, waiting for patient confirmation or cancellation (when reschedule is accepted, status goes to confirmed, if not accepted, then status goes to canceled_patient_rescheduled)
+  PENDING = 'pending', // Initial state after booking, before confirmation (if applicable)
+  CONFIRMED = 'confirmed', // Confirmed by clinic/practitioner
+  CHECKED_IN = 'checked_in', // Patient has arrived
+  IN_PROGRESS = 'in_progress', // Procedure has started
+  COMPLETED = 'completed', // Procedure finished successfully
+  CANCELED_PATIENT = 'canceled_patient', // Canceled by the patient
+  CANCELED_PATIENT_RESCHEDULED = 'canceled_patient_rescheduled', // Canceled by the patient and rescheduled by the clinic
+  CANCELED_CLINIC = 'canceled_clinic', // Canceled by the clinic/practitioner
+  NO_SHOW = 'no_show', // Patient did not attend
+  RESCHEDULED_BY_CLINIC = 'rescheduled_by_clinic', // When appointment is rescheduled by the clinic, waiting for patient confirmation or cancellation (when reschedule is accepted, status goes to confirmed, if not accepted, then status goes to canceled_patient_rescheduled)
 }
 
 /**
  * Enum defining the payment status of an appointment.
  */
 export enum PaymentStatus {
-  UNPAID = "unpaid",
-  PAID = "paid",
-  PARTIALLY_PAID = "partially_paid",
-  REFUNDED = "refunded",
-  NOT_APPLICABLE = "not_applicable", // For free services or other scenarios
+  UNPAID = 'unpaid',
+  PAID = 'paid',
+  PARTIALLY_PAID = 'partially_paid',
+  REFUNDED = 'refunded',
+  NOT_APPLICABLE = 'not_applicable', // For free services or other scenarios
 }
 
 /**
  * Enum for different types of media that can be attached to an appointment.
  */
 export enum MediaType {
-  BEFORE_PHOTO = "before_photo",
-  AFTER_PHOTO = "after_photo",
-  CONSENT_SCAN = "consent_scan",
-  OTHER_DOCUMENT = "other_document",
+  BEFORE_PHOTO = 'before_photo',
+  AFTER_PHOTO = 'after_photo',
+  CONSENT_SCAN = 'consent_scan',
+  OTHER_DOCUMENT = 'other_document',
 }
 
 /**
@@ -124,7 +117,8 @@ export interface BeforeAfterPerZone {
   /** URL for after photo or null if not available */
   after: MediaResource | null;
   /** Optional note for the zone */
-  note: string | null;
+  afterNote?: string | null;
+  beforeNote?: string | null;
 }
 
 /**
@@ -147,6 +141,8 @@ export interface BillingPerZone {
   Subtotal: number;
   /** Optional billing note */
   Note: string | null;
+  /** Ion/Batch number for traceability */
+  IonNumber: string | null;
 }
 
 /**
@@ -231,7 +227,7 @@ export interface Appointment {
 
   /** Cancellation Details */
   cancellationReason?: string | null;
-  canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+  canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
 
   /** Notes */
   internalNotes?: string | null;
@@ -326,7 +322,7 @@ export interface UpdateAppointmentData {
   procedureActualStartTime?: Timestamp | FieldValue | null; // NEW
   actualDurationMinutes?: number;
   cancellationReason?: string | null;
-  canceledBy?: "patient" | "clinic" | "practitioner" | "system";
+  canceledBy?: 'patient' | 'clinic' | 'practitioner' | 'system';
   internalNotes?: string | null;
   patientNotes?: string | FieldValue | null; // Allow FieldValue for deleting
   paymentStatus?: PaymentStatus;
@@ -378,4 +374,4 @@ export interface SearchAppointmentsParams {
 }
 
 /** Firestore collection name */
-export const APPOINTMENTS_COLLECTION = "appointments";
+export const APPOINTMENTS_COLLECTION = 'appointments';

package/src/validations/appointment.schema.ts

@@ -1,15 +1,8 @@
-import { z } from "zod";
-import {
-  AppointmentStatus,
-  PaymentStatus,
-  MediaType,
-} from "../types/appointment";
-import { filledDocumentStatusSchema } from "./documentation-templates.schema";
-import {
-  Currency,
-  PricingMeasure,
-} from "../backoffice/types/static/pricing.types";
-import { mediaResourceSchema } from "./media.schema";
+import { z } from 'zod';
+import { AppointmentStatus, PaymentStatus, MediaType } from '../types/appointment';
+import { filledDocumentStatusSchema } from './documentation-templates.schema';
+import { Currency, PricingMeasure } from '../backoffice/types/static/pricing.types';
+import { mediaResourceSchema } from './media.schema';
 
 // Define common constants locally if not available from common.schema.ts
 const MIN_STRING_LENGTH = 1;
@@ -25,9 +18,9 @@ export const mediaTypeSchema = z.nativeEnum(MediaType);
 // --- Schemas for Nested Objects from types/appointment/index.ts ---
 
 export const appointmentMediaItemSchema = z.object({
-  id: z.string().min(MIN_STRING_LENGTH, "Media item ID is required"),
+  id: z.string().min(MIN_STRING_LENGTH, 'Media item ID is required'),
   type: mediaTypeSchema,
-  url: z.string().url("Media URL must be a valid URL"),
+  url: z.string().url('Media URL must be a valid URL'),
   fileName: z.string().optional(),
   uploadedAt: z
     .any()
@@ -36,18 +29,13 @@ export const appointmentMediaItemSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "uploadedAt must be a valid timestamp or Date object"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'uploadedAt must be a valid timestamp or Date object',
     ),
-  uploadedBy: z
-    .string()
-    .min(MIN_STRING_LENGTH, "Uploaded by user ID is required"),
-  description: z
-    .string()
-    .max(MAX_STRING_LENGTH, "Description too long")
-    .optional(),
+  uploadedBy: z.string().min(MIN_STRING_LENGTH, 'Uploaded by user ID is required'),
+  description: z.string().max(MAX_STRING_LENGTH, 'Description too long').optional(),
 });
 
 export const procedureExtendedInfoSchema = z.object({
@@ -70,17 +58,14 @@ export const procedureExtendedInfoSchema = z.object({
 });
 
 export const linkedFormInfoSchema = z.object({
-  formId: z.string().min(MIN_STRING_LENGTH, "Form ID is required"),
-  templateId: z.string().min(MIN_STRING_LENGTH, "Template ID is required"),
-  templateVersion: z
-    .number()
-    .int()
-    .positive("Template version must be a positive integer"),
-  title: z.string().min(MIN_STRING_LENGTH, "Form title is required"),
+  formId: z.string().min(MIN_STRING_LENGTH, 'Form ID is required'),
+  templateId: z.string().min(MIN_STRING_LENGTH, 'Template ID is required'),
+  templateVersion: z.number().int().positive('Template version must be a positive integer'),
+  title: z.string().min(MIN_STRING_LENGTH, 'Form title is required'),
   isUserForm: z.boolean(),
   isRequired: z.boolean().optional(),
   status: filledDocumentStatusSchema,
-  path: z.string().min(MIN_STRING_LENGTH, "Form path is required"),
+  path: z.string().min(MIN_STRING_LENGTH, 'Form path is required'),
   submittedAt: z
     .any()
     .refine(
@@ -89,10 +74,10 @@ export const linkedFormInfoSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "submittedAt must be a valid timestamp or Date object"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'submittedAt must be a valid timestamp or Date object',
     )
     .optional(),
   completedAt: z
@@ -103,21 +88,18 @@ export const linkedFormInfoSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "completedAt must be a valid timestamp or Date object"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'completedAt must be a valid timestamp or Date object',
     )
     .optional(),
 });
 
 export const patientReviewInfoSchema = z.object({
-  reviewId: z.string().min(MIN_STRING_LENGTH, "Review ID is required"),
-  rating: z.number().min(1).max(5, "Rating must be between 1 and 5"),
-  comment: z
-    .string()
-    .max(MAX_STRING_LENGTH_LONG, "Comment too long")
-    .optional(),
+  reviewId: z.string().min(MIN_STRING_LENGTH, 'Review ID is required'),
+  rating: z.number().min(1).max(5, 'Rating must be between 1 and 5'),
+  comment: z.string().max(MAX_STRING_LENGTH_LONG, 'Comment too long').optional(),
   reviewedAt: z
     .any()
     .refine(
@@ -125,15 +107,15 @@ export const patientReviewInfoSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "reviewedAt must be a valid timestamp or Date object"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'reviewedAt must be a valid timestamp or Date object',
     ),
 });
 
 export const finalizedDetailsSchema = z.object({
-  by: z.string().min(MIN_STRING_LENGTH, "Finalized by user ID is required"),
+  by: z.string().min(MIN_STRING_LENGTH, 'Finalized by user ID is required'),
   at: z
     .any()
     .refine(
@@ -141,15 +123,12 @@ export const finalizedDetailsSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "Finalized at must be a valid timestamp or Date object"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'Finalized at must be a valid timestamp or Date object',
     ),
-  notes: z
-    .string()
-    .max(MAX_STRING_LENGTH_LONG, "Finalization notes too long")
-    .optional(),
+  notes: z.string().max(MAX_STRING_LENGTH_LONG, 'Finalization notes too long').optional(),
 });
 
 /**
@@ -158,32 +137,34 @@ export const finalizedDetailsSchema = z.object({
 export const beforeAfterPerZoneSchema = z.object({
   before: mediaResourceSchema.nullable(),
   after: mediaResourceSchema.nullable(),
-  note: z.string().nullable(),
+  afterNote: z.string().nullable().optional(),
+  beforeNote: z.string().nullable().optional(),
 });
 
 /**
  * Schema for billing information per zone
  */
 export const billingPerZoneSchema = z.object({
-  Product: z.string().min(MIN_STRING_LENGTH, "Product name is required"),
+  Product: z.string().min(MIN_STRING_LENGTH, 'Product name is required'),
   ProductId: z.string().nullable(),
-  Quantity: z.number().min(0, "Quantity must be non-negative"),
+  Quantity: z.number().min(0, 'Quantity must be non-negative'),
   UnitOfMeasurement: z.nativeEnum(PricingMeasure),
-  UnitPrice: z.number().min(0, "Unit price must be non-negative"),
+  UnitPrice: z.number().min(0, 'Unit price must be non-negative'),
   UnitCurency: z.nativeEnum(Currency),
-  Subtotal: z.number().min(0, "Subtotal must be non-negative"),
+  Subtotal: z.number().min(0, 'Subtotal must be non-negative'),
   Note: z.string().nullable(),
+  IonNumber: z.string().nullable(),
 });
 
 /**
  * Schema for final billing calculations of the appointment
  */
 export const finalBillingSchema = z.object({
-  subtotalAll: z.number().min(0, "Subtotal all must be non-negative"),
-  taxRate: z.number().min(0).max(1, "Tax rate must be between 0 and 1"),
-  taxPrice: z.number().min(0, "Tax price must be non-negative"),
-  finalPrice: z.number().min(0, "Final price must be non-negative"),
-  finalQuantity: z.number().min(0, "Final quantity must be non-negative"),
+  subtotalAll: z.number().min(0, 'Subtotal all must be non-negative'),
+  taxRate: z.number().min(0).max(1, 'Tax rate must be between 0 and 1'),
+  taxPrice: z.number().min(0, 'Tax price must be non-negative'),
+  finalPrice: z.number().min(0, 'Final price must be non-negative'),
+  finalQuantity: z.number().min(0, 'Final quantity must be non-negative'),
   currency: z.nativeEnum(Currency),
   unitOfMeasurement: z.nativeEnum(PricingMeasure),
 });
@@ -205,14 +186,10 @@ export const appointmentMetadataSchema = z.object({
  */
 export const createAppointmentSchema = z
   .object({
-    clinicBranchId: z
-      .string()
-      .min(MIN_STRING_LENGTH, "Clinic branch ID is required"),
-    practitionerId: z
-      .string()
-      .min(MIN_STRING_LENGTH, "Practitioner ID is required"),
-    patientId: z.string().min(MIN_STRING_LENGTH, "Patient ID is required"),
-    procedureId: z.string().min(MIN_STRING_LENGTH, "Procedure ID is required"),
+    clinicBranchId: z.string().min(MIN_STRING_LENGTH, 'Clinic branch ID is required'),
+    practitionerId: z.string().min(MIN_STRING_LENGTH, 'Practitioner ID is required'),
+    patientId: z.string().min(MIN_STRING_LENGTH, 'Patient ID is required'),
+    procedureId: z.string().min(MIN_STRING_LENGTH, 'Procedure ID is required'),
     appointmentStartTime: z
       .any()
       .refine(
@@ -220,10 +197,10 @@ export const createAppointmentSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "Appointment start time must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'Appointment start time must be a valid timestamp or Date object',
       ),
     appointmentEndTime: z
       .any()
@@ -232,27 +209,21 @@ export const createAppointmentSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "Appointment end time must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'Appointment end time must be a valid timestamp or Date object',
       ),
-    cost: z.number().min(0, "Cost must be a non-negative number"),
-    currency: z.string().min(1, "Currency is required"),
-    patientNotes: z
-      .string()
-      .max(MAX_STRING_LENGTH, "Patient notes too long")
-      .nullable()
-      .optional(),
+    cost: z.number().min(0, 'Cost must be a non-negative number'),
+    currency: z.string().min(1, 'Currency is required'),
+    patientNotes: z.string().max(MAX_STRING_LENGTH, 'Patient notes too long').nullable().optional(),
     initialStatus: appointmentStatusSchema,
-    initialPaymentStatus: paymentStatusSchema
-      .optional()
-      .default(PaymentStatus.UNPAID),
-    clinic_tz: z.string().min(1, "Timezone is required"),
+    initialPaymentStatus: paymentStatusSchema.optional().default(PaymentStatus.UNPAID),
+    clinic_tz: z.string().min(1, 'Timezone is required'),
   })
   .refine((data) => data.appointmentEndTime > data.appointmentStartTime, {
-    message: "Appointment end time must be after start time",
-    path: ["appointmentEndTime"],
+    message: 'Appointment end time must be after start time',
+    path: ['appointmentEndTime'],
   });
 
 /**
@@ -268,30 +239,24 @@ export const updateAppointmentSchema = z
     actualDurationMinutes: z
       .number()
       .int()
-      .positive("Duration must be a positive integer")
+      .positive('Duration must be a positive integer')
       .optional(),
     cancellationReason: z
       .string()
-      .max(MAX_STRING_LENGTH, "Cancellation reason too long")
+      .max(MAX_STRING_LENGTH, 'Cancellation reason too long')
       .nullable()
       .optional(),
-    canceledBy: z
-      .enum(["patient", "clinic", "practitioner", "system"])
-      .optional(),
+    canceledBy: z.enum(['patient', 'clinic', 'practitioner', 'system']).optional(),
     internalNotes: z
       .string()
-      .max(MAX_STRING_LENGTH_LONG, "Internal notes too long")
+      .max(MAX_STRING_LENGTH_LONG, 'Internal notes too long')
       .nullable()
       .optional(),
     patientNotes: z.any().optional().nullable(),
     paymentStatus: paymentStatusSchema.optional(),
     paymentTransactionId: z.any().optional().nullable(),
-    completedPreRequirements: z
-      .union([z.array(z.string()), z.any()])
-      .optional(),
-    completedPostRequirements: z
-      .union([z.array(z.string()), z.any()])
-      .optional(),
+    completedPreRequirements: z.union([z.array(z.string()), z.any()]).optional(),
+    completedPostRequirements: z.union([z.array(z.string()), z.any()]).optional(),
     linkedFormIds: z.union([z.array(z.string()), z.any()]).optional(),
     pendingUserFormsIds: z.union([z.array(z.string()), z.any()]).optional(),
     appointmentStartTime: z
@@ -302,10 +267,10 @@ export const updateAppointmentSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "Appointment start time must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'Appointment start time must be a valid timestamp or Date object',
       )
       .optional(),
     appointmentEndTime: z
@@ -316,10 +281,10 @@ export const updateAppointmentSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "Appointment end time must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'Appointment end time must be a valid timestamp or Date object',
       )
       .optional(),
     calendarEventId: z.string().min(MIN_STRING_LENGTH).optional(),
@@ -327,21 +292,10 @@ export const updateAppointmentSchema = z
     clinicBranchId: z.string().min(MIN_STRING_LENGTH).optional(),
     practitionerId: z.string().min(MIN_STRING_LENGTH).optional(),
     clinic_tz: z.string().min(MIN_STRING_LENGTH).optional(),
-    linkedForms: z
-      .union([z.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), z.any()])
-      .optional(),
-    media: z
-      .union([
-        z.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH),
-        z.any(),
-      ])
-      .optional(),
-    reviewInfo: z
-      .union([patientReviewInfoSchema.nullable(), z.any()])
-      .optional(),
-    finalizedDetails: z
-      .union([finalizedDetailsSchema.nullable(), z.any()])
-      .optional(),
+    linkedForms: z.union([z.array(linkedFormInfoSchema).max(MAX_ARRAY_LENGTH), z.any()]).optional(),
+    media: z.union([z.array(appointmentMediaItemSchema).max(MAX_ARRAY_LENGTH), z.any()]).optional(),
+    reviewInfo: z.union([patientReviewInfoSchema.nullable(), z.any()]).optional(),
+    finalizedDetails: z.union([finalizedDetailsSchema.nullable(), z.any()]).optional(),
     isArchived: z.boolean().optional(),
     updatedAt: z.any().optional(),
     metadata: appointmentMetadataSchema.optional(),
@@ -359,9 +313,9 @@ export const updateAppointmentSchema = z
     },
     {
       message:
-        "Cancellation reason and canceled by must be provided when canceling an appointment with patient or clinic origin.",
-      path: ["status"],
-    }
+        'Cancellation reason and canceled by must be provided when canceling an appointment with patient or clinic origin.',
+      path: ['status'],
+    },
   )
   .refine(
     (data) => {
@@ -371,10 +325,9 @@ export const updateAppointmentSchema = z
       return true;
     },
     {
-      message:
-        "Appointment end time must be after start time if both are provided",
-      path: ["appointmentEndTime"],
-    }
+      message: 'Appointment end time must be after start time if both are provided',
+      path: ['appointmentEndTime'],
+    },
   );
 
 /**
@@ -393,10 +346,10 @@ export const searchAppointmentsSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "Start date must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'Start date must be a valid timestamp or Date object',
       )
       .optional(),
     endDate: z
@@ -407,17 +360,14 @@ export const searchAppointmentsSchema = z
           val instanceof Date ||
           val?._seconds !== undefined ||
           val?.seconds !== undefined ||
-          typeof val === "number" ||
-          typeof val === "string" ||
-          (val && typeof val.toMillis === "function"),
-        "End date must be a valid timestamp or Date object"
+          typeof val === 'number' ||
+          typeof val === 'string' ||
+          (val && typeof val.toMillis === 'function'),
+        'End date must be a valid timestamp or Date object',
       )
       .optional(),
     status: z
-      .union([
-        appointmentStatusSchema,
-        z.array(appointmentStatusSchema).nonempty(),
-      ])
+      .union([appointmentStatusSchema, z.array(appointmentStatusSchema).nonempty()])
       .optional(),
     limit: z.number().positive().int().optional().default(20),
     startAfter: z.any().optional(),
@@ -431,9 +381,9 @@ export const searchAppointmentsSchema = z
     },
     {
       message:
-        "At least one of patientId, practitionerId, or clinicBranchId must be provided if no date or status filters are set.",
-      path: ["patientId"],
-    }
+        'At least one of patientId, practitionerId, or clinicBranchId must be provided if no date or status filters are set.',
+      path: ['patientId'],
+    },
   )
   .refine(
     (data) => {
@@ -443,18 +393,16 @@ export const searchAppointmentsSchema = z
       return true;
     },
     {
-      message: "End date must be after or the same as start date",
-      path: ["endDate"],
-    }
+      message: 'End date must be after or the same as start date',
+      path: ['endDate'],
+    },
   );
 
 /**
  * Schema for validating appointment reschedule data
  */
 export const rescheduleAppointmentSchema = z.object({
-  appointmentId: z
-    .string()
-    .min(MIN_STRING_LENGTH, "Appointment ID is required"),
+  appointmentId: z.string().min(MIN_STRING_LENGTH, 'Appointment ID is required'),
   newStartTime: z
     .any()
     .refine(
@@ -462,10 +410,10 @@ export const rescheduleAppointmentSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "New start time must be a valid timestamp, Date object, number, or string"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'New start time must be a valid timestamp, Date object, number, or string',
     ),
   newEndTime: z
     .any()
@@ -474,9 +422,9 @@ export const rescheduleAppointmentSchema = z.object({
         val instanceof Date ||
         val?._seconds !== undefined ||
         val?.seconds !== undefined ||
-        typeof val === "number" ||
-        typeof val === "string" ||
-        (val && typeof val.toMillis === "function"),
-      "New end time must be a valid timestamp, Date object, number, or string"
+        typeof val === 'number' ||
+        typeof val === 'string' ||
+        (val && typeof val.toMillis === 'function'),
+      'New end time must be a valid timestamp, Date object, number, or string',
     ),
 });