@blackcode_sa/metaestetics-api 1.7.17 → 1.7.19

package/dist/index.d.mts

@@ -6804,46 +6804,34 @@ declare class FilledDocumentService extends BaseService {
         lastDoc: QueryDocumentSnapshot<FilledDocument> | null;
     }>;
     /**
-     * Upload a file and associate it with a filled document field.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param file - The file to upload.
-     * @param fieldId - The ID of the field in the document to associate with this file.
-     * @param accessLevel - Access level for the file, defaults to PRIVATE.
-     * @returns The updated filled document with file information.
+     * Upload a file for a filled document field without updating the document.
+     * This method only handles the upload and returns the file value to be used by the UI.
+     *
+     * @param appointmentId - ID of the appointment
+     * @param formId - ID of the filled document
+     * @param isUserForm - Boolean indicating if it's a user form or doctor form
+     * @param file - The file to upload
+     * @returns The file value object to be stored in the document
      */
-    uploadFileForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, file: File | Blob, fieldId: string, accessLevel?: MediaAccessLevel): Promise<FilledDocument>;
+    uploadFileForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, file: File | Blob): Promise<FilledDocumentFileValue>;
     /**
-     * Upload a signature image for a filled document field.
+     * Upload a signature image for a filled document.
      * This is a specialized version of uploadFileForFilledDocument specifically for signatures.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param signatureBlob - The signature image as a Blob.
-     * @param fieldId - The ID of the signature field in the document.
-     * @returns The updated filled document with signature information.
-     */
-    uploadSignatureForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, signatureBlob: Blob, fieldId: string): Promise<FilledDocument>;
-    /**
-     * Remove a file from a filled document field.
-     * This will both update the document and delete the media file.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param fieldId - The ID of the field containing the file.
-     * @returns The updated filled document with the file removed.
+     *
+     * @param appointmentId - ID of the appointment
+     * @param formId - ID of the filled document
+     * @param isUserForm - Boolean indicating if it's a user form or doctor form
+     * @param signatureBlob - The signature image as a Blob
+     * @returns The file value object to be stored in the document
      */
-    removeFileFromFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, fieldId: string): Promise<FilledDocument>;
+    uploadSignatureForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, signatureBlob: Blob): Promise<FilledDocumentFileValue>;
     /**
-     * Get the download URL for a file in a filled document.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param fieldId - The ID of the field containing the file.
-     * @returns The download URL for the file, or null if not found.
+     * Delete a file using its mediaId.
+     *
+     * @param mediaId - ID of the media to delete
+     * @returns Promise resolving when the deletion is complete
      */
-    getFileUrlFromFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, fieldId: string): Promise<string | null>;
+    deleteFile(mediaId: string): Promise<void>;
 }
 
 /**

package/dist/index.d.ts

@@ -6804,46 +6804,34 @@ declare class FilledDocumentService extends BaseService {
         lastDoc: QueryDocumentSnapshot<FilledDocument> | null;
     }>;
     /**
-     * Upload a file and associate it with a filled document field.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param file - The file to upload.
-     * @param fieldId - The ID of the field in the document to associate with this file.
-     * @param accessLevel - Access level for the file, defaults to PRIVATE.
-     * @returns The updated filled document with file information.
+     * Upload a file for a filled document field without updating the document.
+     * This method only handles the upload and returns the file value to be used by the UI.
+     *
+     * @param appointmentId - ID of the appointment
+     * @param formId - ID of the filled document
+     * @param isUserForm - Boolean indicating if it's a user form or doctor form
+     * @param file - The file to upload
+     * @returns The file value object to be stored in the document
      */
