@blackcode_sa/metaestetics-api 1.7.21 → 1.7.22

package/dist/admin/index.js

@@ -4468,32 +4468,21 @@ var FilledFormsAggregationService = class {
         );
       }
       let updateData = {};
-      let existingFormIndex = -1;
+      let updatedLinkedForms = [];
       if (appointment.linkedForms && appointment.linkedForms.length > 0) {
-        existingFormIndex = appointment.linkedForms.findIndex(
-          (form) => form.formId === filledDocument.id
+        updatedLinkedForms = appointment.linkedForms.filter(
+          (form) => form.formId !== filledDocument.id
         );
       }
-      if (existingFormIndex >= 0 && appointment.linkedForms) {
-        updateData = {
-          linkedForms: admin11.firestore.FieldValue.arrayRemove(
-            appointment.linkedForms[existingFormIndex]
-          ),
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
-        await appointmentRef.update(updateData);
-        updateData = {
-          linkedForms: admin11.firestore.FieldValue.arrayUnion(linkedFormInfo),
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
-      } else {
-        updateData = {
-          linkedForms: appointment.linkedForms ? admin11.firestore.FieldValue.arrayUnion(linkedFormInfo) : [linkedFormInfo],
-          // If linkedForms doesn't exist, create a new array
-          linkedFormIds: appointment.linkedFormIds ? admin11.firestore.FieldValue.arrayUnion(filledDocument.id) : [filledDocument.id],
-          // If linkedFormIds doesn't exist, create a new array
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
+      updatedLinkedForms.push(linkedFormInfo);
+      updateData = {
+        linkedForms: updatedLinkedForms,
+        updatedAt: admin11.firestore.FieldValue.serverTimestamp()
+      };
+      let updatedLinkedFormIds = appointment.linkedFormIds || [];
+      if (!updatedLinkedFormIds.includes(filledDocument.id)) {
+        updatedLinkedFormIds.push(filledDocument.id);
+        updateData.linkedFormIds = updatedLinkedFormIds;
       }
       if (filledDocument.isUserForm && filledDocument.isRequired && (filledDocument.status === "completed" /* COMPLETED */ || filledDocument.status === "signed" /* SIGNED */)) {
         if (appointment.pendingUserFormsIds && appointment.pendingUserFormsIds.includes(filledDocument.id)) {

package/dist/admin/index.mjs

@@ -4411,32 +4411,21 @@ var FilledFormsAggregationService = class {
         );
       }
       let updateData = {};
-      let existingFormIndex = -1;
+      let updatedLinkedForms = [];
       if (appointment.linkedForms && appointment.linkedForms.length > 0) {
-        existingFormIndex = appointment.linkedForms.findIndex(
-          (form) => form.formId === filledDocument.id
+        updatedLinkedForms = appointment.linkedForms.filter(
+          (form) => form.formId !== filledDocument.id
         );
       }
-      if (existingFormIndex >= 0 && appointment.linkedForms) {
-        updateData = {
-          linkedForms: admin11.firestore.FieldValue.arrayRemove(
-            appointment.linkedForms[existingFormIndex]
-          ),
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
-        await appointmentRef.update(updateData);
-        updateData = {
-          linkedForms: admin11.firestore.FieldValue.arrayUnion(linkedFormInfo),
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
-      } else {
-        updateData = {
-          linkedForms: appointment.linkedForms ? admin11.firestore.FieldValue.arrayUnion(linkedFormInfo) : [linkedFormInfo],
-          // If linkedForms doesn't exist, create a new array
-          linkedFormIds: appointment.linkedFormIds ? admin11.firestore.FieldValue.arrayUnion(filledDocument.id) : [filledDocument.id],
-          // If linkedFormIds doesn't exist, create a new array
-          updatedAt: admin11.firestore.FieldValue.serverTimestamp()
-        };
+      updatedLinkedForms.push(linkedFormInfo);
+      updateData = {
+        linkedForms: updatedLinkedForms,
+        updatedAt: admin11.firestore.FieldValue.serverTimestamp()
+      };
+      let updatedLinkedFormIds = appointment.linkedFormIds || [];
+      if (!updatedLinkedFormIds.includes(filledDocument.id)) {
+        updatedLinkedFormIds.push(filledDocument.id);
+        updateData.linkedFormIds = updatedLinkedFormIds;
       }
       if (filledDocument.isUserForm && filledDocument.isRequired && (filledDocument.status === "completed" /* COMPLETED */ || filledDocument.status === "signed" /* SIGNED */)) {
         if (appointment.pendingUserFormsIds && appointment.pendingUserFormsIds.includes(filledDocument.id)) {

package/package.json

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

package/src/admin/aggregation/forms/filled-forms.aggregation.service.ts

@@ -94,45 +94,31 @@ export class FilledFormsAggregationService {
         ) as unknown as Timestamp;
       }
 
-      // 3. Check if the appointment already has linkedForms array and this form is in it
+      // 3. Handle linkedForms array - use direct array manipulation to avoid arrayRemove issues
       let updateData: any = {};
-      let existingFormIndex = -1;
+      let updatedLinkedForms: LinkedFormInfo[] = [];
 
       if (appointment.linkedForms && appointment.linkedForms.length > 0) {
-        existingFormIndex = appointment.linkedForms.findIndex(
-          (form) => form.formId === filledDocument.id
+        // Filter out any existing entries for this form ID to prevent duplicates
+        updatedLinkedForms = appointment.linkedForms.filter(
+          (form) => form.formId !== filledDocument.id
         );
       }
 
-      // 4. Update the appointment with the new/updated LinkedFormInfo
-      if (existingFormIndex >= 0 && appointment.linkedForms) {
-        // Form exists, update it using arrayRemove + arrayUnion
-        updateData = {
-          linkedForms: admin.firestore.FieldValue.arrayRemove(
-            appointment.linkedForms[existingFormIndex]
-          ),
-          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-        };
-
-        // First remove the old form info
-        await appointmentRef.update(updateData);
+      // Add the new/updated form info
+      updatedLinkedForms.push(linkedFormInfo);
 
-        // Then add the updated form info
-        updateData = {
-          linkedForms: admin.firestore.FieldValue.arrayUnion(linkedFormInfo),
-          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-        };
-      } else {
-        // Form doesn't exist, add it to the array or create the array
-        updateData = {
-          linkedForms: appointment.linkedForms
-            ? admin.firestore.FieldValue.arrayUnion(linkedFormInfo)
-            : [linkedFormInfo], // If linkedForms doesn't exist, create a new array
-          linkedFormIds: appointment.linkedFormIds
-            ? admin.firestore.FieldValue.arrayUnion(filledDocument.id)
-            : [filledDocument.id], // If linkedFormIds doesn't exist, create a new array
-          updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-        };
+      // Prepare the update data
+      updateData = {
+        linkedForms: updatedLinkedForms,
+        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+      };
+
+      // 4. Handle linkedFormIds array
+      let updatedLinkedFormIds: string[] = appointment.linkedFormIds || [];
+      if (!updatedLinkedFormIds.includes(filledDocument.id)) {
+        updatedLinkedFormIds.push(filledDocument.id);
+        updateData.linkedFormIds = updatedLinkedFormIds;
       }
 
       // 5. Handle pendingUserFormsIds for required user forms