@blackcode_sa/metaestetics-api 1.7.12 → 1.7.14

package/dist/index.d.ts

@@ -507,6 +507,102 @@ declare enum Currency {
     AUD = "AUD"
 }
 
+declare class BaseService {
+    protected db: Firestore;
+    protected auth: Auth;
+    protected app: FirebaseApp;
+    protected storage: FirebaseStorage;
+    constructor(db: Firestore, auth: Auth, app: FirebaseApp);
+    /**
+     * Generiše jedinstveni ID za dokumente
+     * Format: xxxxxxxxxxxx-timestamp
+     * Gde je x random karakter (broj ili slovo)
+     */
+    protected generateId(): string;
+}
+
+/**
+ * Enum for media access levels
+ */
+declare enum MediaAccessLevel {
+    PUBLIC = "public",
+    PRIVATE = "private",
+    CONFIDENTIAL = "confidential"
+}
+/**
+ * Type that allows a field to be either a URL string or a File object
+ */
+type MediaResource = string | File | Blob;
+/**
+ * Media file metadata interface
+ */
+interface MediaMetadata {
+    id: string;
+    name: string;
+    url: string;
+    contentType: string;
+    size: number;
+    createdAt: Timestamp;
+    accessLevel: MediaAccessLevel;
+    ownerId: string;
+    collectionName: string;
+    path: string;
+    updatedAt?: Timestamp;
+}
+declare const MEDIA_METADATA_COLLECTION = "media_metadata";
+declare class MediaService extends BaseService {
+    constructor(db: Firestore, auth: Auth, app: FirebaseApp);
+    /**
+     * Upload a media file, store its metadata, and return the metadata including the URL.
+     * @param file - The file to upload.
+     * @param ownerId - ID of the owner (user, patient, clinic, etc.).
+     * @param accessLevel - Access level (public, private, confidential).
+     * @param collectionName - The logical collection name this media belongs to (e.g., 'patient_profile_pictures', 'clinic_logos').
+     * @param originalFileName - Optional: the original name of the file, if not using file.name.
+     * @returns Promise with the media metadata.
+     */
+    uploadMedia(file: File | Blob, ownerId: string, accessLevel: MediaAccessLevel, collectionName: string, originalFileName?: string): Promise<MediaMetadata>;
+    /**
+     * Get media metadata from Firestore by its ID.
+     * @param mediaId - ID of the media.
+     * @returns Promise with the media metadata or null if not found.
+     */
+    getMediaMetadata(mediaId: string): Promise<MediaMetadata | null>;
+    /**
+     * Get media metadata from Firestore by its public URL.
+     * @param url - The public URL of the media file.
+     * @returns Promise with the media metadata or null if not found.
+     */
+    getMediaMetadataByUrl(url: string): Promise<MediaMetadata | null>;
+    /**
+     * Delete media from storage and remove metadata from Firestore.
+     * @param mediaId - ID of the media to delete.
+     */
+    deleteMedia(mediaId: string): Promise<void>;
+    /**
+     * Update media access level. This involves moving the file in Firebase Storage
+     * to a new path reflecting the new access level, and updating its metadata.
+     * @param mediaId - ID of the media to update.
+     * @param newAccessLevel - New access level.
+     * @returns Promise with the updated media metadata, or null if metadata not found.
+     */
+    updateMediaAccessLevel(mediaId: string, newAccessLevel: MediaAccessLevel): Promise<MediaMetadata | null>;
+    /**
+     * List all media for an owner, optionally filtered by collection and access level.
+     * @param ownerId - ID of the owner.
+     * @param collectionName - Optional: Filter by collection name.
+     * @param accessLevel - Optional: Filter by access level.
+     * @param count - Optional: Number of items to fetch.
+     * @param startAfterId - Optional: ID of the document to start after (for pagination).
+     */
+    listMedia(ownerId: string, collectionName?: string, accessLevel?: MediaAccessLevel, count?: number, startAfterId?: string): Promise<MediaMetadata[]>;
+    /**
+     * Get download URL for media. (Convenience, as URL is in metadata)
+     * @param mediaId - ID of the media.
+     */
+    getMediaDownloadUrl(mediaId: string): Promise<string | null>;
+}
+
 /**
  * Procedure represents a specific medical procedure that can be performed by a practitioner in a clinic
  * It inherits properties from technology and adds clinic/practitioner specific details
@@ -517,7 +613,7 @@ interface Procedure {
     /** Name of the procedure */
     name: string;
     /** Photos of the procedure */