-    uploadFileForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, file: File | Blob, fieldId: string, accessLevel?: MediaAccessLevel): Promise<FilledDocument>;
+    uploadFileForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, file: File | Blob): Promise<FilledDocumentFileValue>;
     /**
-     * Upload a signature image for a filled document field.
+     * Upload a signature image for a filled document.
      * This is a specialized version of uploadFileForFilledDocument specifically for signatures.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param signatureBlob - The signature image as a Blob.
-     * @param fieldId - The ID of the signature field in the document.
-     * @returns The updated filled document with signature information.
-     */
-    uploadSignatureForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, signatureBlob: Blob, fieldId: string): Promise<FilledDocument>;
-    /**
-     * Remove a file from a filled document field.
-     * This will both update the document and delete the media file.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param fieldId - The ID of the field containing the file.
-     * @returns The updated filled document with the file removed.
+     *
+     * @param appointmentId - ID of the appointment
+     * @param formId - ID of the filled document
+     * @param isUserForm - Boolean indicating if it's a user form or doctor form
+     * @param signatureBlob - The signature image as a Blob
+     * @returns The file value object to be stored in the document
      */
-    removeFileFromFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, fieldId: string): Promise<FilledDocument>;
+    uploadSignatureForFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, signatureBlob: Blob): Promise<FilledDocumentFileValue>;
     /**
-     * Get the download URL for a file in a filled document.
-     * @param appointmentId - ID of the appointment.
-     * @param formId - ID of the filled document.
-     * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-     * @param fieldId - The ID of the field containing the file.
-     * @returns The download URL for the file, or null if not found.
+     * Delete a file using its mediaId.
+     *
+     * @param mediaId - ID of the media to delete
+     * @returns Promise resolving when the deletion is complete
      */
-    getFileUrlFromFilledDocument(appointmentId: string, formId: string, isUserForm: boolean, fieldId: string): Promise<string | null>;
+    deleteFile(mediaId: string): Promise<void>;
 }
 
 /**

package/dist/index.js

@@ -9627,37 +9627,30 @@ var FilledDocumentService = class extends BaseService {
     return { documents: [], lastDoc: null };
   }
   /**
-   * Upload a file and associate it with a filled document field.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param file - The file to upload.
-   * @param fieldId - The ID of the field in the document to associate with this file.
-   * @param accessLevel - Access level for the file, defaults to PRIVATE.
-   * @returns The updated filled document with file information.
+   * Upload a file for a filled document field without updating the document.
+   * This method only handles the upload and returns the file value to be used by the UI.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param file - The file to upload
+   * @returns The file value object to be stored in the document
    */
-  async uploadFileForFilledDocument(appointmentId, formId, isUserForm, file, fieldId, accessLevel = "private" /* PRIVATE */) {
+  async uploadFileForFilledDocument(appointmentId, formId, isUserForm, file) {
     console.log(
-      `[FilledDocumentService] Uploading file for field ${fieldId} in form ${formId}`
-    );
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
+      `[FilledDocumentService] Uploading file for form ${formId} in appointment ${appointmentId}`
     );
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
-    const ownerId = existingDoc.patientId;
-    const collectionName = isUserForm ? "patient_forms_files" : "doctor_forms_files";
+    const fileId = this.generateId();
+    const formType = isUserForm ? "user-form" : "doctor-form";
+    const collectionName = `${formType}/${formId}`;
+    const accessLevel = "confidential" /* CONFIDENTIAL */;
     const mediaMetadata = await this.mediaService.uploadMedia(
       file,
-      ownerId,
+      appointmentId,
+      // Using appointmentId as ownerId
       accessLevel,
       collectionName,
-      file instanceof File ? file.name : `${fieldId}_file`
+      file instanceof File ? file.name : `file_${fileId}`
     );
     const fileValue = {
       mediaId: mediaMetadata.id,
@@ -9667,118 +9660,49 @@ var FilledDocumentService = class extends BaseService {
       size: mediaMetadata.size,
       uploadedAt: Date.now()
     };
-    const values = {
-      [fieldId]: fileValue
-    };
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
-    );
+    return fileValue;
   }
   /**
-   * Upload a signature image for a filled document field.
+   * Upload a signature image for a filled document.
    * This is a specialized version of uploadFileForFilledDocument specifically for signatures.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param signatureBlob - The signature image as a Blob.
-   * @param fieldId - The ID of the signature field in the document.
-   * @returns The updated filled document with signature information.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param signatureBlob - The signature image as a Blob
+   * @returns The file value object to be stored in the document
    */
