@blackcode_sa/metaestetics-api 1.14.56 → 1.14.58

package/dist/index.js

@@ -3970,7 +3970,10 @@ var zoneItemDataSchema = import_zod3.z.object({
   notes: import_zod3.z.string().max(MAX_STRING_LENGTH_LONG, "Notes too long").optional(),
   notesVisibleToPatient: import_zod3.z.boolean().optional().default(false),
   subtotal: import_zod3.z.number().min(0, "Subtotal must be non-negative").optional(),
-  ionNumber: import_zod3.z.string().optional(),
+  ionNumber: import_zod3.z.string().nullable().optional(),
+  // Batch/Lot number - can be null to clear/delete
+  expiryDate: import_zod3.z.string().nullable().optional(),
+  // ISO date string (YYYY-MM-DD) - can be null to clear/delete
   createdAt: import_zod3.z.string().optional(),
   updatedAt: import_zod3.z.string().optional()
 }).refine(
@@ -4900,6 +4903,7 @@ async function removeItemFromZoneUtil(db, appointmentId, zoneId, itemIndex) {
   return getAppointmentOrThrow(db, appointmentId);
 }
 async function updateZoneItemUtil(db, appointmentId, zoneId, itemIndex, updates) {
+  var _a, _b, _c, _d;
   validateZoneKeyFormat(zoneId);
   const appointment = await getAppointmentOrThrow(db, appointmentId);
   const metadata = initializeMetadata(appointment);
@@ -4910,17 +4914,37 @@ async function updateZoneItemUtil(db, appointmentId, zoneId, itemIndex, updates)
   if (itemIndex < 0 || itemIndex >= items.length) {
     throw new Error(`Invalid item index ${itemIndex} for zone ${zoneId}`);
   }
+  const cleanUpdates = Object.fromEntries(
+    Object.entries(updates).filter(([_, value]) => value !== void 0).map(([key, value]) => [
+      key,
+      value === "" ? null : value
+      // Convert empty strings to null
+    ])
+  );
+  console.log(`[updateZoneItemUtil] Updates received:`, {
+    itemIndex,
+    zoneId,
+    rawUpdates: updates,
+    cleanUpdates,
+    hasIonNumber: "ionNumber" in cleanUpdates,
+    hasExpiryDate: "expiryDate" in cleanUpdates,
+    ionNumberValue: cleanUpdates.ionNumber,
+    expiryDateValue: cleanUpdates.expiryDate
+  });
   items[itemIndex] = {
     ...items[itemIndex],
-    ...updates,
+    ...cleanUpdates,
     updatedAt: (/* @__PURE__ */ 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
+    oldSubtotal: items[itemIndex].subtotal,
+    allItemKeys: Object.keys(items[itemIndex])
   });
   items[itemIndex].subtotal = calculateItemSubtotal(items[itemIndex]);
   console.log(`[updateZoneItemUtil] AFTER recalculation:`, {
@@ -4928,13 +4952,30 @@ async function updateZoneItemUtil(db, appointmentId, zoneId, itemIndex, updates)
     newSubtotal: items[itemIndex].subtotal
   });
   const finalbilling = calculateFinalBilling(metadata.zonesData, 0.081);
+  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: (_a = metadata.zonesData[zoneId]) == null ? void 0 : _a.length
+  });
   const appointmentRef = (0, import_firestore8.doc)(db, APPOINTMENTS_COLLECTION, appointmentId);
   await (0, import_firestore7.updateDoc)(appointmentRef, {
     "metadata.zonesData": metadata.zonesData,
     "metadata.finalbilling": finalbilling,
     updatedAt: (0, import_firestore7.serverTimestamp)()
   });
