@blackcode_sa/metaestetics-api 1.14.52 → 1.14.54

package/dist/admin/index.d.mts

@@ -1714,6 +1714,7 @@ interface ZoneItemData {
     notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
+    expiryDate?: string;
     createdAt?: string;
     updatedAt?: string;
 }

package/dist/admin/index.d.ts

@@ -1714,6 +1714,7 @@ interface ZoneItemData {
     notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
+    expiryDate?: string;
     createdAt?: string;
     updatedAt?: string;
 }

package/dist/index.d.mts

@@ -5651,6 +5651,7 @@ interface ZoneItemData {
     notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
+    expiryDate?: string;
     createdAt?: string;
     updatedAt?: string;
 }

package/dist/index.d.ts

@@ -5651,6 +5651,7 @@ interface ZoneItemData {
     notesVisibleToPatient?: boolean;
     subtotal?: number;
     ionNumber?: string;
+    expiryDate?: string;
     createdAt?: string;
     updatedAt?: string;
 }

package/dist/index.js

@@ -4843,7 +4843,6 @@ function initializeMetadata(appointment) {
   };
 }
 async function addItemToZoneUtil(db, appointmentId, zoneId, item) {
-  var _a;
   validateZoneKeyFormat(zoneId);
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   const metadata = initializeMetadata(appointment);
@@ -4852,15 +4851,19 @@ async function addItemToZoneUtil(db, appointmentId, zoneId, item) {
     zonesData[zoneId] = [];
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
+  const cleanItem = Object.fromEntries(
+    Object.entries(item).filter(([_, value]) => value !== void 0)
+  );
+  const notesVisibleToPatientValue = cleanItem.notesVisibleToPatient !== void 0 ? cleanItem.notesVisibleToPatient : cleanItem.notes ? false : void 0;
   const itemWithSubtotal = {
-    ...item,
+    ...cleanItem,
     parentZone: zoneId,
     // Set parentZone to the zone key
-    subtotal: calculateItemSubtotal(item),
-    // Set default visibility to false (privacy-first) if notes exist and visibility not explicitly set
-    notesVisibleToPatient: (_a = item.notesVisibleToPatient) != null ? _a : item.notes ? false : void 0,
+    subtotal: calculateItemSubtotal(cleanItem),
     createdAt: now,
-    updatedAt: now
+    updatedAt: now,
+    // Only include notesVisibleToPatient if it has a defined boolean value
+    ...typeof notesVisibleToPatientValue === "boolean" && { notesVisibleToPatient: notesVisibleToPatientValue }
   };
   zonesData[zoneId].push(itemWithSubtotal);
   const finalbilling = calculateFinalBilling(zonesData, 0.081);
@@ -5366,12 +5369,19 @@ async function addExtendedProcedureUtil(db, appointmentId, procedureId) {
       appointment.practitionerId,
       appointment.clinicBranchId
     );
-    updatedLinkedFormIds = [...updatedLinkedFormIds, ...formInitResult.allLinkedFormIds];
-    updatedLinkedForms = [...updatedLinkedForms, ...formInitResult.initializedFormsInfo];
-    updatedPendingUserFormsIds = [
-      ...updatedPendingUserFormsIds,
-      ...formInitResult.pendingUserFormsIds
-    ];
+    const existingFormIds = new Set(updatedLinkedFormIds);
+    const newFormIds = formInitResult.allLinkedFormIds.filter((id) => !existingFormIds.has(id));
+    updatedLinkedFormIds = [...updatedLinkedFormIds, ...newFormIds];
+    const existingFormIdsInLinkedForms = new Set(updatedLinkedForms.map((f) => f.formId));
+    const newLinkedForms = formInitResult.initializedFormsInfo.filter(
+      (form) => !existingFormIdsInLinkedForms.has(form.formId)
+    );
+    updatedLinkedForms = [...updatedLinkedForms, ...newLinkedForms];
+    const existingPendingIds = new Set(updatedPendingUserFormsIds);
+    const newPendingIds = formInitResult.pendingUserFormsIds.filter(
+      (id) => !existingPendingIds.has(id)
+    );
+    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...newPendingIds];
   }
   const extendedProcedures = [...metadata.extendedProcedures || [], extendedProcedureInfo];
   const appointmentRef = (0, import_firestore10.doc)(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -5414,15 +5424,30 @@ async function removeExtendedProcedureUtil(db, appointmentId, procedureId) {
     `\u{1F5D1}\uFE0F [removeExtendedProcedure] Removed ${productsRemovedFromZones} products from zones for procedure ${procedureId}`
   );
   const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
-  const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter(
-    (formId) => !removedFormIds.includes(formId)
-  );
-  const updatedLinkedForms = (appointment.linkedForms || []).filter(
-    (form) => !removedFormIds.includes(form.formId)
-  );
-  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter(
-    (formId) => !removedFormIds.includes(formId)
-  );
+  const removedFormIdsSet = new Set(removedFormIds);
+  const linkedFormIdsSet = /* @__PURE__ */ new Set();
+  const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter((formId) => {
+    if (removedFormIdsSet.has(formId)) return false;
+    if (linkedFormIdsSet.has(formId)) return false;
+    linkedFormIdsSet.add(formId);
+    return true;
+  });
+  const linkedFormsMap = /* @__PURE__ */ new Map();
+  (appointment.linkedForms || []).forEach((form) => {
+    if (!removedFormIdsSet.has(form.formId)) {
+      if (!linkedFormsMap.has(form.formId)) {
+        linkedFormsMap.set(form.formId, form);
+      }
+    }
+  });
+  const updatedLinkedForms = Array.from(linkedFormsMap.values());
+  const pendingIdsSet = /* @__PURE__ */ new Set();
+  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter((formId) => {
+    if (removedFormIdsSet.has(formId)) return false;
+    if (pendingIdsSet.has(formId)) return false;
+    pendingIdsSet.add(formId);
+    return true;
+  });
   const appointmentRef = (0, import_firestore10.doc)(db, APPOINTMENTS_COLLECTION, appointmentId);
   await (0, import_firestore10.updateDoc)(appointmentRef, {
     "metadata.extendedProcedures": metadata.extendedProcedures,

package/dist/index.mjs

@@ -4729,7 +4729,6 @@ function initializeMetadata(appointment) {
   };
 }
 async function addItemToZoneUtil(db, appointmentId, zoneId, item) {
-  var _a;
   validateZoneKeyFormat(zoneId);
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   const metadata = initializeMetadata(appointment);
@@ -4738,15 +4737,19 @@ async function addItemToZoneUtil(db, appointmentId, zoneId, item) {
     zonesData[zoneId] = [];
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
+  const cleanItem = Object.fromEntries(
+    Object.entries(item).filter(([_, value]) => value !== void 0)
+  );
+  const notesVisibleToPatientValue = cleanItem.notesVisibleToPatient !== void 0 ? cleanItem.notesVisibleToPatient : cleanItem.notes ? false : void 0;
   const itemWithSubtotal = {
-    ...item,
+    ...cleanItem,
     parentZone: zoneId,
     // Set parentZone to the zone key
-    subtotal: calculateItemSubtotal(item),
-    // Set default visibility to false (privacy-first) if notes exist and visibility not explicitly set
-    notesVisibleToPatient: (_a = item.notesVisibleToPatient) != null ? _a : item.notes ? false : void 0,
+    subtotal: calculateItemSubtotal(cleanItem),
     createdAt: now,
-    updatedAt: now
+    updatedAt: now,
+    // Only include notesVisibleToPatient if it has a defined boolean value
+    ...typeof notesVisibleToPatientValue === "boolean" && { notesVisibleToPatient: notesVisibleToPatientValue }
   };
   zonesData[zoneId].push(itemWithSubtotal);
   const finalbilling = calculateFinalBilling(zonesData, 0.081);
@@ -5252,12 +5255,19 @@ async function addExtendedProcedureUtil(db, appointmentId, procedureId) {
       appointment.practitionerId,
       appointment.clinicBranchId
     );
-    updatedLinkedFormIds = [...updatedLinkedFormIds, ...formInitResult.allLinkedFormIds];
-    updatedLinkedForms = [...updatedLinkedForms, ...formInitResult.initializedFormsInfo];
-    updatedPendingUserFormsIds = [
-      ...updatedPendingUserFormsIds,
-      ...formInitResult.pendingUserFormsIds
-    ];
+    const existingFormIds = new Set(updatedLinkedFormIds);
+    const newFormIds = formInitResult.allLinkedFormIds.filter((id) => !existingFormIds.has(id));
+    updatedLinkedFormIds = [...updatedLinkedFormIds, ...newFormIds];
+    const existingFormIdsInLinkedForms = new Set(updatedLinkedForms.map((f) => f.formId));
+    const newLinkedForms = formInitResult.initializedFormsInfo.filter(
+      (form) => !existingFormIdsInLinkedForms.has(form.formId)
+    );
+    updatedLinkedForms = [...updatedLinkedForms, ...newLinkedForms];
+    const existingPendingIds = new Set(updatedPendingUserFormsIds);
+    const newPendingIds = formInitResult.pendingUserFormsIds.filter(
+      (id) => !existingPendingIds.has(id)
+    );
+    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...newPendingIds];
   }
   const extendedProcedures = [...metadata.extendedProcedures || [], extendedProcedureInfo];
   const appointmentRef = doc7(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -5300,15 +5310,30 @@ async function removeExtendedProcedureUtil(db, appointmentId, procedureId) {
     `\u{1F5D1}\uFE0F [removeExtendedProcedure] Removed ${productsRemovedFromZones} products from zones for procedure ${procedureId}`
   );
   const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
-  const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter(
-    (formId) => !removedFormIds.includes(formId)
-  );
-  const updatedLinkedForms = (appointment.linkedForms || []).filter(
-    (form) => !removedFormIds.includes(form.formId)
-  );
-  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter(
-    (formId) => !removedFormIds.includes(formId)
-  );
+  const removedFormIdsSet = new Set(removedFormIds);
+  const linkedFormIdsSet = /* @__PURE__ */ new Set();
+  const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter((formId) => {
+    if (removedFormIdsSet.has(formId)) return false;
+    if (linkedFormIdsSet.has(formId)) return false;
+    linkedFormIdsSet.add(formId);
+    return true;
+  });
+  const linkedFormsMap = /* @__PURE__ */ new Map();
+  (appointment.linkedForms || []).forEach((form) => {
+    if (!removedFormIdsSet.has(form.formId)) {
+      if (!linkedFormsMap.has(form.formId)) {
+        linkedFormsMap.set(form.formId, form);
+      }
+    }
+  });
+  const updatedLinkedForms = Array.from(linkedFormsMap.values());
+  const pendingIdsSet = /* @__PURE__ */ new Set();
+  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter((formId) => {
+    if (removedFormIdsSet.has(formId)) return false;
+    if (pendingIdsSet.has(formId)) return false;
+    pendingIdsSet.add(formId);
+    return true;
+  });
   const appointmentRef = doc7(db, APPOINTMENTS_COLLECTION, appointmentId);
   await updateDoc5(appointmentRef, {
     "metadata.extendedProcedures": metadata.extendedProcedures,

package/package.json

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

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

@@ -174,13 +174,25 @@ export async function addExtendedProcedureUtil(
       appointment.clinicBranchId,
     );
 
-    // Merge form IDs and info
-    updatedLinkedFormIds = [...updatedLinkedFormIds, ...formInitResult.allLinkedFormIds];
-    updatedLinkedForms = [...updatedLinkedForms, ...formInitResult.initializedFormsInfo];
-    updatedPendingUserFormsIds = [
-      ...updatedPendingUserFormsIds,
-      ...formInitResult.pendingUserFormsIds,
-    ];
+    // Merge form IDs and info with deduplication
+    // Deduplicate linkedFormIds by formId
+    const existingFormIds = new Set(updatedLinkedFormIds);
+    const newFormIds = formInitResult.allLinkedFormIds.filter(id => !existingFormIds.has(id));
+    updatedLinkedFormIds = [...updatedLinkedFormIds, ...newFormIds];
+    
+    // Deduplicate linkedForms by formId (keep existing entries, add only new ones)
+    const existingFormIdsInLinkedForms = new Set(updatedLinkedForms.map(f => f.formId));
+    const newLinkedForms = formInitResult.initializedFormsInfo.filter(
+      form => !existingFormIdsInLinkedForms.has(form.formId)
+    );
+    updatedLinkedForms = [...updatedLinkedForms, ...newLinkedForms];
+    
+    // Deduplicate pendingUserFormsIds
+    const existingPendingIds = new Set(updatedPendingUserFormsIds);
+    const newPendingIds = formInitResult.pendingUserFormsIds.filter(
+      id => !existingPendingIds.has(id)
+    );
+    updatedPendingUserFormsIds = [...updatedPendingUserFormsIds, ...newPendingIds];
   }
 
   // Add extended procedure
@@ -259,16 +271,41 @@ export async function removeExtendedProcedureUtil(
   // Remove forms associated with this procedure
   const removedFormIds = await removeFormsForExtendedProcedure(db, appointmentId, procedureId);
 
-  // Update appointment form arrays
-  const updatedLinkedFormIds = (appointment.linkedFormIds || []).filter(
-    formId => !removedFormIds.includes(formId),
-  );
-  const updatedLinkedForms = (appointment.linkedForms || []).filter(
-    form => !removedFormIds.includes(form.formId),
-  );
-  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || []).filter(
-    formId => !removedFormIds.includes(formId),
-  );
+  // Update appointment form arrays - remove forms that were deleted
+  // Also deduplicate to clean up any existing duplicates
+  const removedFormIdsSet = new Set(removedFormIds);
+  
+  // Deduplicate and filter linkedFormIds
+  const linkedFormIdsSet = new Set<string>();
+  const updatedLinkedFormIds = (appointment.linkedFormIds || [])
+    .filter(formId => {
+      if (removedFormIdsSet.has(formId)) return false;
+      if (linkedFormIdsSet.has(formId)) return false; // Deduplicate
+      linkedFormIdsSet.add(formId);
+      return true;
+    });
+  
+  // Deduplicate and filter linkedForms by formId
+  const linkedFormsMap = new Map<string, LinkedFormInfo>();
+  (appointment.linkedForms || []).forEach(form => {
+    if (!removedFormIdsSet.has(form.formId)) {
+      // Keep the first occurrence if duplicates exist
+      if (!linkedFormsMap.has(form.formId)) {
+        linkedFormsMap.set(form.formId, form);
+      }
+    }
+  });
+  const updatedLinkedForms = Array.from(linkedFormsMap.values());
+  
+  // Deduplicate and filter pendingUserFormsIds
+  const pendingIdsSet = new Set<string>();
+  const updatedPendingUserFormsIds = (appointment.pendingUserFormsIds || [])
+    .filter(formId => {
+      if (removedFormIdsSet.has(formId)) return false;
+      if (pendingIdsSet.has(formId)) return false; // Deduplicate
+      pendingIdsSet.add(formId);
+      return true;
+    });
 
   // Update appointment
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);

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

@@ -159,14 +159,25 @@ export async function addItemToZoneUtil(
 
   // Calculate subtotal for the item
   const now = new Date().toISOString();
+  
+  // Filter out undefined values from item (Firestore doesn't allow undefined)
+  const cleanItem = Object.fromEntries(
+    Object.entries(item).filter(([_, value]) => value !== undefined)
+  ) as Omit<ZoneItemData, 'subtotal' | 'parentZone'>;
+  
+  // Determine notesVisibleToPatient value (privacy-first: default to false if notes exist, otherwise omit)
+  const notesVisibleToPatientValue = cleanItem.notesVisibleToPatient !== undefined
+    ? cleanItem.notesVisibleToPatient
+    : (cleanItem.notes ? false : undefined);
+  
   const itemWithSubtotal: ZoneItemData = {
-    ...item,
+    ...cleanItem,
     parentZone: zoneId, // Set parentZone to the zone key
-    subtotal: calculateItemSubtotal(item),
-    // Set default visibility to false (privacy-first) if notes exist and visibility not explicitly set
-    notesVisibleToPatient: item.notesVisibleToPatient ?? (item.notes ? false : undefined),
+    subtotal: calculateItemSubtotal(cleanItem),
     createdAt: now,
     updatedAt: now,
+    // Only include notesVisibleToPatient if it has a defined boolean value
+    ...(typeof notesVisibleToPatientValue === 'boolean' && { notesVisibleToPatient: notesVisibleToPatientValue }),
   };
 
   // Add item to zone

package/src/types/appointment/index.ts

@@ -168,7 +168,8 @@ export interface ZoneItemData {
   notes?: string;
   notesVisibleToPatient?: boolean; // Whether notes are visible to patient (privacy-first, default false)
   subtotal?: number;
-  ionNumber?: string;
+  ionNumber?: string; // Batch/Lot number
+  expiryDate?: string; // ISO date string (YYYY-MM-DD)
   createdAt?: string; // ISO timestamp
   updatedAt?: string; // ISO timestamp
 }