-    photos?: string[];
+    photos?: MediaResource[];
     /** Detailed description of the procedure */
     description: string;
     /** Family of procedures this belongs to (aesthetics/surgery) */
@@ -586,7 +682,7 @@ interface CreateProcedureData {
     duration: number;
     practitionerId: string;
     clinicBranchId: string;
-    photos?: string[];
+    photos?: MediaResource[];
 }
 /**
  * Data that can be updated for an existing procedure
@@ -605,7 +701,7 @@ interface UpdateProcedureData {
     technologyId?: string;
     productId?: string;
     clinicBranchId?: string;
-    photos?: string[];
+    photos?: MediaResource[];
 }
 /**
  * Collection name for procedures in Firestore
@@ -749,102 +845,6 @@ declare enum ClinicPhotoTag {
     OTHER = "other"
 }
 
-declare class BaseService {
-    protected db: Firestore;
-    protected auth: Auth;
-    protected app: FirebaseApp;
-    protected storage: FirebaseStorage;
-    constructor(db: Firestore, auth: Auth, app: FirebaseApp);
-    /**
-     * Generiše jedinstveni ID za dokumente
-     * Format: xxxxxxxxxxxx-timestamp
-     * Gde je x random karakter (broj ili slovo)
-     */
-    protected generateId(): string;
-}
-
-/**
- * Enum for media access levels
- */
-declare enum MediaAccessLevel {
-    PUBLIC = "public",
-    PRIVATE = "private",
-    CONFIDENTIAL = "confidential"
-}
-/**
- * Type that allows a field to be either a URL string or a File object
- */
-type MediaResource = string | File | Blob;
-/**
- * Media file metadata interface
- */
-interface MediaMetadata {
-    id: string;
-    name: string;
-    url: string;
-    contentType: string;
-    size: number;
-    createdAt: Timestamp;
-    accessLevel: MediaAccessLevel;
-    ownerId: string;
-    collectionName: string;
-    path: string;
-    updatedAt?: Timestamp;
-}
-declare const MEDIA_METADATA_COLLECTION = "media_metadata";
-declare class MediaService extends BaseService {
-    constructor(db: Firestore, auth: Auth, app: FirebaseApp);
-    /**
-     * Upload a media file, store its metadata, and return the metadata including the URL.
-     * @param file - The file to upload.
-     * @param ownerId - ID of the owner (user, patient, clinic, etc.).
-     * @param accessLevel - Access level (public, private, confidential).
-     * @param collectionName - The logical collection name this media belongs to (e.g., 'patient_profile_pictures', 'clinic_logos').
-     * @param originalFileName - Optional: the original name of the file, if not using file.name.
-     * @returns Promise with the media metadata.
-     */
-    uploadMedia(file: File | Blob, ownerId: string, accessLevel: MediaAccessLevel, collectionName: string, originalFileName?: string): Promise<MediaMetadata>;
-    /**
-     * Get media metadata from Firestore by its ID.
-     * @param mediaId - ID of the media.
-     * @returns Promise with the media metadata or null if not found.
-     */
-    getMediaMetadata(mediaId: string): Promise<MediaMetadata | null>;
-    /**
-     * Get media metadata from Firestore by its public URL.
-     * @param url - The public URL of the media file.
-     * @returns Promise with the media metadata or null if not found.
-     */
-    getMediaMetadataByUrl(url: string): Promise<MediaMetadata | null>;
-    /**
-     * Delete media from storage and remove metadata from Firestore.
-     * @param mediaId - ID of the media to delete.
-     */
-    deleteMedia(mediaId: string): Promise<void>;
-    /**
-     * Update media access level. This involves moving the file in Firebase Storage
-     * to a new path reflecting the new access level, and updating its metadata.
-     * @param mediaId - ID of the media to update.
-     * @param newAccessLevel - New access level.
-     * @returns Promise with the updated media metadata, or null if metadata not found.
-     */
-    updateMediaAccessLevel(mediaId: string, newAccessLevel: MediaAccessLevel): Promise<MediaMetadata | null>;
-    /**
-     * List all media for an owner, optionally filtered by collection and access level.
-     * @param ownerId - ID of the owner.
-     * @param collectionName - Optional: Filter by collection name.
-     * @param accessLevel - Optional: Filter by access level.
-     * @param count - Optional: Number of items to fetch.
-     * @param startAfterId - Optional: ID of the document to start after (for pagination).
-     */
-    listMedia(ownerId: string, collectionName?: string, accessLevel?: MediaAccessLevel, count?: number, startAfterId?: string): Promise<MediaMetadata[]>;
-    /**
-     * Get download URL for media. (Convenience, as URL is in metadata)
-     * @param mediaId - ID of the media.
-     */
-    getMediaDownloadUrl(mediaId: string): Promise<string | null>;
-}
-
 declare const CLINIC_GROUPS_COLLECTION = "clinic_groups";
 declare const CLINIC_ADMINS_COLLECTION = "clinic_admins";
 declare const CLINICS_COLLECTION = "clinics";
