@blackcode_sa/metaestetics-api 1.12.0 → 1.12.2

package/package.json

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

package/src/backoffice/expo-safe/index.ts

@@ -22,6 +22,7 @@ export type {
   Technology,
   TechnologyDocumentationTemplate,
 } from "../types/technology.types";
+export type { ProcedureProduct } from "../types/procedure-product.types";
 
 // Static pricing enums
 export { PricingMeasure, Currency } from "../types/static/pricing.types";

package/src/backoffice/types/index.ts

@@ -7,3 +7,4 @@ export * from "./requirement.types";
 export * from "./subcategory.types";
 export * from "./technology.types";
 export * from "./static";
+export * from "./procedure-product.types";

package/src/backoffice/types/procedure-product.types.ts

@@ -0,0 +1,38 @@
+/**
+ * @fileoverview Defines the ProcedureProduct type, which represents a product associated with a procedure,
+ * including its pricing information. This is used to allow procedures to have multiple products with different prices.
+ * @packageDocumentation
+ */
+import { Product } from "./product.types";
+import { Currency, PricingMeasure } from "./static/pricing.types";
+
+/**
+ * Represents a product associated with a procedure, including its specific pricing information.
+ */
+export interface ProcedureProduct {
+  /**
+   * The product used in the procedure.
+   * @see {@link Product}
+   */
+  product: Product;
+
+  /**
+   * The price of the procedure when using this specific product.
+   */
+  price: number;
+
+  /**
+   * The currency for the price of this product.
+   * @see {@link Currency}
+   */
+  currency: Currency;
+
+  /**
+   * How the price is measured (e.g., per ml, per zone).
+   * @see {@link PricingMeasure}
+   */
+  pricingMeasure: PricingMeasure;
+
+  // Default product
+  isDefault?: boolean;
+}

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

@@ -193,7 +193,8 @@ export class PractitionerService extends BaseService {
       };
 
       // Create practitioner object