-  async uploadSignatureForFilledDocument(appointmentId, formId, isUserForm, signatureBlob, fieldId) {
+  async uploadSignatureForFilledDocument(appointmentId, formId, isUserForm, signatureBlob) {
     console.log(
-      `[FilledDocumentService] Uploading signature for field ${fieldId} in form ${formId}`
+      `[FilledDocumentService] Uploading signature for form ${formId}`
     );
+    const signatureId = this.generateId();
     const signatureFile = new File(
       [signatureBlob],
-      `signature_${fieldId}.png`,
-      {
-        type: "image/png"
-      }
+      `signature_${signatureId}.png`,
+      { type: "image/png" }
     );
     return this.uploadFileForFilledDocument(
       appointmentId,
       formId,
       isUserForm,
-      signatureFile,
-      fieldId,
-      "confidential" /* CONFIDENTIAL */
-      // Signatures should be confidential
+      signatureFile
     );
   }
   /**
-   * Remove a file from a filled document field.
-   * This will both update the document and delete the media file.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The updated filled document with the file removed.
-   */
-  async removeFileFromFilledDocument(appointmentId, formId, isUserForm, fieldId) {
-    var _a;
-    console.log(
-      `[FilledDocumentService] Removing file from field ${fieldId} in form ${formId}`
-    );
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
-    );
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
-    const fileValue = (_a = existingDoc.values) == null ? void 0 : _a[fieldId];
-    if (fileValue && fileValue.mediaId) {
-      try {
-        await this.mediaService.deleteMedia(fileValue.mediaId);
-      } catch (error) {
-        console.error(
-          `[FilledDocumentService] Error deleting media ${fileValue.mediaId}:`,
-          error
-        );
-      }
-    }
-    const values = {
-      [fieldId]: null
-    };
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
-    );
-  }
-  /**
-   * Get the download URL for a file in a filled document.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The download URL for the file, or null if not found.
+   * Delete a file using its mediaId.
+   *
+   * @param mediaId - ID of the media to delete
+   * @returns Promise resolving when the deletion is complete
    */
-  async getFileUrlFromFilledDocument(appointmentId, formId, isUserForm, fieldId) {
-    var _a;
+  async deleteFile(mediaId) {
     console.log(
-      `[FilledDocumentService] Getting file URL for field ${fieldId} in form ${formId}`
-    );
-    const doc34 = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
+      `[FilledDocumentService] Deleting file with mediaId ${mediaId}`
     );
-    if (!doc34) {
-      return null;
+    if (!mediaId) {
+      throw new Error("MediaId is required to delete a file");
     }
-    const fileValue = (_a = doc34.values) == null ? void 0 : _a[fieldId];
-    if (fileValue && fileValue.url) {
-      return fileValue.url;
-    }
-    return null;
+    await this.mediaService.deleteMedia(mediaId);
   }
 };
 

package/dist/index.mjs

@@ -9640,37 +9640,30 @@ var FilledDocumentService = class extends BaseService {
     return { documents: [], lastDoc: null };
   }
   /**
-   * Upload a file and associate it with a filled document field.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param file - The file to upload.
-   * @param fieldId - The ID of the field in the document to associate with this file.
-   * @param accessLevel - Access level for the file, defaults to PRIVATE.
-   * @returns The updated filled document with file information.
+   * Upload a file for a filled document field without updating the document.
+   * This method only handles the upload and returns the file value to be used by the UI.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param file - The file to upload
+   * @returns The file value object to be stored in the document
    */