-  return getAppointmentOrThrow(db, appointmentId);
+  const savedAppointment = await getAppointmentOrThrow(db, appointmentId);
+  const savedItem = (_d = (_c = (_b = savedAppointment.metadata) == null ? void 0 : _b.zonesData) == null ? void 0 : _c[zoneId]) == null ? void 0 : _d[itemIndex];
+  console.log(`[updateZoneItemUtil] Verification after save:`, {
+    savedItemIonNumber: savedItem == null ? void 0 : savedItem.ionNumber,
+    savedItemExpiryDate: savedItem == null ? void 0 : savedItem.expiryDate,
+    savedItemKeys: savedItem ? Object.keys(savedItem) : []
+  });
+  return savedAppointment;
 }
 async function overridePriceForZoneItemUtil(db, appointmentId, zoneId, itemIndex, newPrice) {
   return updateZoneItemUtil(db, appointmentId, zoneId, itemIndex, {
@@ -5064,7 +5105,9 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
             isRequired,
             sortingOrder: templateRef.sortingOrder,
             status: existingForm.status || "pending" /* PENDING */,
-            path: `${APPOINTMENTS_COLLECTION}/${appointmentId}/${formSubcollectionPath}/${existingForm.id}`
+            path: `${APPOINTMENTS_COLLECTION}/${appointmentId}/${formSubcollectionPath}/${existingForm.id}`,
+            procedureId
+            // Track which procedure this form belongs to
           };
           initializedFormsInfo.push(linkedForm);
           if (!allLinkedFormIds.includes(existingForm.id)) {
@@ -5118,7 +5161,9 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
         isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: "pending" /* PENDING */,
-        path: docRef.path
+        path: docRef.path,
+        procedureId
+        // Track which procedure this form belongs to
       };
       initializedFormsInfo.push(linkedForm);
       const formType = isProcedureSpecific ? "procedure-specific" : "general/shared";
@@ -5311,6 +5356,7 @@ async function createExtendedProcedureInfo(db, procedureId) {
     procedureId,
     procedureName: data.name,
     procedureDescription: data.description || "",
+    procedurePrice: data.price || 0,
     procedureFamily: data.family,
     // Use embedded family object
     procedureCategoryId: data.category.id,
@@ -5638,16 +5684,37 @@ async function getZonePhotoEntryUtil(db, appointmentId, zoneId, photoIndex) {
   return zoneArray[photoIndex];
 }
 async function updateZonePhotoVisibilityUtil(db, appointmentId, zoneId, photoIndex, showToPatient, doctorId) {
+  const updates = { showToPatient };
+  if (!showToPatient) {
+    updates.beforeNoteVisibleToPatient = false;
+    updates.afterNoteVisibleToPatient = false;
+  }
   return updateZonePhotoEntryUtil(
     db,
     appointmentId,
     zoneId,
     photoIndex,
-    { showToPatient },
+    updates,
     doctorId
   );
 }
 async function updateZonePhotoNoteVisibilityUtil(db, appointmentId, zoneId, photoIndex, noteType, visibleToPatient, doctorId) {
+  var _a;
+  const appointment = await getAppointmentOrThrow(db, appointmentId);
+  const zonePhotos = (_a = appointment.metadata) == null ? void 0 : _a.zonePhotos;
+  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];
+  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 = noteType === "before" ? { beforeNoteVisibleToPatient: visibleToPatient } : { afterNoteVisibleToPatient: visibleToPatient };
   return updateZonePhotoEntryUtil(db, appointmentId, zoneId, photoIndex, updates, doctorId);
 }
@@ -7291,6 +7358,8 @@ var AppointmentService = class extends BaseService {
         finalizationNotesInternal: currentMetadata.finalizationNotesInternal,
         finalizationNotes: currentMetadata.finalizationNotes
       });
+      const normalizedSharedNotes = sharedNotes !== void 0 ? sharedNotes === "" || sharedNotes === null ? null : sharedNotes : currentMetadata.finalizationNotesShared;
+      const normalizedInternalNotes = internalNotes !== void 0 ? internalNotes === "" || internalNotes === null ? null : internalNotes : currentMetadata.finalizationNotesInternal;
       const metadataUpdate = {
         selectedZones: currentMetadata.selectedZones,
         zonePhotos: currentMetadata.zonePhotos,
@@ -7299,21 +7368,38 @@ var AppointmentService = class extends BaseService {
         extendedProcedures: currentMetadata.extendedProcedures || [],
         recommendedProcedures: currentMetadata.recommendedProcedures || [],
         finalbilling: currentMetadata.finalbilling,
-        finalizationNotesShared: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotesShared,
-        finalizationNotesInternal: internalNotes !== void 0 ? internalNotes : currentMetadata.finalizationNotesInternal,
+        finalizationNotesShared: normalizedSharedNotes,
+        finalizationNotesInternal: normalizedInternalNotes,
         // Keep deprecated field for backward compatibility during migration
-        finalizationNotes: sharedNotes !== void 0 ? sharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
+        finalizationNotes: normalizedSharedNotes !== null && normalizedSharedNotes !== void 0 ? normalizedSharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared
       };
       console.log("\u{1F50D} [APPOINTMENT_SERVICE] Update data metadata:", {
         finalizationNotesShared: metadataUpdate.finalizationNotesShared,
         finalizationNotesInternal: metadataUpdate.finalizationNotesInternal,
-        finalizationNotes: metadataUpdate.finalizationNotes
+        finalizationNotes: metadataUpdate.finalizationNotes,
+        normalizedSharedNotes,
+        normalizedInternalNotes
       });
-      const updateData = {
-        metadata: metadataUpdate,
+      const appointmentRef = (0, import_firestore14.doc)(this.db, APPOINTMENTS_COLLECTION, appointmentId);
+      const updateFields = {
+        "metadata.finalizationNotesShared": normalizedSharedNotes,
+        "metadata.finalizationNotesInternal": normalizedInternalNotes,
+        "metadata.finalizationNotes": normalizedSharedNotes !== null && normalizedSharedNotes !== void 0 ? normalizedSharedNotes : currentMetadata.finalizationNotes || currentMetadata.finalizationNotesShared,
         updatedAt: (0, import_firestore14.serverTimestamp)()
       };
-      const result = await this.updateAppointment(appointmentId, updateData);
+      console.log("\u{1F50D} [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"]
+        }
+      });
+      await (0, import_firestore14.updateDoc)(appointmentRef, updateFields);
+      const result = await this.getAppointmentById(appointmentId);
+      if (!result) {
+        throw new Error(`Failed to retrieve updated appointment ${appointmentId}`);
+      }
       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,
