@blackcode_sa/metaestetics-api 1.7.18 → 1.7.20

package/package.json

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

package/src/admin/booking/booking.admin.ts

@@ -613,7 +613,10 @@ export class BookingAdmin {
       };
       const practitionerInfo: PractitionerProfileInfo = {
         id: practitionerSnap.id,
-        practitionerPhoto: practitionerData.basicInfo.profileImageUrl || null,
+        practitionerPhoto:
+          typeof practitionerData.basicInfo.profileImageUrl === "string"
+            ? practitionerData.basicInfo.profileImageUrl
+            : null,
         name: `${practitionerData.basicInfo.firstName} ${practitionerData.basicInfo.lastName}`,
         email: practitionerData.basicInfo.email,
         phone: practitionerData.basicInfo.phoneNumber || null,

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);
   }
 }

package/src/services/practitioner/practitioner.service.ts

@@ -34,6 +34,11 @@ import {
 } from "../../types/practitioner";
 import { ProcedureSummaryInfo } from "../../types/procedure";
 import { ClinicService } from "../clinic/clinic.service";
+import {
+  MediaService,
+  MediaAccessLevel,
+  MediaResource,
+} from "../media/media.service";
 import {
   practitionerSchema,
   createPractitionerSchema,
@@ -53,6 +58,7 @@ import { ClinicInfo } from "../../types/profile";
 
 export class PractitionerService extends BaseService {
   private clinicService?: ClinicService;
+  private mediaService: MediaService;
 
   constructor(
     db: Firestore,
@@ -62,6 +68,7 @@ export class PractitionerService extends BaseService {
   ) {
     super(db, auth, app);
     this.clinicService = clinicService;
+    this.mediaService = new MediaService(db, auth, app);
   }
 
   private getClinicService(): ClinicService {
@@ -75,6 +82,71 @@ export class PractitionerService extends BaseService {
     this.clinicService = clinicService;
   }
 
+  /**
+   * Handles profile photo upload for practitioners
+   * @param profilePhoto - MediaResource (File, Blob, or URL string)
+   * @param practitionerId - ID of the practitioner
+   * @returns URL string of the uploaded or existing photo
+   */
+  private async handleProfilePhotoUpload(
+    profilePhoto: MediaResource | undefined,
+    practitionerId: string
+  ): Promise<string | undefined> {
+    if (!profilePhoto) {
+      return undefined;
+    }
+
+    // If it's already a URL string, return it as is
+    if (typeof profilePhoto === "string") {
+      return profilePhoto;
+    }
+
+    // If it's a File or Blob, upload it
+    if (profilePhoto instanceof File || profilePhoto instanceof Blob) {
+      console.log(
+        `[PractitionerService] Uploading profile photo for practitioner ${practitionerId}`
+      );
+
+      const mediaMetadata = await this.mediaService.uploadMedia(
+        profilePhoto,
+        practitionerId, // Using practitionerId as ownerId
+        MediaAccessLevel.PUBLIC, // Profile photos should be public
+        "practitioner_profile_photos",
+        profilePhoto instanceof File
+          ? profilePhoto.name
+          : `profile_photo_${practitionerId}`
+      );
+
+      return mediaMetadata.url;
+    }
+
+    return undefined;
+  }
+
+  /**
+   * Processes BasicPractitionerInfo to handle profile photo uploads
+   * @param basicInfo - The basic info containing potential MediaResource profile photo
+   * @param practitionerId - ID of the practitioner
+   * @returns Processed basic info with URL string for profileImageUrl
+   */
+  private async processBasicInfo(
+    basicInfo: PractitionerBasicInfo & { profileImageUrl?: MediaResource },
+    practitionerId: string
+  ): Promise<PractitionerBasicInfo> {
+    const processedBasicInfo = { ...basicInfo };
+
+    // Handle profile photo upload if needed
+    if (basicInfo.profileImageUrl) {
+      const uploadedUrl = await this.handleProfilePhotoUpload(
+        basicInfo.profileImageUrl,
+        practitionerId
+      );
+      processedBasicInfo.profileImageUrl = uploadedUrl;
+    }
+
+    return processedBasicInfo;
+  }
+
   /**
    * Creates a new practitioner
    */
@@ -104,7 +176,10 @@ export class PractitionerService extends BaseService {
       } = {
         id: practitionerId,
         userRef: validData.userRef,
-        basicInfo: validData.basicInfo,
+        basicInfo: await this.processBasicInfo(
+          validData.basicInfo,
+          practitionerId
+        ),
         certification: validData.certification,
         clinics: validData.clinics || [],
         clinicWorkingHours: validData.clinicWorkingHours || [],
@@ -254,7 +329,10 @@ export class PractitionerService extends BaseService {
       } = {
         id: practitionerId,
         userRef: "", // Prazno - biće popunjeno kada korisnik kreira nalog
-        basicInfo: validatedData.basicInfo,
+        basicInfo: await this.processBasicInfo(
+          validatedData.basicInfo,
+          practitionerId
+        ),
         certification: validatedData.certification,
         clinics: clinics,
         clinicWorkingHours: validatedData.clinicWorkingHours || [],
@@ -619,9 +697,20 @@ export class PractitionerService extends BaseService {
 
       const currentPractitioner = practitionerDoc.data() as Practitioner;
 
+      // Process basicInfo if it's being updated to handle profile photo uploads
+      let processedData = { ...validData };
+      if (validData.basicInfo) {
+        processedData.basicInfo = await this.processBasicInfo(
+          validData.basicInfo as PractitionerBasicInfo & {
+            profileImageUrl?: MediaResource;
+          },
+          practitionerId
+        );
+      }
+
       // Prepare update data
       const updateData = {
-        ...validData,
+        ...processedData,
         updatedAt: serverTimestamp(),
       };
 

package/src/services/procedure/procedure.service.ts

@@ -251,7 +251,10 @@ export class ProcedureService extends BaseService {
       id: practitionerSnapshot.id,
       name: `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`,
       description: practitioner.basicInfo.bio || "",
-      photo: practitioner.basicInfo.profileImageUrl || "",
+      photo:
+        typeof practitioner.basicInfo.profileImageUrl === "string"
+          ? practitioner.basicInfo.profileImageUrl
+          : "", // Default to empty string if not a processed URL
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
     };
@@ -412,7 +415,10 @@ export class ProcedureService extends BaseService {
         id: newPractitioner.id,
         name: `${newPractitioner.basicInfo.firstName} ${newPractitioner.basicInfo.lastName}`,
         description: newPractitioner.basicInfo.bio || "",
-        photo: newPractitioner.basicInfo.profileImageUrl || "",
+        photo:
+          typeof newPractitioner.basicInfo.profileImageUrl === "string"
+            ? newPractitioner.basicInfo.profileImageUrl
+            : "", // Default to empty string if not a processed URL
         rating: newPractitioner.reviewInfo?.averageRating || 0,
         services: newPractitioner.procedures || [],
       };

package/src/types/practitioner/index.ts

@@ -11,6 +11,7 @@ import {
   PricingMeasure,
 } from "../../backoffice/types/static/pricing.types";
 import { ProcedureSummaryInfo } from "../procedure";
+import type { MediaResource } from "../../services/media/media.service";
 
 export const PRACTITIONERS_COLLECTION = "practitioners";
 export const REGISTER_TOKENS_COLLECTION = "register_tokens";
@@ -26,7 +27,7 @@ export interface PractitionerBasicInfo {
   phoneNumber: string;
   dateOfBirth: Timestamp | Date;
   gender: "male" | "female" | "other";
-  profileImageUrl?: string;
+  profileImageUrl?: MediaResource;
   bio?: string;
   languages: string[];
 }

package/src/validations/media.schema.ts

@@ -4,7 +4,7 @@ import { z } from "zod";
  * Schema for validating both URL strings and File objects
  */
 export const mediaResourceSchema = z.union([
-  z.string(),
+  z.string().url(),
   z.instanceof(File),
   z.instanceof(Blob),
 ]);

package/src/validations/practitioner.schema.ts

@@ -15,6 +15,7 @@ import {
   PricingMeasure,
 } from "../backoffice/types/static/pricing.types";
 import { clinicInfoSchema, procedureSummaryInfoSchema } from "./shared.schema";
+import { mediaResourceSchema } from "./media.schema";
 
 /**
  * Šema za validaciju osnovnih informacija o zdravstvenom radniku
@@ -27,7 +28,7 @@ export const practitionerBasicInfoSchema = z.object({
   phoneNumber: z.string().regex(/^\+?[1-9]\d{1,14}$/, "Invalid phone number"),
   dateOfBirth: z.instanceof(Timestamp).or(z.date()),
   gender: z.enum(["male", "female", "other"]),
-  profileImageUrl: z.string().url().optional(),
+  profileImageUrl: mediaResourceSchema.optional(),
   bio: z.string().max(1000).optional(),
   languages: z.array(z.string()).min(1),
 });
@@ -204,7 +205,7 @@ export const practitionerSignupSchema = z.object({
       basicInfo: z
         .object({
           phoneNumber: z.string().optional(),
-          profileImageUrl: z.string().optional(),
+          profileImageUrl: mediaResourceSchema.optional(),
           gender: z.enum(["male", "female", "other"]).optional(),
           bio: z.string().optional(),
         })