-  async uploadFileForFilledDocument(appointmentId, formId, isUserForm, file, fieldId, accessLevel = "private" /* PRIVATE */) {
+  async uploadFileForFilledDocument(appointmentId, formId, isUserForm, file) {
     console.log(
-      `[FilledDocumentService] Uploading file for field ${fieldId} in form ${formId}`
-    );
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
+      `[FilledDocumentService] Uploading file for form ${formId} in appointment ${appointmentId}`
     );
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
-    const ownerId = existingDoc.patientId;
-    const collectionName = isUserForm ? "patient_forms_files" : "doctor_forms_files";
+    const fileId = this.generateId();
+    const formType = isUserForm ? "user-form" : "doctor-form";
+    const collectionName = `${formType}/${formId}`;
+    const accessLevel = "confidential" /* CONFIDENTIAL */;
     const mediaMetadata = await this.mediaService.uploadMedia(
       file,
-      ownerId,
+      appointmentId,
+      // Using appointmentId as ownerId
       accessLevel,
       collectionName,
-      file instanceof File ? file.name : `${fieldId}_file`
+      file instanceof File ? file.name : `file_${fileId}`
     );
     const fileValue = {
       mediaId: mediaMetadata.id,
@@ -9680,118 +9673,49 @@ var FilledDocumentService = class extends BaseService {
       size: mediaMetadata.size,
       uploadedAt: Date.now()
     };
-    const values = {
-      [fieldId]: fileValue
-    };
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
-    );
+    return fileValue;
   }
   /**
-   * Upload a signature image for a filled document field.
+   * Upload a signature image for a filled document.
    * This is a specialized version of uploadFileForFilledDocument specifically for signatures.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param signatureBlob - The signature image as a Blob.
-   * @param fieldId - The ID of the signature field in the document.
-   * @returns The updated filled document with signature information.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param signatureBlob - The signature image as a Blob
+   * @returns The file value object to be stored in the document
    */
-  async uploadSignatureForFilledDocument(appointmentId, formId, isUserForm, signatureBlob, fieldId) {
+  async uploadSignatureForFilledDocument(appointmentId, formId, isUserForm, signatureBlob) {
     console.log(
-      `[FilledDocumentService] Uploading signature for field ${fieldId} in form ${formId}`
+      `[FilledDocumentService] Uploading signature for form ${formId}`
     );
+    const signatureId = this.generateId();
     const signatureFile = new File(
       [signatureBlob],
-      `signature_${fieldId}.png`,
-      {
-        type: "image/png"
-      }
+      `signature_${signatureId}.png`,
+      { type: "image/png" }
     );
     return this.uploadFileForFilledDocument(
       appointmentId,
       formId,
       isUserForm,
-      signatureFile,
-      fieldId,
-      "confidential" /* CONFIDENTIAL */
-      // Signatures should be confidential
+      signatureFile
     );
   }
   /**
-   * Remove a file from a filled document field.
-   * This will both update the document and delete the media file.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The updated filled document with the file removed.
-   */
-  async removeFileFromFilledDocument(appointmentId, formId, isUserForm, fieldId) {
-    var _a;
-    console.log(
-      `[FilledDocumentService] Removing file from field ${fieldId} in form ${formId}`
-    );
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
-    );
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
-    const fileValue = (_a = existingDoc.values) == null ? void 0 : _a[fieldId];
-    if (fileValue && fileValue.mediaId) {
-      try {
-        await this.mediaService.deleteMedia(fileValue.mediaId);
-      } catch (error) {
-        console.error(
-          `[FilledDocumentService] Error deleting media ${fileValue.mediaId}:`,
-          error
-        );
-      }
-    }
-    const values = {
-      [fieldId]: null
-    };
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
-    );
-  }
-  /**
-   * Get the download URL for a file in a filled document.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The download URL for the file, or null if not found.
+   * Delete a file using its mediaId.
+   *
+   * @param mediaId - ID of the media to delete
+   * @returns Promise resolving when the deletion is complete
    */
-  async getFileUrlFromFilledDocument(appointmentId, formId, isUserForm, fieldId) {
-    var _a;
+  async deleteFile(mediaId) {
     console.log(
-      `[FilledDocumentService] Getting file URL for field ${fieldId} in form ${formId}`
-    );
-    const doc34 = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
+      `[FilledDocumentService] Deleting file with mediaId ${mediaId}`
     );
-    if (!doc34) {
-      return null;
+    if (!mediaId) {
+      throw new Error("MediaId is required to delete a file");
     }
-    const fileValue = (_a = doc34.values) == null ? void 0 : _a[fieldId];
-    if (fileValue && fileValue.url) {
-      return fileValue.url;
-    }
-    return null;
+    await this.mediaService.deleteMedia(mediaId);
   }
 };
 