@@ -4836,8 +4836,8 @@ declare const updateAppointmentSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
         submittedAt: z.ZodOptional<z.ZodEffects<z.ZodAny, any, any>>;
         completedAt: z.ZodOptional<z.ZodEffects<z.ZodAny, any, any>>;
     }, "strip", z.ZodTypeAny, {
-        status: FilledDocumentStatus;
         path: string;
+        status: FilledDocumentStatus;
         title: string;
         isUserForm: boolean;
         templateId: string;
@@ -4847,8 +4847,8 @@ declare const updateAppointmentSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
         submittedAt?: any;
         completedAt?: any;
     }, {
-        status: FilledDocumentStatus;
         path: string;
+        status: FilledDocumentStatus;
         title: string;
         isUserForm: boolean;
         templateId: string;
@@ -5103,56 +5103,56 @@ declare const searchAppointmentsSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
     startAfter: z.ZodOptional<z.ZodAny>;
 }, "strip", z.ZodTypeAny, {
     limit: number;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }, {
+    limit?: number | undefined;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    limit?: number | undefined;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }>, {
     limit: number;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }, {
+    limit?: number | undefined;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    limit?: number | undefined;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }>, {
     limit: number;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }, {
+    limit?: number | undefined;
+    startAfter?: any;
     status?: AppointmentStatus | [AppointmentStatus, ...AppointmentStatus[]] | undefined;
     patientId?: string | undefined;
     startDate?: any;
     endDate?: any;
-    limit?: number | undefined;
-    startAfter?: any;
     practitionerId?: string | undefined;
     clinicBranchId?: string | undefined;
 }>;
