@blackcode_sa/metaestetics-api 1.14.49 → 1.14.51

package/package.json

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

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

@@ -1,8 +1,9 @@
-import { Firestore, collection, doc, addDoc, deleteDoc, getDocs, query, where, serverTimestamp, getDoc } from 'firebase/firestore';
+import { Firestore, collection, doc, addDoc, deleteDoc, getDocs, query, where, serverTimestamp, getDoc, updateDoc } from 'firebase/firestore';
 import {
   DocumentTemplate,
   FilledDocumentStatus,
   DOCTOR_FORMS_SUBCOLLECTION,
+  USER_FORMS_SUBCOLLECTION,
   DOCUMENTATION_TEMPLATES_COLLECTION,
 } from '../../../types/documentation-templates';
 import {
@@ -77,7 +78,7 @@ export async function initializeFormsForExtendedProcedure(
     }
   }
 
-  // Initialize forms for each template (only doctor forms for extended procedures)
+  // Initialize forms for each template (both user forms and doctor forms for extended procedures)
   for (const templateRef of technologyTemplates) {
     const template = templatesMap.get(templateRef.templateId);
     if (!template) {
@@ -87,16 +88,11 @@ export async function initializeFormsForExtendedProcedure(
       continue;
     }
 
-    // Skip user forms - only create doctor forms for extended procedures
-    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;
 
     // Create form document in subcollection
     const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -105,7 +101,7 @@ export async function initializeFormsForExtendedProcedure(
     const filledDocumentData = {
       templateId: templateRef.templateId,
       templateVersion: template.version,
-      isUserForm: false, // Always false for extended procedures
+      isUserForm: isUserForm,
       isRequired: isRequired,
       appointmentId: appointmentId,
       procedureId: procedureId,
@@ -122,7 +118,13 @@ export async function initializeFormsForExtendedProcedure(
       const docRef = await addDoc(formsCollectionRef, filledDocumentData);
       const filledDocumentId = docRef.id;
 
-      // No user forms for extended procedures, so no pending user forms
+      // Update the document to include the id field in the data (for consistency)
+      await updateDoc(docRef, { id: filledDocumentId });
+
+      // Add to pendingUserFormsIds if it's a required user form
+      if (isUserForm && isRequired) {
+        pendingUserFormsIds.push(filledDocumentId);
+      }
 
       allLinkedFormIds.push(filledDocumentId);
 
@@ -131,7 +133,7 @@ export async function initializeFormsForExtendedProcedure(
         templateId: template.id,
         templateVersion: template.version,
         title: template.title,
-        isUserForm: false, // Always false for extended procedures
+        isUserForm: isUserForm,
         isRequired: isRequired,
         sortingOrder: templateRef.sortingOrder,
         status: FilledDocumentStatus.PENDING,
@@ -140,7 +142,7 @@ export async function initializeFormsForExtendedProcedure(
       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(
@@ -155,6 +157,7 @@ export async function initializeFormsForExtendedProcedure(
 
 /**
  * Removes all forms associated with a specific procedure from an appointment
+ * Removes both user forms and doctor forms
  * @param db Firestore instance
  * @param appointmentId Appointment ID
  * @param procedureId Procedure ID to remove forms for
@@ -167,11 +170,10 @@ export async function removeFormsForExtendedProcedure(
 ): Promise<string[]> {
   const removedFormIds: string[] = [];
 
-  // Only remove from doctor forms subcollection (no user forms for extended procedures)
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
 
-  // Query doctor forms for this procedure
+  // Remove from doctor forms subcollection
+  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
   const doctorFormsQuery = query(
     doctorFormsRef,
     where('procedureId', '==', procedureId)
@@ -193,6 +195,29 @@ export async function removeFormsForExtendedProcedure(
     }
   }
 
+  // Remove from user forms subcollection
+  const userFormsRef = collection(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = query(
+    userFormsRef,
+    where('procedureId', '==', procedureId)
+  );
+  const userFormsSnap = await getDocs(userFormsQuery);
+
+  for (const formDoc of userFormsSnap.docs) {
+    try {
+      await 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;
 }
 
@@ -211,9 +236,9 @@ export async function getFormsForExtendedProcedure(
   const formIds: string[] = [];
 
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
-  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
 
   // Query doctor forms for this procedure
+  const doctorFormsRef = collection(appointmentRef, DOCTOR_FORMS_SUBCOLLECTION);
   const doctorFormsQuery = query(
     doctorFormsRef,
     where('procedureId', '==', procedureId)
@@ -221,5 +246,14 @@ export async function getFormsForExtendedProcedure(
   const doctorFormsSnap = await getDocs(doctorFormsQuery);
   doctorFormsSnap.docs.forEach(doc => formIds.push(doc.id));
 
+  // Query user forms for this procedure
+  const userFormsRef = collection(appointmentRef, USER_FORMS_SUBCOLLECTION);
+  const userFormsQuery = query(
+    userFormsRef,
+    where('procedureId', '==', procedureId)
+  );
+  const userFormsSnap = await getDocs(userFormsQuery);
+  userFormsSnap.docs.forEach(doc => formIds.push(doc.id));
+
   return formIds;
 }

package/src/services/documentation-templates/filled-document.service.ts

@@ -144,7 +144,12 @@ export class FilledDocumentService extends BaseService {
     if (!docSnap.exists()) {
       return null;
     }
-    return docSnap.data() as FilledDocument;
+    const data = docSnap.data() as FilledDocument;
+    // Ensure id is populated from Firestore document ID if not in data
+    if (!data.id) {
+      data.id = docSnap.id;
+    }
+    return data;
   }
 
   /**
@@ -287,9 +292,14 @@ export class FilledDocumentService extends BaseService {
     const documents: FilledDocument[] = [];
     let lastVisible: QueryDocumentSnapshot<FilledDocument> | null = null;
 
-    querySnapshot.forEach((doc) => {
-      documents.push(doc.data() as FilledDocument);
-      lastVisible = doc as QueryDocumentSnapshot<FilledDocument>;
+    querySnapshot.forEach((docSnapshot) => {
+      const data = docSnapshot.data() as FilledDocument;
+      // Ensure id is populated from Firestore document ID if not in data
+      if (!data.id) {
+        data.id = docSnapshot.id;
+      }
+      documents.push(data);
+      lastVisible = docSnapshot as QueryDocumentSnapshot<FilledDocument>;
     });
 
     return {