-      const fullNameLower = `${validData.basicInfo.firstName} ${validData.basicInfo.lastName}`.toLowerCase();
+      const fullNameLower =
+        `${validData.basicInfo.firstName} ${validData.basicInfo.lastName}`.toLowerCase();
       const practitioner: Omit<Practitioner, "createdAt" | "updatedAt"> & {
         createdAt: FieldValue;
         updatedAt: FieldValue;
@@ -349,7 +350,8 @@ export class PractitionerService extends BaseService {
       const proceduresInfo: ProcedureSummaryInfo[] = [];
 
       // Add fullNameLower for draft
-      const fullNameLowerDraft = `${validatedData.basicInfo.firstName} ${validatedData.basicInfo.lastName}`.toLowerCase();
+      const fullNameLowerDraft =
+        `${validatedData.basicInfo.firstName} ${validatedData.basicInfo.lastName}`.toLowerCase();
       const practitionerData: Omit<Practitioner, "createdAt" | "updatedAt"> & {
         createdAt: ReturnType<typeof serverTimestamp>;
         updatedAt: ReturnType<typeof serverTimestamp>;
@@ -726,7 +728,9 @@ 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: UpdatePractitionerData & { fullNameLower?: string } = { ...validData };
+      let processedData: UpdatePractitionerData & { fullNameLower?: string } = {
+        ...validData,
+      };
       if (validData.basicInfo) {
         processedData.basicInfo = await this.processBasicInfo(
           validData.basicInfo as PractitionerBasicInfo & {
@@ -735,7 +739,8 @@ export class PractitionerService extends BaseService {
           practitionerId
         );
         // Always update fullNameLower when basicInfo changes
-        processedData.fullNameLower = `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
+        processedData.fullNameLower =
+          `${processedData.basicInfo.firstName} ${processedData.basicInfo.lastName}`.toLowerCase();
       }
 
       // Prepare update data
@@ -1043,19 +1048,24 @@ export class PractitionerService extends BaseService {
     includeDraftPractitioners?: boolean;
   }): Promise<{ practitioners: Practitioner[]; lastDoc: any }> {
     try {
-      console.log("[PRACTITIONER_SERVICE] Starting practitioner filtering with fallback strategies");
+      console.log(
+        "[PRACTITIONER_SERVICE] Starting practitioner filtering with fallback strategies"
+      );
 
       // Geo query debug i validacija
       if (filters.location && filters.radiusInKm) {
-        console.log('[PRACTITIONER_SERVICE] Executing geo query:', {
+        console.log("[PRACTITIONER_SERVICE] Executing geo query:", {
           location: filters.location,
           radius: filters.radiusInKm,
-          serviceName: 'PractitionerService'
+          serviceName: "PractitionerService",
         });
-        
+
         // Validacija location podataka
         if (!filters.location.latitude || !filters.location.longitude) {
-          console.warn('[PRACTITIONER_SERVICE] Invalid location data:', filters.location);
+          console.warn(
+            "[PRACTITIONER_SERVICE] Invalid location data:",
+            filters.location
+          );
           filters.location = undefined;
           filters.radiusInKm = undefined;
         }
@@ -1064,10 +1074,12 @@ export class PractitionerService extends BaseService {
       // Strategy 1: Try fullNameLower search if nameSearch exists
       if (filters.nameSearch && filters.nameSearch.trim()) {
         try {
-          console.log("[PRACTITIONER_SERVICE] Strategy 1: Trying fullNameLower search");
+          console.log(
+            "[PRACTITIONER_SERVICE] Strategy 1: Trying fullNameLower search"
+          );
           const searchTerm = filters.nameSearch.trim().toLowerCase();
           const constraints: any[] = [];
-          
+
           if (!filters.includeDraftPractitioners) {
             constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
           }
@@ -1087,13 +1099,23 @@ export class PractitionerService extends BaseService {
           }
           constraints.push(limit(filters.pagination || 10));
 
-          const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+          const q = query(
+            collection(this.db, PRACTITIONERS_COLLECTION),
+            ...constraints
+          );
           const querySnapshot = await getDocs(q);
-          const practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
-          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-          
-          console.log(`[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`);
-          
+          const practitioners = querySnapshot.docs.map(
+            (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+          );
+          const lastDoc =
+            querySnapshot.docs.length > 0
+              ? querySnapshot.docs[querySnapshot.docs.length - 1]
+              : null;
+
+          console.log(
+            `[PRACTITIONER_SERVICE] Strategy 1 success: ${practitioners.length} practitioners`
+          );
+
           // Fix Load More - ako je broj rezultata manji od pagination, nema više
           if (practitioners.length < (filters.pagination || 10)) {
             return { practitioners, lastDoc: null };
@@ -1106,9 +1128,11 @@ export class PractitionerService extends BaseService {
 
       // Strategy 2: Basic query with createdAt ordering (no name search)
       try {
-        console.log("[PRACTITIONER_SERVICE] Strategy 2: Basic query with createdAt ordering");
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 2: Basic query with createdAt ordering"
+        );
         const constraints: any[] = [];
-        
+
         if (!filters.includeDraftPractitioners) {
           constraints.push(where("status", "==", PractitionerStatus.ACTIVE));
         }
@@ -1116,17 +1140,26 @@ export class PractitionerService extends BaseService {
 
         // Add other filters that work well with Firestore
         if (filters.certifications && filters.certifications.length > 0) {
-          const certificationsToMatch = filters.certifications as CertificationSpecialty[];
+          const certificationsToMatch =
+            filters.certifications as CertificationSpecialty[];
           constraints.push(
-            where("certification.specialties", "array-contains-any", certificationsToMatch)
+            where(
+              "certification.specialties",
+              "array-contains-any",
+              certificationsToMatch
+            )
           );
         }
 
         if (filters.minRating !== undefined) {
-          constraints.push(where("reviewInfo.averageRating", ">=", filters.minRating));
+          constraints.push(
+            where("reviewInfo.averageRating", ">=", filters.minRating)
+          );
         }
         if (filters.maxRating !== undefined) {
-          constraints.push(where("reviewInfo.averageRating", "<=", filters.maxRating));
+          constraints.push(
+            where("reviewInfo.averageRating", "<=", filters.maxRating)
+          );
         }
 
         constraints.push(orderBy("createdAt", "desc"));
@@ -1148,9 +1181,14 @@ export class PractitionerService extends BaseService {
           constraints.push(limit(filters.pagination || 10));
         }
 
-        const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
         const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
 
         // Apply geo filter if needed (this is the only in-memory filter we keep)
         if (filters.location && filters.radiusInKm && filters.radiusInKm > 0) {
@@ -1167,7 +1205,7 @@ export class PractitionerService extends BaseService {
               return distanceInKm <= radiusInKm;
             });
           });
-          
+
           // Ograniči na pagination broj nakon geo filtera
           practitioners = practitioners.slice(0, filters.pagination || 10);
         }
@@ -1175,9 +1213,14 @@ export class PractitionerService extends BaseService {
         // Apply all remaining client-side filters using centralized function
         practitioners = this.applyInMemoryFilters(practitioners, filters);
 
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`);
-        
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 2 success: ${practitioners.length} practitioners`
+        );
+
         // Fix Load More - ako je broj rezultata manji od pagination, nema više
         if (practitioners.length < (filters.pagination || 10)) {
           return { practitioners, lastDoc: null };
@@ -1189,23 +1232,35 @@ export class PractitionerService extends BaseService {
 
       // Strategy 3: Minimal query fallback
       try {
-        console.log("[PRACTITIONER_SERVICE] Strategy 3: Minimal query fallback");
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 3: Minimal query fallback"
+        );
         const constraints: any[] = [
           where("isActive", "==", true),
           orderBy("createdAt", "desc"),
-          limit(filters.pagination || 10)
+          limit(filters.pagination || 10),
         ];
 
-        const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
         const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
 
         // Apply all client-side filters using centralized function
         practitioners = this.applyInMemoryFilters(practitioners, filters);
 
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`);
-        
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 3 success: ${practitioners.length} practitioners`
+        );
+
         // Fix Load More - ako je broj rezultata manji od pagination, nema više
         if (practitioners.length < (filters.pagination || 10)) {
           return { practitioners, lastDoc: null };
@@ -1217,41 +1272,56 @@ export class PractitionerService extends BaseService {
 
       // Strategy 4: Client-side filtering fallback (kao u procedure/clinic services)
       try {
-        console.log("[PRACTITIONER_SERVICE] Strategy 4: Client-side filtering fallback");
-        
+        console.log(
+          "[PRACTITIONER_SERVICE] Strategy 4: Client-side filtering fallback"
+        );
+
         const constraints: any[] = [
           where("isActive", "==", true),
           where("status", "==", PractitionerStatus.ACTIVE),
           orderBy("createdAt", "desc"),
-          limit(filters.pagination || 10)
+          limit(filters.pagination || 10),
         ];
 
-        const q = query(collection(this.db, PRACTITIONERS_COLLECTION), ...constraints);
+        const q = query(
+          collection(this.db, PRACTITIONERS_COLLECTION),
+          ...constraints
+        );
         const querySnapshot = await getDocs(q);
-        let practitioners = querySnapshot.docs.map(doc => ({ ...doc.data(), id: doc.id } as Practitioner));
+        let practitioners = querySnapshot.docs.map(
+          (doc) => ({ ...doc.data(), id: doc.id } as Practitioner)
+        );
 
         // Apply all client-side filters using centralized function
         practitioners = this.applyInMemoryFilters(practitioners, filters);
 
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PRACTITIONER_SERVICE] Strategy 4 success: ${practitioners.length} practitioners`);
-        
+        const lastDoc =
+          querySnapshot.docs.length > 0
+            ? querySnapshot.docs[querySnapshot.docs.length - 1]
+            : null;
+        console.log(
+          `[PRACTITIONER_SERVICE] Strategy 4 success: ${practitioners.length} practitioners`
+        );
+
         // Fix Load More - ako je broj rezultata manji od pagination, nema više
         if (practitioners.length < (filters.pagination || 10)) {
           return { practitioners, lastDoc: null };
         }
         return { practitioners, lastDoc };
-        
       } catch (error) {
         console.log("[PRACTITIONER_SERVICE] Strategy 4 failed:", error);
       }
 
       // All strategies failed
-      console.log("[PRACTITIONER_SERVICE] All strategies failed, returning empty result");
+      console.log(
+        "[PRACTITIONER_SERVICE] All strategies failed, returning empty result"
+      );
       return { practitioners: [], lastDoc: null };
-
     } catch (error) {
-      console.error("[PRACTITIONER_SERVICE] Error filtering practitioners:", error);
+      console.error(
+        "[PRACTITIONER_SERVICE] Error filtering practitioners:",
+        error
+      );
       return { practitioners: [], lastDoc: null };
     }
   }
@@ -1260,91 +1330,128 @@ export class PractitionerService extends BaseService {
    * Applies in-memory filters to practitioners array
    * Used when Firestore queries fail or for complex filtering
    */
-  private applyInMemoryFilters(practitioners: Practitioner[], filters: any): Practitioner[] {
+  private applyInMemoryFilters(
+    practitioners: Practitioner[],
+    filters: any
+  ): Practitioner[] {
     let filteredPractitioners = [...practitioners]; // Create copy to avoid mutating original
 
     // Name search filter
     if (filters.nameSearch && filters.nameSearch.trim()) {
       const searchTerm = filters.nameSearch.trim().toLowerCase();
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
-        const firstName = (practitioner.basicInfo?.firstName || '').toLowerCase();
-        const lastName = (practitioner.basicInfo?.lastName || '').toLowerCase();
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
+        const firstName = (
+          practitioner.basicInfo?.firstName || ""
+        ).toLowerCase();
+        const lastName = (practitioner.basicInfo?.lastName || "").toLowerCase();
         const fullName = `${firstName} ${lastName}`.trim();
-        const fullNameLower = practitioner.fullNameLower || '';
-        
-        return firstName.includes(searchTerm) || 
-               lastName.includes(searchTerm) || 
-               fullName.includes(searchTerm) ||
-               fullNameLower.includes(searchTerm);
+        const fullNameLower = practitioner.fullNameLower || "";
+
+        return (
+          firstName.includes(searchTerm) ||
+          lastName.includes(searchTerm) ||
+          fullName.includes(searchTerm) ||
+          fullNameLower.includes(searchTerm)
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied name filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied name filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Certifications filtering
     if (filters.certifications && filters.certifications.length > 0) {
       const certificationsToMatch = filters.certifications;
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const practitionerCerts = practitioner.certification?.specialties || [];
-        return certificationsToMatch.some((cert: any) => practitionerCerts.includes(cert as CertificationSpecialty));
+        return certificationsToMatch.some((cert: any) =>
+          practitionerCerts.includes(cert as CertificationSpecialty)
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied certifications filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied certifications filter, results: ${filteredPractitioners.length}`
+      );
     }
 
-    // Specialties filtering  
+    // Specialties filtering
     if (filters.specialties && filters.specialties.length > 0) {
       const specialtiesToMatch = filters.specialties;
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const practitionerSpecs = practitioner.certification?.specialties || [];
-        return specialtiesToMatch.some((spec: any) => practitionerSpecs.includes(spec));
+        return specialtiesToMatch.some((spec: any) =>
+          practitionerSpecs.includes(spec)
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied specialties filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied specialties filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Rating filtering
     if (filters.minRating !== undefined || filters.maxRating !== undefined) {
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const rating = practitioner.reviewInfo?.averageRating || 0;
-        if (filters.minRating !== undefined && rating < filters.minRating) return false;
-        if (filters.maxRating !== undefined && rating > filters.maxRating) return false;
+        if (filters.minRating !== undefined && rating < filters.minRating)
+          return false;
+        if (filters.maxRating !== undefined && rating > filters.maxRating)
+          return false;
         return true;
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied rating filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied rating filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Procedure family filtering
     if (filters.procedureFamily) {
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(proc => proc.family === filters.procedureFamily);
+        return proceduresInfo.some(
+          (proc) => proc.family === filters.procedureFamily
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied procedure family filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure family filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Procedure category filtering
     if (filters.procedureCategory) {
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(proc => proc.categoryName === filters.procedureCategory);
+        return proceduresInfo.some(
+          (proc) => proc.categoryName === filters.procedureCategory
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied procedure category filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure category filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Procedure subcategory filtering
     if (filters.procedureSubcategory) {
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(proc => proc.subcategoryName === filters.procedureSubcategory);
+        return proceduresInfo.some(
+          (proc) => proc.subcategoryName === filters.procedureSubcategory
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied procedure subcategory filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure subcategory filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Procedure technology filtering
     if (filters.procedureTechnology) {
-      filteredPractitioners = filteredPractitioners.filter(practitioner => {
+      filteredPractitioners = filteredPractitioners.filter((practitioner) => {
         const proceduresInfo = practitioner.proceduresInfo || [];
-        return proceduresInfo.some(proc => proc.technologyName === filters.procedureTechnology);
+        return proceduresInfo.some(
+          (proc) => proc.technologyName === filters.procedureTechnology
+        );
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied procedure technology filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied procedure technology filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     // Geo-radius filter
@@ -1362,7 +1469,9 @@ export class PractitionerService extends BaseService {
           return distanceInKm <= radiusInKm;
         });
       });
-      console.log(`[PRACTITIONER_SERVICE] Applied geo filter, results: ${filteredPractitioners.length}`);
+      console.log(
+        `[PRACTITIONER_SERVICE] Applied geo filter, results: ${filteredPractitioners.length}`
+      );
     }
 
     return filteredPractitioners;
@@ -1457,6 +1566,15 @@ export class PractitionerService extends BaseService {
         price: 0,
         currency: Currency.EUR,
         pricingMeasure: PricingMeasure.PER_SESSION,
+        productsMetadata: [
+          {
+            productId: "free-consultation-product",
+            price: 0,
+            currency: Currency.EUR,
+            pricingMeasure: PricingMeasure.PER_SESSION,
+            isDefault: true,
+          },
+        ],
         duration: 30, // 30 minutes consultation
         practitionerId: practitionerId,
         clinicBranchId: clinicId,