@@ -22515,10 +22601,72 @@ var ProcedureService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * Creates a serializable cursor from a DocumentSnapshot or returns the cursor values.
+   * This format can be passed through React Native state/Redux without losing data.
+   *
+   * @param doc - The Firestore DocumentSnapshot
+   * @param orderByField - The field used in orderBy clause
+   * @returns Serializable cursor object with values needed for startAfter
+   */
+  createSerializableCursor(doc47, orderByField = "createdAt") {
+    if (!doc47) return null;
+    const data = typeof doc47.data === "function" ? doc47.data() : doc47;
+    const docId = doc47.id || (data == null ? void 0 : data.id);
+    if (!docId) return null;
+    let orderByValue = data == null ? void 0 : data[orderByField];
+    if (orderByValue && typeof orderByValue.toDate === "function") {
+      orderByValue = orderByValue.toMillis();
+    } else if (orderByValue && orderByValue.seconds) {
+      orderByValue = orderByValue.seconds * 1e3 + (orderByValue.nanoseconds || 0) / 1e6;
+    }
+    return {
+      __cursor: true,
+      values: [orderByValue],
+      id: docId,
+      orderByField
+    };
+  }
+  /**
+   * Converts a serializable cursor back to values for startAfter.
+   * Handles both native DocumentSnapshots and serialized cursor objects.
+   *
+   * @param lastDoc - Either a DocumentSnapshot or a serializable cursor object
+   * @param orderByField - The field used in orderBy clause (for validation)
+   * @returns Values to spread into startAfter, or null if invalid
+   */
+  getCursorValuesForStartAfter(lastDoc, orderByField = "createdAt") {
+    if (!lastDoc) return null;
+    if (typeof lastDoc.data === "function") {
+      return [lastDoc];
+    }
+    if (lastDoc.__cursor && Array.isArray(lastDoc.values)) {
+      if (orderByField === "createdAt" && typeof lastDoc.values[0] === "number") {
+        const timestamp = import_firestore58.Timestamp.fromMillis(lastDoc.values[0]);
+        return [timestamp];
+      }
+      return lastDoc.values;
+    }
+    if (Array.isArray(lastDoc)) {
+      return lastDoc;
+    }
+    if (lastDoc[orderByField]) {
+      let value = lastDoc[orderByField];
+      if (typeof value === "number" && orderByField === "createdAt") {
+        value = import_firestore58.Timestamp.fromMillis(value);
+      } else if (value.seconds && orderByField === "createdAt") {
+        value = new import_firestore58.Timestamp(value.seconds, value.nanoseconds || 0);
+      }
+      return [value];
+    }
+    console.warn("[PROCEDURE_SERVICE] Could not parse lastDoc cursor:", typeof lastDoc);
+    return null;
+  }
   /**
    * Searches and filters procedures based on multiple criteria
    *
-   * @note Frontend MORA da šalje ceo snapshot (ili barem sva polja po kojima sortiraš, npr. nameLower) kao lastDoc za paginaciju, a ne samo id!
+   * @note Frontend can now send either a DocumentSnapshot or a serializable cursor object.
+   * The serializable cursor format is: { __cursor: true, values: [...], id: string, orderByField: string }
    *
    * @param filters - Various filters to apply
    * @param filters.nameSearch - Optional search text for procedure name
@@ -22614,12 +22762,10 @@ var ProcedureService = class extends BaseService {
           constraints.push((0, import_firestore58.where)("nameLower", "<=", searchTerm + "\uF8FF"));
           constraints.push((0, import_firestore58.orderBy)("nameLower"));
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push((0, import_firestore58.startAfter)(...filters.lastDoc));
-            } else {
-              constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "nameLower");
+            if (cursorValues) {
+              constraints.push((0, import_firestore58.startAfter)(...cursorValues));
+              console.log("[PROCEDURE_SERVICE] Strategy 1: Using cursor for pagination");
             }
           }
           constraints.push((0, import_firestore58.limit)(filters.pagination || 10));
@@ -22638,8 +22784,9 @@ var ProcedureService = class extends BaseService {
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
-          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-          return { procedures, lastDoc };
+          const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "nameLower");
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 1 failed:", error);
         }
@@ -22657,12 +22804,10 @@ var ProcedureService = class extends BaseService {
           constraints.push((0, import_firestore58.where)("name", "<=", searchTerm + "\uF8FF"));
           constraints.push((0, import_firestore58.orderBy)("name"));
           if (filters.lastDoc) {
-            if (typeof filters.lastDoc.data === "function") {
-              constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
-            } else if (Array.isArray(filters.lastDoc)) {
-              constraints.push((0, import_firestore58.startAfter)(...filters.lastDoc));
-            } else {
-              constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
+            const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "name");
+            if (cursorValues) {
+              constraints.push((0, import_firestore58.startAfter)(...cursorValues));
+              console.log("[PROCEDURE_SERVICE] Strategy 2: Using cursor for pagination");
             }
           }
           constraints.push((0, import_firestore58.limit)(filters.pagination || 10));
@@ -22681,8 +22826,9 @@ var ProcedureService = class extends BaseService {
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
-          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-          return { procedures, lastDoc };
+          const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+          const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "name");
+          return { procedures, lastDoc: serializableCursor };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 2 failed:", error);
         }
@@ -22732,12 +22878,10 @@ var ProcedureService = class extends BaseService {
         );
         constraints.push((0, import_firestore58.orderBy)("createdAt", "desc"));
         if (filters.lastDoc) {
-          if (typeof filters.lastDoc.data === "function") {
-            constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
-          } else if (Array.isArray(filters.lastDoc)) {
-            constraints.push((0, import_firestore58.startAfter)(...filters.lastDoc));
-          } else {
-            constraints.push((0, import_firestore58.startAfter)(filters.lastDoc));
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "createdAt");
+          if (cursorValues) {
+            constraints.push((0, import_firestore58.startAfter)(...cursorValues));
+            console.log("[PROCEDURE_SERVICE] Strategy 3: Using cursor for pagination");
           }
         }
         constraints.push((0, import_firestore58.limit)(filters.pagination || 10));
@@ -22768,8 +22912,9 @@ var ProcedureService = class extends BaseService {
         if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        return { procedures, lastDoc };
+        const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "createdAt");
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 3 failed:", error);
       }
@@ -22785,6 +22930,13 @@ var ProcedureService = class extends BaseService {
         if (filters.clinicId) {
           constraints.push((0, import_firestore58.where)("clinicBranchId", "==", filters.clinicId));
         }
+        if (filters.lastDoc) {
+          const cursorValues = this.getCursorValuesForStartAfter(filters.lastDoc, "createdAt");
+          if (cursorValues) {
+            constraints.push((0, import_firestore58.startAfter)(...cursorValues));
+            console.log("[PROCEDURE_SERVICE] Strategy 4: Using cursor for pagination");
+          }
+        }
         constraints.push((0, import_firestore58.limit)(filters.pagination || 10));
         const q = (0, import_firestore58.query)((0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION), ...constraints);
         const querySnapshot = await (0, import_firestore58.getDocs)(q);
@@ -22799,8 +22951,9 @@ var ProcedureService = class extends BaseService {
         if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        return { procedures, lastDoc };
+        const lastDocSnapshot = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        const serializableCursor = this.createSerializableCursor(lastDocSnapshot, "createdAt");
+        return { procedures, lastDoc: serializableCursor };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 4 failed:", error);
       }