@blackcode_sa/metaestetics-api 1.14.49 → 1.14.51

package/dist/index.js

@@ -4996,21 +4996,15 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       );
       continue;
     }
-    if (templateRef.isUserForm) {
-      console.log(
-        `[FormInit] Skipping user form ${templateRef.templateId} for extended procedure ${procedureId}.`
-      );
-      continue;
-    }
     const isRequired = templateRef.isRequired;
-    const formSubcollectionPath = DOCTOR_FORMS_SUBCOLLECTION;
+    const isUserForm = templateRef.isUserForm || false;
+    const formSubcollectionPath = isUserForm ? USER_FORMS_SUBCOLLECTION : DOCTOR_FORMS_SUBCOLLECTION;
     const appointmentRef = (0, import_firestore9.doc)(db, APPOINTMENTS_COLLECTION, appointmentId);
     const formsCollectionRef = (0, import_firestore9.collection)(appointmentRef, formSubcollectionPath);
     const filledDocumentData = {
       templateId: templateRef.templateId,
       templateVersion: template.version,
-      isUserForm: false,
-      // Always false for extended procedures
+      isUserForm,
       isRequired,
       appointmentId,
       procedureId,
@@ -5025,14 +5019,17 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
     try {
       const docRef = await (0, import_firestore9.addDoc)(formsCollectionRef, filledDocumentData);
       const filledDocumentId = docRef.id;
+      await (0, import_firestore9.updateDoc)(docRef, { id: filledDocumentId });
+      if (isUserForm && isRequired) {
+        pendingUserFormsIds.push(filledDocumentId);
+      }
       allLinkedFormIds.push(filledDocumentId);
       const linkedForm = {
         formId: filledDocumentId,
         templateId: template.id,
         templateVersion: template.version,
         title: template.title,
-        isUserForm: false,
-        // Always false for extended procedures
+        isUserForm,
         isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: "pending" /* PENDING */,
@@ -5040,7 +5037,7 @@ async function initializeFormsForExtendedProcedure(db, appointmentId, procedureI
       };
       initializedFormsInfo.push(linkedForm);
       console.log(
-        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
+        `[FormInit] Created FilledDocument ${filledDocumentId} (template: ${template.id}, isUserForm: ${isUserForm}) for extended procedure ${procedureId} in appointment ${appointmentId}.`
       );
     } catch (error) {
       console.error(
@@ -5074,6 +5071,26 @@ async function removeFormsForExtendedProcedure(db, appointmentId, procedureId) {
       );
     }
   }
+  const userFormsRef = (0, import_firestore9.collection)(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = (0, import_firestore9.query)(
+    userFormsRef,
+    (0, import_firestore9.where)("procedureId", "==", procedureId)
+  );
+  const userFormsSnap = await (0, import_firestore9.getDocs)(userFormsQuery);
+  for (const formDoc of userFormsSnap.docs) {
+    try {
+      await (0, import_firestore9.deleteDoc)(formDoc.ref);
+      removedFormIds.push(formDoc.id);
+      console.log(
+        `[FormInit] Removed user form ${formDoc.id} for extended procedure ${procedureId} from appointment ${appointmentId}.`
+      );
+    } catch (error) {
+      console.error(
+        `[FormInit] Error removing user form ${formDoc.id}:`,
+        error
+      );
+    }
+  }
   return removedFormIds;
 }
 
@@ -20455,7 +20472,11 @@ var FilledDocumentService = class extends BaseService {
     if (!docSnap.exists()) {
       return null;
     }
-    return docSnap.data();
+    const data = docSnap.data();
+    if (!data.id) {
+      data.id = docSnap.id;
+    }
+    return data;
   }
   /**
    * Update values or status in a filled document within an appointment's subcollection.
@@ -20556,9 +20577,13 @@ var FilledDocumentService = class extends BaseService {
     const querySnapshot = await (0, import_firestore55.getDocs)(q);
     const documents = [];
     let lastVisible = null;
-    querySnapshot.forEach((doc47) => {
-      documents.push(doc47.data());
-      lastVisible = doc47;
+    querySnapshot.forEach((docSnapshot) => {
+      const data = docSnapshot.data();
+      if (!data.id) {
+        data.id = docSnapshot.id;
+      }
+      documents.push(data);
+      lastVisible = docSnapshot;
     });
     return {
       documents,