@@ -6444,7 +6444,24 @@ declare class ProcedureService extends BaseService {
     private subcategoryService;
     private technologyService;
     private productService;
-    constructor(db: Firestore, auth: Auth, app: FirebaseApp, categoryService: CategoryService, subcategoryService: SubcategoryService, technologyService: TechnologyService, productService: ProductService);
+    private mediaService;
+    constructor(db: Firestore, auth: Auth, app: FirebaseApp, categoryService: CategoryService, subcategoryService: SubcategoryService, technologyService: TechnologyService, productService: ProductService, mediaService: MediaService);
+    /**
+     * Process media resource (string URL or File object)
+     * @param media String URL or File object
+     * @param ownerId Owner ID for the media (usually procedureId)
+     * @param collectionName Collection name for organizing files
+     * @returns URL string after processing
+     */
+    private processMedia;
+    /**
+     * Process array of media resources (strings or Files)
+     * @param mediaArray Array of string URLs or File objects
+     * @param ownerId Owner ID for the media
+     * @param collectionName Collection name for organizing files
+     * @returns Array of URL strings after processing
+     */
+    private processMediaArray;
     /**
      * Creates a new procedure
      * @param data - The data for creating a new procedure
@@ -14079,6 +14096,7 @@ declare const clinicGroupSchema: z.ZodObject<{
     updatedAt: Date | Timestamp;
     name: string;
     isActive: boolean;
+    ownerId: string | null;
     clinics: string[];
     clinicsInfo: {
         id: string;
@@ -14101,7 +14119,6 @@ declare const clinicGroupSchema: z.ZodObject<{
         featuredPhoto: string;
         description?: string | null | undefined;
     }[];
-    ownerId: string | null;
     contactInfo: {
         email: string;
         phoneNumber: string;
@@ -14157,6 +14174,7 @@ declare const clinicGroupSchema: z.ZodObject<{
     updatedAt: Date | Timestamp;
     name: string;
     isActive: boolean;
+    ownerId: string | null;
     clinics: string[];
     clinicsInfo: {
         id: string;
@@ -14179,7 +14197,6 @@ declare const clinicGroupSchema: z.ZodObject<{
         featuredPhoto: string;
         description?: string | null | undefined;
     }[];
-    ownerId: string | null;
     contactInfo: {
         email: string;
         phoneNumber: string;

package/dist/index.js

@@ -8353,7 +8353,7 @@ var createProcedureSchema = import_zod21.z.object({
   // Max 8 hours
   practitionerId: import_zod21.z.string().min(1),
   clinicBranchId: import_zod21.z.string().min(1),
-  photos: import_zod21.z.array(import_zod21.z.string()).optional()
+  photos: import_zod21.z.array(mediaResourceSchema).optional()
 });
 var updateProcedureSchema = import_zod21.z.object({
   name: import_zod21.z.string().min(3).max(100).optional(),
@@ -8369,7 +8369,7 @@ var updateProcedureSchema = import_zod21.z.object({
   technologyId: import_zod21.z.string().optional(),
   productId: import_zod21.z.string().optional(),
   clinicBranchId: import_zod21.z.string().optional(),
-  photos: import_zod21.z.array(import_zod21.z.string()).optional()
+  photos: import_zod21.z.array(mediaResourceSchema).optional()
 });
 var procedureSchema = createProcedureSchema.extend({
   id: import_zod21.z.string().min(1),
@@ -8409,12 +8409,61 @@ var procedureSchema = createProcedureSchema.extend({
 // src/services/procedure/procedure.service.ts
 var import_geofire_common8 = require("geofire-common");
 var ProcedureService = class extends BaseService {
-  constructor(db, auth, app, categoryService, subcategoryService, technologyService, productService) {
+  constructor(db, auth, app, categoryService, subcategoryService, technologyService, productService, mediaService) {
     super(db, auth, app);
     this.categoryService = categoryService;
     this.subcategoryService = subcategoryService;
     this.technologyService = technologyService;
     this.productService = productService;
+    this.mediaService = mediaService;
+  }
+  /**
+   * Process media resource (string URL or File object)
+   * @param media String URL or File object
+   * @param ownerId Owner ID for the media (usually procedureId)
+   * @param collectionName Collection name for organizing files
+   * @returns URL string after processing
+   */
+  async processMedia(media, ownerId, collectionName) {
+    if (!media) return null;
+    if (typeof media === "string") {
+      return media;
+    }
+    if (media instanceof File || media instanceof Blob) {
+      console.log(
+        `[ProcedureService] Uploading ${collectionName} media for ${ownerId}`
+      );
+      const metadata = await this.mediaService.uploadMedia(
+        media,
+        ownerId,
+        "public" /* PUBLIC */,
+        collectionName
+      );
+      return metadata.url;
+    }
+    return null;
+  }
+  /**
+   * Process array of media resources (strings or Files)
+   * @param mediaArray Array of string URLs or File objects
+   * @param ownerId Owner ID for the media
+   * @param collectionName Collection name for organizing files
+   * @returns Array of URL strings after processing
+   */
+  async processMediaArray(mediaArray, ownerId, collectionName) {
+    if (!mediaArray || mediaArray.length === 0) return [];
+    const result = [];
+    for (const media of mediaArray) {
+      const processedUrl = await this.processMedia(
+        media,
+        ownerId,
+        collectionName
+      );
+      if (processedUrl) {
+        result.push(processedUrl);
+      }
+    }
+    return result;
   }
   /**
    * Creates a new procedure
@@ -8424,6 +8473,7 @@ var ProcedureService = class extends BaseService {
   async createProcedure(data) {
     var _a;
     const validatedData = createProcedureSchema.parse(data);
+    const procedureId = this.generateId();
     const [category, subcategory, technology, product] = await Promise.all([
       this.categoryService.getById(validatedData.categoryId),
       this.subcategoryService.getById(
@@ -8463,6 +8513,14 @@ var ProcedureService = class extends BaseService {
       );
     }
     const practitioner = practitionerSnapshot.data();
+    let processedPhotos = [];
+    if (validatedData.photos && validatedData.photos.length > 0) {
+      processedPhotos = await this.processMediaArray(
+        validatedData.photos,
+        procedureId,
+        "procedure-photos"
+      );
+    }
     const clinicInfo = {
       id: clinicSnapshot.id,
       name: clinic.name,
@@ -8479,10 +8537,10 @@ var ProcedureService = class extends BaseService {
       rating: ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0,
       services: practitioner.procedures || []
     };
-    const procedureId = this.generateId();
     const newProcedure = {
       id: procedureId,
       ...validatedData,
+      photos: processedPhotos,
       category,
       // Embed full objects
       subcategory,
@@ -8585,6 +8643,13 @@ var ProcedureService = class extends BaseService {
     const oldClinicId = existingProcedure.clinicBranchId;
     let newPractitioner = null;
     let newClinic = null;
+    if (validatedData.photos !== void 0) {
+      updatedProcedureData.photos = await this.processMediaArray(
+        validatedData.photos,
+        id,
+        "procedure-photos"
+      );
+    }
     if (validatedData.practitionerId && validatedData.practitionerId !== oldPractitionerId) {
       practitionerChanged = true;
       const newPractitionerRef = (0, import_firestore27.doc)(

package/dist/index.mjs

@@ -8342,7 +8342,7 @@ var createProcedureSchema = z21.object({
   // Max 8 hours
   practitionerId: z21.string().min(1),
   clinicBranchId: z21.string().min(1),
-  photos: z21.array(z21.string()).optional()
+  photos: z21.array(mediaResourceSchema).optional()
 });
 var updateProcedureSchema = z21.object({
   name: z21.string().min(3).max(100).optional(),
@@ -8358,7 +8358,7 @@ var updateProcedureSchema = z21.object({
   technologyId: z21.string().optional(),
   productId: z21.string().optional(),
   clinicBranchId: z21.string().optional(),
-  photos: z21.array(z21.string()).optional()
+  photos: z21.array(mediaResourceSchema).optional()
 });
 var procedureSchema = createProcedureSchema.extend({
   id: z21.string().min(1),
@@ -8398,12 +8398,61 @@ var procedureSchema = createProcedureSchema.extend({
 // src/services/procedure/procedure.service.ts
 import { distanceBetween as distanceBetween6, geohashQueryBounds as geohashQueryBounds5 } from "geofire-common";
 var ProcedureService = class extends BaseService {
-  constructor(db, auth, app, categoryService, subcategoryService, technologyService, productService) {
+  constructor(db, auth, app, categoryService, subcategoryService, technologyService, productService, mediaService) {
     super(db, auth, app);
     this.categoryService = categoryService;
     this.subcategoryService = subcategoryService;
     this.technologyService = technologyService;
     this.productService = productService;
+    this.mediaService = mediaService;
+  }
+  /**
+   * Process media resource (string URL or File object)
+   * @param media String URL or File object
+   * @param ownerId Owner ID for the media (usually procedureId)
+   * @param collectionName Collection name for organizing files
+   * @returns URL string after processing
+   */
+  async processMedia(media, ownerId, collectionName) {
+    if (!media) return null;
+    if (typeof media === "string") {
+      return media;
+    }
+    if (media instanceof File || media instanceof Blob) {
+      console.log(
+        `[ProcedureService] Uploading ${collectionName} media for ${ownerId}`
+      );
+      const metadata = await this.mediaService.uploadMedia(
+        media,
+        ownerId,
+        "public" /* PUBLIC */,
+        collectionName
+      );
+      return metadata.url;
+    }
+    return null;
+  }
+  /**
+   * Process array of media resources (strings or Files)
+   * @param mediaArray Array of string URLs or File objects
+   * @param ownerId Owner ID for the media
+   * @param collectionName Collection name for organizing files
+   * @returns Array of URL strings after processing
+   */
+  async processMediaArray(mediaArray, ownerId, collectionName) {
+    if (!mediaArray || mediaArray.length === 0) return [];
+    const result = [];
+    for (const media of mediaArray) {
+      const processedUrl = await this.processMedia(
+        media,
+        ownerId,
+        collectionName
+      );
+      if (processedUrl) {
+        result.push(processedUrl);
+      }
+    }
+    return result;
   }
   /**
    * Creates a new procedure
@@ -8413,6 +8462,7 @@ var ProcedureService = class extends BaseService {
   async createProcedure(data) {
     var _a;
     const validatedData = createProcedureSchema.parse(data);
+    const procedureId = this.generateId();
     const [category, subcategory, technology, product] = await Promise.all([
       this.categoryService.getById(validatedData.categoryId),
       this.subcategoryService.getById(
@@ -8452,6 +8502,14 @@ var ProcedureService = class extends BaseService {
       );
     }
     const practitioner = practitionerSnapshot.data();
+    let processedPhotos = [];
+    if (validatedData.photos && validatedData.photos.length > 0) {
+      processedPhotos = await this.processMediaArray(
+        validatedData.photos,
+        procedureId,
+        "procedure-photos"
+      );
+    }
     const clinicInfo = {
       id: clinicSnapshot.id,
       name: clinic.name,
@@ -8468,10 +8526,10 @@ var ProcedureService = class extends BaseService {
       rating: ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0,
       services: practitioner.procedures || []
     };
-    const procedureId = this.generateId();
     const newProcedure = {
       id: procedureId,
       ...validatedData,
+      photos: processedPhotos,
       category,
       // Embed full objects
       subcategory,
@@ -8574,6 +8632,13 @@ var ProcedureService = class extends BaseService {
     const oldClinicId = existingProcedure.clinicBranchId;
     let newPractitioner = null;
     let newClinic = null;
+    if (validatedData.photos !== void 0) {
+      updatedProcedureData.photos = await this.processMediaArray(
+        validatedData.photos,
+        id,
+        "procedure-photos"
+      );
+    }
     if (validatedData.practitionerId && validatedData.practitionerId !== oldPractitionerId) {
       practitionerChanged = true;
       const newPractitionerRef = doc16(

package/package.json

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