package/package.json

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

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

@@ -478,55 +478,45 @@ export class FilledDocumentService extends BaseService {
   }
 
   /**
-   * Upload a file and associate it with a filled document field.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param file - The file to upload.
-   * @param fieldId - The ID of the field in the document to associate with this file.
-   * @param accessLevel - Access level for the file, defaults to PRIVATE.
-   * @returns The updated filled document with file information.
+   * Upload a file for a filled document field without updating the document.
+   * This method only handles the upload and returns the file value to be used by the UI.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param file - The file to upload
+   * @returns The file value object to be stored in the document
    */
   async uploadFileForFilledDocument(
     appointmentId: string,
     formId: string,
     isUserForm: boolean,
-    file: File | Blob,
-    fieldId: string,
-    accessLevel: MediaAccessLevel = MediaAccessLevel.PRIVATE
-  ): Promise<FilledDocument> {
+    file: File | Blob
+  ): Promise<FilledDocumentFileValue> {
     console.log(
-      `[FilledDocumentService] Uploading file for field ${fieldId} in form ${formId}`
+      `[FilledDocumentService] Uploading file for form ${formId} in appointment ${appointmentId}`
     );
 
-    // 1. Get the existing document to verify it exists and to get the patientId
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
-    );
+    // Generate a unique file ID
+    const fileId = this.generateId();
 
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
+    // Set the path according to the specified structure
+    const formType = isUserForm ? "user-form" : "doctor-form";
+    const collectionName = `${formType}/${formId}`;
 
-    // 2. Upload the file using MediaService
-    const ownerId = existingDoc.patientId; // Using patientId as ownerId for permissions
-    const collectionName = isUserForm
-      ? "patient_forms_files"
-      : "doctor_forms_files";
+    // Always use CONFIDENTIAL access level
+    const accessLevel = MediaAccessLevel.CONFIDENTIAL;
 
+    // Upload the file using MediaService
     const mediaMetadata = await this.mediaService.uploadMedia(
       file,
-      ownerId,
+      appointmentId, // Using appointmentId as ownerId
       accessLevel,
       collectionName,
-      file instanceof File ? file.name : `${fieldId}_file`
+      file instanceof File ? file.name : `file_${fileId}`
     );
 
