@blackcode_sa/metaestetics-api 1.7.19 → 1.7.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.7.19",
+  "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/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(),
         })