-    // 3. Create a file value object to store in the document
+    // Create and return a file value object
     const fileValue: FilledDocumentFileValue = {
       mediaId: mediaMetadata.id,
       url: mediaMetadata.url,
@@ -536,156 +526,62 @@ export class FilledDocumentService extends BaseService {
       uploadedAt: Date.now(),
     };
 
-    // 4. Update the document with the file value
-    const values = {
-      [fieldId]: fileValue,
-    };
-
-    // 5. Use the existing update method to save the file reference
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
-    );
+    return fileValue;
   }
 
   /**
-   * Upload a signature image for a filled document field.
+   * Upload a signature image for a filled document.
    * This is a specialized version of uploadFileForFilledDocument specifically for signatures.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param signatureBlob - The signature image as a Blob.
-   * @param fieldId - The ID of the signature field in the document.
-   * @returns The updated filled document with signature information.
+   *
+   * @param appointmentId - ID of the appointment
+   * @param formId - ID of the filled document
+   * @param isUserForm - Boolean indicating if it's a user form or doctor form
+   * @param signatureBlob - The signature image as a Blob
+   * @returns The file value object to be stored in the document
    */
   async uploadSignatureForFilledDocument(
     appointmentId: string,
     formId: string,
     isUserForm: boolean,
-    signatureBlob: Blob,
-    fieldId: string
-  ): Promise<FilledDocument> {
+    signatureBlob: Blob
+  ): Promise<FilledDocumentFileValue> {
     console.log(
-      `[FilledDocumentService] Uploading signature for field ${fieldId} in form ${formId}`
+      `[FilledDocumentService] Uploading signature for form ${formId}`
     );
 
-    // Use the general file upload method, but specify a fixed name and access level for signatures
+    // Generate a filename for the signature
+    const signatureId = this.generateId();
     const signatureFile = new File(
       [signatureBlob],
-      `signature_${fieldId}.png`,
-      {
-        type: "image/png",
-      }
+      `signature_${signatureId}.png`,
+      { type: "image/png" }
     );
 
+    // Use the general file upload method
     return this.uploadFileForFilledDocument(
       appointmentId,
       formId,
       isUserForm,
-      signatureFile,
-      fieldId,
-      MediaAccessLevel.CONFIDENTIAL // Signatures should be confidential
-    );
-  }
-
-  /**
-   * Remove a file from a filled document field.
-   * This will both update the document and delete the media file.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The updated filled document with the file removed.
-   */
-  async removeFileFromFilledDocument(
-    appointmentId: string,
-    formId: string,
-    isUserForm: boolean,
-    fieldId: string
-  ): Promise<FilledDocument> {
-    console.log(
-      `[FilledDocumentService] Removing file from field ${fieldId} in form ${formId}`
-    );
-
-    // 1. Get the existing document to verify it exists and to get the file info
-    const existingDoc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
-    );
-
-    if (!existingDoc) {
-      throw new Error(
-        `Filled document with ID ${formId} not found in appointment ${appointmentId}`
-      );
-    }
-
-    // 2. Check if the field has a file value
-    const fileValue = existingDoc.values?.[fieldId] as FilledDocumentFileValue;
-    if (fileValue && fileValue.mediaId) {
-      // 3. Delete the file using MediaService
-      try {
-        await this.mediaService.deleteMedia(fileValue.mediaId);
-      } catch (error) {
-        console.error(
-          `[FilledDocumentService] Error deleting media ${fileValue.mediaId}:`,
-          error
-        );
-        // Continue with document update even if media deletion fails
-      }
-    }
-
-    // 4. Update the document to remove the file reference
-    const values = {
-      [fieldId]: null,
-    };
-
-    // 5. Use the existing update method to save the changes
-    return this.updateFilledDocumentInAppointment(
-      appointmentId,
-      formId,
-      isUserForm,
-      values
+      signatureFile
     );
   }
 
   /**
-   * Get the download URL for a file in a filled document.
-   * @param appointmentId - ID of the appointment.
-   * @param formId - ID of the filled document.
-   * @param isUserForm - Boolean indicating if it's a user form or doctor form.
-   * @param fieldId - The ID of the field containing the file.
-   * @returns The download URL for the file, or null if not found.
+   * Delete a file using its mediaId.
+   *
+   * @param mediaId - ID of the media to delete
+   * @returns Promise resolving when the deletion is complete
    */
-  async getFileUrlFromFilledDocument(
-    appointmentId: string,
-    formId: string,
-    isUserForm: boolean,
-    fieldId: string
-  ): Promise<string | null> {
+  async deleteFile(mediaId: string): Promise<void> {
     console.log(
-      `[FilledDocumentService] Getting file URL for field ${fieldId} in form ${formId}`
+      `[FilledDocumentService] Deleting file with mediaId ${mediaId}`
     );
 
-    // 1. Get the document
-    const doc = await this.getFilledDocumentFromAppointmentById(
-      appointmentId,
-      formId,
-      isUserForm
-    );
-
-    if (!doc) {
-      return null;
-    }
-
-    // 2. Check if the field has a file value
-    const fileValue = doc.values?.[fieldId] as FilledDocumentFileValue;
-    if (fileValue && fileValue.url) {
-      return fileValue.url;
+    if (!mediaId) {
+      throw new Error("MediaId is required to delete a file");
     }
 
-    return null;
+    // Delete the file using MediaService
+    await this.mediaService.deleteMedia(mediaId);
   }
 }