@blackcode_sa/metaestetics-api 1.12.17 → 1.12.20

package/dist/admin/index.d.mts

@@ -43,6 +43,7 @@ interface BaseReview {
  */
 interface ClinicReview extends BaseReview {
     clinicId: string;
+    clinicName?: string;
     cleanliness: number;
     facilities: number;
     staffFriendliness: number;
@@ -57,6 +58,7 @@ interface ClinicReview extends BaseReview {
  */
 interface PractitionerReview extends BaseReview {
     practitionerId: string;
+    practitionerName?: string;
     knowledgeAndExpertise: number;
     communicationSkills: number;
     bedSideManner: number;
@@ -71,6 +73,7 @@ interface PractitionerReview extends BaseReview {
  */
 interface ProcedureReview extends BaseReview {
     procedureId: string;
+    procedureName?: string;
     effectivenessOfTreatment: number;
     outcomeExplanation: number;
     painManagement: number;
@@ -3388,7 +3391,7 @@ declare class DocumentManagerAdminService {
 
 /**
  * Ensures that the free consultation infrastructure exists in the database
- * Creates category, subcategory, and technology if they don't exist
+ * Creates category, subcategory, technology, and product if they don't exist
  * @param db - Firestore database instance (optional, defaults to admin.firestore())
  * @returns Promise<boolean> - Always returns true after ensuring infrastructure exists
  */

package/dist/admin/index.d.ts

@@ -43,6 +43,7 @@ interface BaseReview {
  */
 interface ClinicReview extends BaseReview {
     clinicId: string;
+    clinicName?: string;
     cleanliness: number;
     facilities: number;
     staffFriendliness: number;
@@ -57,6 +58,7 @@ interface ClinicReview extends BaseReview {
  */
 interface PractitionerReview extends BaseReview {
     practitionerId: string;
+    practitionerName?: string;
     knowledgeAndExpertise: number;
     communicationSkills: number;
     bedSideManner: number;
@@ -71,6 +73,7 @@ interface PractitionerReview extends BaseReview {
  */
 interface ProcedureReview extends BaseReview {
     procedureId: string;
+    procedureName?: string;
     effectivenessOfTreatment: number;
     outcomeExplanation: number;
     painManagement: number;
@@ -3388,7 +3391,7 @@ declare class DocumentManagerAdminService {
 
 /**
  * Ensures that the free consultation infrastructure exists in the database
- * Creates category, subcategory, and technology if they don't exist
+ * Creates category, subcategory, technology, and product if they don't exist
  * @param db - Firestore database instance (optional, defaults to admin.firestore())
  * @returns Promise<boolean> - Always returns true after ensuring infrastructure exists
  */

package/dist/admin/index.js

@@ -7383,13 +7383,14 @@ var SUBCATEGORIES_COLLECTION = "subcategories";
 // src/backoffice/types/technology.types.ts
 var TECHNOLOGIES_COLLECTION = "technologies";
 
+// src/backoffice/types/product.types.ts
+var PRODUCTS_COLLECTION = "products";
+
 // src/admin/free-consultation/free-consultation-utils.admin.ts
 async function freeConsultationInfrastructure(db) {
   const firestore18 = db || admin16.firestore();
   try {
-    console.log(
-      "[freeConsultationInfrastructure] Checking free consultation infrastructure..."
-    );
+    console.log("[freeConsultationInfrastructure] Checking free consultation infrastructure...");
     const technologyRef = firestore18.collection(TECHNOLOGIES_COLLECTION).doc("free-consultation-tech");
     const technologyDoc = await technologyRef.get();
     if (technologyDoc.exists) {
@@ -7398,19 +7399,14 @@ async function freeConsultationInfrastructure(db) {
       );
       return true;
     }
-    console.log(
-      "[freeConsultationInfrastructure] Creating free consultation infrastructure..."
-    );
+    console.log("[freeConsultationInfrastructure] Creating free consultation infrastructure...");
     await createFreeConsultationInfrastructure(firestore18);
     console.log(
       "[freeConsultationInfrastructure] Successfully created free consultation infrastructure"
     );
     return true;
   } catch (error) {
-    console.error(
-      "[freeConsultationInfrastructure] Error ensuring infrastructure:",
-      error
-    );
+    console.error("[freeConsultationInfrastructure] Error ensuring infrastructure:", error);
     throw error;
   }
 }
@@ -7474,11 +7470,32 @@ async function createFreeConsultationInfrastructure(db) {
     updatedAt: now
   };
   batch.set(technologyRef, technologyData);
+  const productRef = db.collection(TECHNOLOGIES_COLLECTION).doc("free-consultation-tech").collection(PRODUCTS_COLLECTION).doc("free-consultation-product");
+  const productData = {
+    id: "free-consultation-product",
+    name: "Free Consultation Service",
+    description: "No physical product required for consultation services",
+    brandId: "consultation-brand",
+    brandName: "Consultation Services",
+    technologyId: "free-consultation-tech",
+    technologyName: "Free Consultation Technology",
+    categoryId: "consultation",
+    subcategoryId: "free-consultation",
+    isActive: true,
+    createdAt: now,
+    updatedAt: now,
+    technicalDetails: "Virtual consultation service - no physical product required",
+    warnings: [],
+    indications: ["Initial patient assessment", "Treatment planning", "Patient education"],
+    contraindications: []
+  };
+  batch.set(productRef, productData);
   await batch.commit();
   console.log("[freeConsultationInfrastructure] Successfully created:");
   console.log("  \u2713 Category: consultation");
   console.log("  \u2713 Subcategory: free-consultation");
   console.log("  \u2713 Technology: free-consultation-tech");
+  console.log("  \u2713 Product: free-consultation-product");
 }
 
 // src/admin/mailing/practitionerInvite/templates/invitation.template.ts

package/dist/admin/index.mjs

@@ -7321,13 +7321,14 @@ var SUBCATEGORIES_COLLECTION = "subcategories";
 // src/backoffice/types/technology.types.ts
 var TECHNOLOGIES_COLLECTION = "technologies";
 
+// src/backoffice/types/product.types.ts
+var PRODUCTS_COLLECTION = "products";
+
 // src/admin/free-consultation/free-consultation-utils.admin.ts
 async function freeConsultationInfrastructure(db) {
   const firestore18 = db || admin16.firestore();
   try {
-    console.log(
-      "[freeConsultationInfrastructure] Checking free consultation infrastructure..."
-    );
+    console.log("[freeConsultationInfrastructure] Checking free consultation infrastructure...");
     const technologyRef = firestore18.collection(TECHNOLOGIES_COLLECTION).doc("free-consultation-tech");
     const technologyDoc = await technologyRef.get();
     if (technologyDoc.exists) {
@@ -7336,19 +7337,14 @@ async function freeConsultationInfrastructure(db) {
       );
       return true;
     }
-    console.log(
-      "[freeConsultationInfrastructure] Creating free consultation infrastructure..."
-    );
+    console.log("[freeConsultationInfrastructure] Creating free consultation infrastructure...");
     await createFreeConsultationInfrastructure(firestore18);
     console.log(
       "[freeConsultationInfrastructure] Successfully created free consultation infrastructure"
     );
     return true;
   } catch (error) {
-    console.error(
-      "[freeConsultationInfrastructure] Error ensuring infrastructure:",
-      error
-    );
+    console.error("[freeConsultationInfrastructure] Error ensuring infrastructure:", error);
     throw error;
   }
 }
@@ -7412,11 +7408,32 @@ async function createFreeConsultationInfrastructure(db) {
     updatedAt: now
   };
   batch.set(technologyRef, technologyData);
+  const productRef = db.collection(TECHNOLOGIES_COLLECTION).doc("free-consultation-tech").collection(PRODUCTS_COLLECTION).doc("free-consultation-product");
+  const productData = {
+    id: "free-consultation-product",
+    name: "Free Consultation Service",
+    description: "No physical product required for consultation services",
+    brandId: "consultation-brand",
+    brandName: "Consultation Services",
+    technologyId: "free-consultation-tech",
+    technologyName: "Free Consultation Technology",
+    categoryId: "consultation",
+    subcategoryId: "free-consultation",
+    isActive: true,
+    createdAt: now,
+    updatedAt: now,
+    technicalDetails: "Virtual consultation service - no physical product required",
+    warnings: [],
+    indications: ["Initial patient assessment", "Treatment planning", "Patient education"],
+    contraindications: []
+  };
+  batch.set(productRef, productData);
   await batch.commit();
   console.log("[freeConsultationInfrastructure] Successfully created:");
   console.log("  \u2713 Category: consultation");
   console.log("  \u2713 Subcategory: free-consultation");
   console.log("  \u2713 Technology: free-consultation-tech");
+  console.log("  \u2713 Product: free-consultation-product");
 }
 
 // src/admin/mailing/practitionerInvite/templates/invitation.template.ts

package/dist/backoffice/index.js

@@ -2276,8 +2276,8 @@ var TechnologyService = class extends BaseService {
    * console.log(allowedTechnologies.subcategories); // ["subcategory1", "subcategory2"]
    */
   async getAllowedTechnologies(practitioner) {
-    const allTechnologies = await this.getAll();
-    const allowedTechnologies = allTechnologies.technologies.filter(
+    const allTechnologies = await this.getAllForFilter();
+    const allowedTechnologies = allTechnologies.filter(
       (technology) => this.validateCertification(technology.certificationRequirement, practitioner.certification)
     );
     const families = [...new Set(allowedTechnologies.map((t) => t.family))];

package/dist/backoffice/index.mjs

@@ -2292,8 +2292,8 @@ var TechnologyService = class extends BaseService {
    * console.log(allowedTechnologies.subcategories); // ["subcategory1", "subcategory2"]
    */
   async getAllowedTechnologies(practitioner) {
-    const allTechnologies = await this.getAll();
-    const allowedTechnologies = allTechnologies.technologies.filter(
+    const allTechnologies = await this.getAllForFilter();
+    const allowedTechnologies = allTechnologies.filter(
       (technology) => this.validateCertification(technology.certificationRequirement, practitioner.certification)
     );
     const families = [...new Set(allowedTechnologies.map((t) => t.family))];

package/dist/index.d.mts

@@ -43,6 +43,7 @@ interface BaseReview {
  */
 interface ClinicReview extends BaseReview {
     clinicId: string;
+    clinicName?: string;
     cleanliness: number;
     facilities: number;
     staffFriendliness: number;
@@ -57,6 +58,7 @@ interface ClinicReview extends BaseReview {
  */
 interface PractitionerReview extends BaseReview {
     practitionerId: string;
+    practitionerName?: string;
     knowledgeAndExpertise: number;
     communicationSkills: number;
     bedSideManner: number;
@@ -71,6 +73,7 @@ interface PractitionerReview extends BaseReview {
  */
 interface ProcedureReview extends BaseReview {
     procedureId: string;
+    procedureName?: string;
     effectivenessOfTreatment: number;
     outcomeExplanation: number;
     painManagement: number;
@@ -6843,7 +6846,7 @@ declare class ReviewService extends BaseService {
      * @param appointmentId - ID of the completed appointment
      * @returns The created review
      */
-    createReview(data: Omit<Review, "id" | "createdAt" | "updatedAt" | "appointmentId" | "overallRating">, appointmentId: string): Promise<Review>;
+    createReview(data: Omit<Review, 'id' | 'createdAt' | 'updatedAt' | 'appointmentId' | 'overallRating'>, appointmentId: string): Promise<Review>;
     /**
      * Gets a review by ID
      * @param reviewId The ID of the review to get
@@ -6851,9 +6854,9 @@ declare class ReviewService extends BaseService {
      */
     getReview(reviewId: string): Promise<Review | null>;
     /**
-     * Gets all reviews for a specific patient
+     * Gets all reviews for a specific patient with enhanced entity names
      * @param patientId The ID of the patient
-     * @returns Array of reviews for the patient
+     * @returns Array of reviews for the patient with clinic, practitioner, and procedure names
      */
     getReviewsByPatient(patientId: string): Promise<Review[]>;
     /**

package/dist/index.d.ts

@@ -43,6 +43,7 @@ interface BaseReview {
  */
 interface ClinicReview extends BaseReview {
     clinicId: string;
+    clinicName?: string;
     cleanliness: number;
     facilities: number;
     staffFriendliness: number;
@@ -57,6 +58,7 @@ interface ClinicReview extends BaseReview {
  */
 interface PractitionerReview extends BaseReview {
     practitionerId: string;
+    practitionerName?: string;
     knowledgeAndExpertise: number;
     communicationSkills: number;
     bedSideManner: number;
@@ -71,6 +73,7 @@ interface PractitionerReview extends BaseReview {
  */
 interface ProcedureReview extends BaseReview {
     procedureId: string;
+    procedureName?: string;
     effectivenessOfTreatment: number;
     outcomeExplanation: number;
     painManagement: number;
@@ -6843,7 +6846,7 @@ declare class ReviewService extends BaseService {
      * @param appointmentId - ID of the completed appointment
      * @returns The created review
      */
-    createReview(data: Omit<Review, "id" | "createdAt" | "updatedAt" | "appointmentId" | "overallRating">, appointmentId: string): Promise<Review>;
+    createReview(data: Omit<Review, 'id' | 'createdAt' | 'updatedAt' | 'appointmentId' | 'overallRating'>, appointmentId: string): Promise<Review>;
     /**
      * Gets a review by ID
      * @param reviewId The ID of the review to get
@@ -6851,9 +6854,9 @@ declare class ReviewService extends BaseService {
      */
     getReview(reviewId: string): Promise<Review | null>;
     /**
-     * Gets all reviews for a specific patient
+     * Gets all reviews for a specific patient with enhanced entity names
      * @param patientId The ID of the patient
-     * @returns Array of reviews for the patient
+     * @returns Array of reviews for the patient with clinic, practitioner, and procedure names
      */
     getReviewsByPatient(patientId: string): Promise<Review[]>;
     /**

package/dist/index.js

@@ -7406,9 +7406,12 @@ var UserService = class extends BaseService {
             if ((await this.getUserById(userId)).patientProfile || patientProfile2.userRef) {
               throw new Error("User already has a patient profile.");
             }
+            const sensitiveInfo = await patientService.getSensitiveInfo(patientProfile2.id, userId);
+            const fullDisplayName = sensitiveInfo ? `${sensitiveInfo.firstName} ${sensitiveInfo.lastName}` : patientProfile2.displayName;
             await patientService.updatePatientProfile(patientProfile2.id, {
               userRef: userId,
-              isManual: false
+              isManual: false,
+              displayName: fullDisplayName
             });
             await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);
             profiles.patientProfile = patientProfile2.id;
@@ -16086,17 +16089,51 @@ var ReviewService = class extends BaseService {
     return docSnap.data();
   }
   /**
-   * Gets all reviews for a specific patient
+   * Gets all reviews for a specific patient with enhanced entity names
    * @param patientId The ID of the patient
-   * @returns Array of reviews for the patient
+   * @returns Array of reviews for the patient with clinic, practitioner, and procedure names
    */
   async getReviewsByPatient(patientId) {
-    const q = (0, import_firestore48.query)(
-      (0, import_firestore48.collection)(this.db, REVIEWS_COLLECTION),
-      (0, import_firestore48.where)("patientId", "==", patientId)
-    );
+    const q = (0, import_firestore48.query)((0, import_firestore48.collection)(this.db, REVIEWS_COLLECTION), (0, import_firestore48.where)("patientId", "==", patientId));
     const snapshot = await (0, import_firestore48.getDocs)(q);
-    return snapshot.docs.map((doc38) => doc38.data());
+    const reviews = snapshot.docs.map((doc38) => doc38.data());
+    const enhancedReviews = await Promise.all(
+      reviews.map(async (review) => {
+        try {
+          const appointmentDoc = await (0, import_firestore48.getDoc)(
+            (0, import_firestore48.doc)(this.db, APPOINTMENTS_COLLECTION, review.appointmentId)
+          );
+          if (appointmentDoc.exists()) {
+            const appointment = appointmentDoc.data();
+            const enhancedReview = { ...review };
+            if (enhancedReview.clinicReview && appointment.clinicInfo) {
+              enhancedReview.clinicReview = {
+                ...enhancedReview.clinicReview,
+                clinicName: appointment.clinicInfo.name
+              };
+            }
+            if (enhancedReview.practitionerReview && appointment.practitionerInfo) {
+              enhancedReview.practitionerReview = {
+                ...enhancedReview.practitionerReview,
+                practitionerName: appointment.practitionerInfo.name
+              };
+            }
+            if (enhancedReview.procedureReview && appointment.procedureInfo) {
+              enhancedReview.procedureReview = {
+                ...enhancedReview.procedureReview,
+                procedureName: appointment.procedureInfo.name
+              };
+            }
+            return enhancedReview;
+          }
+          return review;
+        } catch (error) {
+          console.warn(`Failed to enhance review ${review.id} with entity names:`, error);
+          return review;
+        }
+      })
+    );
+    return enhancedReviews;
   }
   /**
    * Gets all reviews for a specific clinic
@@ -17298,8 +17335,8 @@ var TechnologyService = class extends BaseService {
    * console.log(allowedTechnologies.subcategories); // ["subcategory1", "subcategory2"]
    */
   async getAllowedTechnologies(practitioner) {
-    const allTechnologies = await this.getAll();
-    const allowedTechnologies = allTechnologies.technologies.filter(
+    const allTechnologies = await this.getAllForFilter();
+    const allowedTechnologies = allTechnologies.filter(
       (technology) => this.validateCertification(technology.certificationRequirement, practitioner.certification)
     );
     const families = [...new Set(allowedTechnologies.map((t) => t.family))];

package/dist/index.mjs

@@ -7447,9 +7447,12 @@ var UserService = class extends BaseService {
             if ((await this.getUserById(userId)).patientProfile || patientProfile2.userRef) {
               throw new Error("User already has a patient profile.");
             }
+            const sensitiveInfo = await patientService.getSensitiveInfo(patientProfile2.id, userId);
+            const fullDisplayName = sensitiveInfo ? `${sensitiveInfo.firstName} ${sensitiveInfo.lastName}` : patientProfile2.displayName;
             await patientService.updatePatientProfile(patientProfile2.id, {
               userRef: userId,
-              isManual: false
+              isManual: false,
+              displayName: fullDisplayName
             });
             await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);
             profiles.patientProfile = patientProfile2.id;
@@ -16350,17 +16353,51 @@ var ReviewService = class extends BaseService {
     return docSnap.data();
   }
   /**
-   * Gets all reviews for a specific patient
+   * Gets all reviews for a specific patient with enhanced entity names
    * @param patientId The ID of the patient
-   * @returns Array of reviews for the patient
+   * @returns Array of reviews for the patient with clinic, practitioner, and procedure names
    */
   async getReviewsByPatient(patientId) {
-    const q = query31(
-      collection31(this.db, REVIEWS_COLLECTION),
-      where31("patientId", "==", patientId)
-    );
+    const q = query31(collection31(this.db, REVIEWS_COLLECTION), where31("patientId", "==", patientId));
     const snapshot = await getDocs31(q);
-    return snapshot.docs.map((doc38) => doc38.data());
+    const reviews = snapshot.docs.map((doc38) => doc38.data());
+    const enhancedReviews = await Promise.all(
+      reviews.map(async (review) => {
+        try {
+          const appointmentDoc = await getDoc33(
+            doc31(this.db, APPOINTMENTS_COLLECTION, review.appointmentId)
+          );
+          if (appointmentDoc.exists()) {
+            const appointment = appointmentDoc.data();
+            const enhancedReview = { ...review };
+            if (enhancedReview.clinicReview && appointment.clinicInfo) {
+              enhancedReview.clinicReview = {
+                ...enhancedReview.clinicReview,
+                clinicName: appointment.clinicInfo.name
+              };
+            }
+            if (enhancedReview.practitionerReview && appointment.practitionerInfo) {
+              enhancedReview.practitionerReview = {
+                ...enhancedReview.practitionerReview,
+                practitionerName: appointment.practitionerInfo.name
+              };
+            }
+            if (enhancedReview.procedureReview && appointment.procedureInfo) {
+              enhancedReview.procedureReview = {
+                ...enhancedReview.procedureReview,
+                procedureName: appointment.procedureInfo.name
+              };
+            }
+            return enhancedReview;
+          }
+          return review;
+        } catch (error) {
+          console.warn(`Failed to enhance review ${review.id} with entity names:`, error);
+          return review;
+        }
+      })
+    );
+    return enhancedReviews;
   }
   /**
    * Gets all reviews for a specific clinic
@@ -17618,8 +17655,8 @@ var TechnologyService = class extends BaseService {
    * console.log(allowedTechnologies.subcategories); // ["subcategory1", "subcategory2"]
    */
   async getAllowedTechnologies(practitioner) {
-    const allTechnologies = await this.getAll();
-    const allowedTechnologies = allTechnologies.technologies.filter(
+    const allTechnologies = await this.getAllForFilter();
+    const allowedTechnologies = allTechnologies.filter(
       (technology) => this.validateCertification(technology.certificationRequirement, practitioner.certification)
     );
     const families = [...new Set(allowedTechnologies.map((t) => t.family))];

package/package.json

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

package/src/admin/free-consultation/README.md

@@ -0,0 +1,82 @@
+# Free Consultation Infrastructure
+
+This module manages the infrastructure required for free consultation procedures in the MetaEstetics system.
+
+## Overview
+
+The free consultation feature allows practitioners to offer complimentary initial consultations to patients. This requires specific infrastructure components to be present in the database.
+
+## Infrastructure Components
+
+The system creates the following components when `freeConsultationInfrastructure()` is called:
+
+### 1. Category: "consultation"
+- **ID**: `consultation`
+- **Name**: Consultation
+- **Description**: Professional consultation services for treatment planning and assessment
+- **Family**: AESTHETICS
+
+### 2. Subcategory: "free-consultation"
+- **ID**: `free-consultation`
+- **Name**: Free Consultation
+- **Description**: Complimentary initial consultation to discuss treatment options and assess patient needs
+- **Parent Category**: consultation
+
+### 3. Technology: "free-consultation-tech"
+- **ID**: `free-consultation-tech`
+- **Name**: Free Consultation Technology
+- **Description**: Technology framework for providing free initial consultations to patients
+- **Requirements**: No pre/post requirements
+- **Certification**: Minimum level AESTHETICIAN
+
+### 4. Product: "free-consultation-product"
+- **ID**: `free-consultation-product`
+- **Name**: Free Consultation Service
+- **Description**: No physical product required for consultation services
+- **Brand**: Consultation Services
+- **Type**: Virtual service
+
+## Usage
+
+### Ensuring Infrastructure Exists
+
+```typescript
+import { freeConsultationInfrastructure } from './free-consultation-utils.admin';
+
+// Ensure infrastructure exists before creating consultation procedures
+const infrastructureExists = await freeConsultationInfrastructure();
+```
+
+### Creating Free Consultation Procedures
+
+The infrastructure is automatically checked and created when practitioners enable free consultations through the `PractitionerService.EnableFreeConsultation()` method.
+
+## Error Handling
+
+If you encounter the error:
+```
+Product with ID free-consultation-product not found for technology free-consultation-tech
+```
+
+This indicates that the infrastructure was not properly created. The system will automatically attempt to create the missing infrastructure when the error occurs.
+
+## Database Structure
+
+```
+categories/
+  consultation/
+    subcategories/
+      free-consultation/
+
+technologies/
+  free-consultation-tech/
+    products/
+      free-consultation-product/
+```
+
+## Notes
+
+- The infrastructure is created atomically using Firestore batch operations
+- All components are created with `isActive: true`
+- The system checks for existing infrastructure before attempting to create new components
+- No physical products are required for consultation procedures

package/src/admin/free-consultation/free-consultation-utils.admin.ts

@@ -1,80 +1,72 @@
-import * as admin from "firebase-admin";
-import { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
+import * as admin from 'firebase-admin';
+import { ProcedureFamily } from '../../backoffice/types/static/procedure-family.types';
 import {
   CertificationLevel,
   CertificationSpecialty,
-} from "../../backoffice/types/static/certification.types";
-import { CATEGORIES_COLLECTION } from "../../backoffice/types/category.types";
-import { SUBCATEGORIES_COLLECTION } from "../../backoffice/types/subcategory.types";
-import { TECHNOLOGIES_COLLECTION } from "../../backoffice/types/technology.types";
+} from '../../backoffice/types/static/certification.types';
+import { CATEGORIES_COLLECTION } from '../../backoffice/types/category.types';
+import { SUBCATEGORIES_COLLECTION } from '../../backoffice/types/subcategory.types';
+import { TECHNOLOGIES_COLLECTION } from '../../backoffice/types/technology.types';
+import { PRODUCTS_COLLECTION } from '../../backoffice/types/product.types';
 
 /**
  * Ensures that the free consultation infrastructure exists in the database
- * Creates category, subcategory, and technology if they don't exist
+ * Creates category, subcategory, technology, and product if they don't exist
  * @param db - Firestore database instance (optional, defaults to admin.firestore())
  * @returns Promise<boolean> - Always returns true after ensuring infrastructure exists
  */
 export async function freeConsultationInfrastructure(
-  db?: admin.firestore.Firestore
+  db?: admin.firestore.Firestore,
 ): Promise<boolean> {
   const firestore = db || admin.firestore();
 
   try {
-    console.log(
-      "[freeConsultationInfrastructure] Checking free consultation infrastructure..."
-    );
+    console.log('[freeConsultationInfrastructure] Checking free consultation infrastructure...');
 
     // Check if the technology already exists
     const technologyRef = firestore
       .collection(TECHNOLOGIES_COLLECTION)
-      .doc("free-consultation-tech");
+      .doc('free-consultation-tech');
 
     const technologyDoc = await technologyRef.get();
 
     if (technologyDoc.exists) {
       console.log(
-        "[freeConsultationInfrastructure] Free consultation infrastructure already exists"
+        '[freeConsultationInfrastructure] Free consultation infrastructure already exists',
       );
       return true;
     }
 
-    console.log(
-      "[freeConsultationInfrastructure] Creating free consultation infrastructure..."
-    );
+    console.log('[freeConsultationInfrastructure] Creating free consultation infrastructure...');
 
-    // Create the infrastructure in the correct order: Category → Subcategory → Technology
+    // Create the infrastructure in the correct order: Category → Subcategory → Technology → Product
     await createFreeConsultationInfrastructure(firestore);
 
     console.log(
-      "[freeConsultationInfrastructure] Successfully created free consultation infrastructure"
+      '[freeConsultationInfrastructure] Successfully created free consultation infrastructure',
     );
     return true;
   } catch (error) {
-    console.error(
-      "[freeConsultationInfrastructure] Error ensuring infrastructure:",
-      error
-    );
+    console.error('[freeConsultationInfrastructure] Error ensuring infrastructure:', error);
     throw error;
   }
 }
 
 /**
  * Creates the complete free consultation infrastructure
+ * Creates category, subcategory, technology, and product in the correct order
  * @param db - Firestore database instance
  */
-async function createFreeConsultationInfrastructure(
-  db: admin.firestore.Firestore
-): Promise<void> {
+async function createFreeConsultationInfrastructure(db: admin.firestore.Firestore): Promise<void> {
   const batch = db.batch();
   const now = new Date();
 
   // 1. Create Category: "consultation"
-  const categoryRef = db.collection(CATEGORIES_COLLECTION).doc("consultation");
+  const categoryRef = db.collection(CATEGORIES_COLLECTION).doc('consultation');
   const categoryData = {
-    id: "consultation",
-    name: "Consultation",
-    description:
-      "Professional consultation services for treatment planning and assessment",
+    id: 'consultation',
+    name: 'Consultation',
+    description: 'Professional consultation services for treatment planning and assessment',
     family: ProcedureFamily.AESTHETICS,
     isActive: true,
     createdAt: now,
@@ -85,16 +77,16 @@ async function createFreeConsultationInfrastructure(
   // 2. Create Subcategory: "free-consultation"
   const subcategoryRef = db
     .collection(CATEGORIES_COLLECTION)
-    .doc("consultation")
+    .doc('consultation')
     .collection(SUBCATEGORIES_COLLECTION)
-    .doc("free-consultation");
+    .doc('free-consultation');
 
   const subcategoryData = {
-    id: "free-consultation",
-    name: "Free Consultation",
+    id: 'free-consultation',
+    name: 'Free Consultation',
     description:
-      "Complimentary initial consultation to discuss treatment options and assess patient needs",
-    categoryId: "consultation",
+      'Complimentary initial consultation to discuss treatment options and assess patient needs',
+    categoryId: 'consultation',
     isActive: true,
     createdAt: now,
     updatedAt: now,
@@ -102,19 +94,15 @@ async function createFreeConsultationInfrastructure(
   batch.set(subcategoryRef, subcategoryData);
 
   // 3. Create Technology: "free-consultation-tech"
-  const technologyRef = db
-    .collection(TECHNOLOGIES_COLLECTION)
-    .doc("free-consultation-tech");
+  const technologyRef = db.collection(TECHNOLOGIES_COLLECTION).doc('free-consultation-tech');
   const technologyData = {
-    id: "free-consultation-tech",
-    name: "Free Consultation Technology",
-    description:
-      "Technology framework for providing free initial consultations to patients",
+    id: 'free-consultation-tech',
+    name: 'Free Consultation Technology',
+    description: 'Technology framework for providing free initial consultations to patients',
     family: ProcedureFamily.AESTHETICS,
-    categoryId: "consultation",
-    subcategoryId: "free-consultation",
-    technicalDetails:
-      "Standard consultation protocol for initial patient assessment",
+    categoryId: 'consultation',
+    subcategoryId: 'free-consultation',
+    technicalDetails: 'Standard consultation protocol for initial patient assessment',
     requirements: {
       pre: [], // No pre-requirements for consultation
       post: [], // No post-requirements for consultation
@@ -122,9 +110,9 @@ async function createFreeConsultationInfrastructure(
     blockingConditions: [], // No blocking conditions for consultation
     contraindications: [], // No contraindications for consultation
     benefits: [
-      "IMPROVED_PATIENT_UNDERSTANDING",
-      "BETTER_TREATMENT_PLANNING",
-      "ENHANCED_PATIENT_CONFIDENCE",
+      'IMPROVED_PATIENT_UNDERSTANDING',
+      'BETTER_TREATMENT_PLANNING',
+      'ENHANCED_PATIENT_CONFIDENCE',
     ],
     certificationRequirement: {
       minimumLevel: CertificationLevel.AESTHETICIAN,
@@ -137,11 +125,39 @@ async function createFreeConsultationInfrastructure(
   };
   batch.set(technologyRef, technologyData);
 
+  // 4. Create Product: "free-consultation-product"
+  const productRef = db
+    .collection(TECHNOLOGIES_COLLECTION)
+    .doc('free-consultation-tech')
+    .collection(PRODUCTS_COLLECTION)
+    .doc('free-consultation-product');
+
+  const productData = {
+    id: 'free-consultation-product',
+    name: 'Free Consultation Service',
+    description: 'No physical product required for consultation services',
+    brandId: 'consultation-brand',
+    brandName: 'Consultation Services',
+    technologyId: 'free-consultation-tech',
+    technologyName: 'Free Consultation Technology',
+    categoryId: 'consultation',
+    subcategoryId: 'free-consultation',
+    isActive: true,
+    createdAt: now,
+    updatedAt: now,
+    technicalDetails: 'Virtual consultation service - no physical product required',
+    warnings: [],
+    indications: ['Initial patient assessment', 'Treatment planning', 'Patient education'],
+    contraindications: [],
+  };
+  batch.set(productRef, productData);
+
   // Commit all changes atomically
   await batch.commit();
 
-  console.log("[freeConsultationInfrastructure] Successfully created:");
-  console.log("  ✓ Category: consultation");
-  console.log("  ✓ Subcategory: free-consultation");
-  console.log("  ✓ Technology: free-consultation-tech");
+  console.log('[freeConsultationInfrastructure] Successfully created:');
+  console.log('  ✓ Category: consultation');
+  console.log('  ✓ Subcategory: free-consultation');
+  console.log('  ✓ Technology: free-consultation-tech');
+  console.log('  ✓ Product: free-consultation-product');
 }

package/src/backoffice/services/technology.service.ts

@@ -693,10 +693,10 @@ export class TechnologyService extends BaseService implements ITechnologyService
     subcategories: string[];
   }> {
     // Get all active technologies
-    const allTechnologies = await this.getAll();
+    const allTechnologies = await this.getAllForFilter();
 
     // Filter technologies based on certification requirements
-    const allowedTechnologies = allTechnologies.technologies.filter(technology =>
+    const allowedTechnologies = allTechnologies.filter(technology =>
       this.validateCertification(technology.certificationRequirement, practitioner.certification),
     );
 

package/src/services/reviews/reviews.service.ts

@@ -8,23 +8,21 @@ import {
   setDoc,
   deleteDoc,
   serverTimestamp,
-} from "firebase/firestore";
-import { BaseService } from "../base.service";
+} from 'firebase/firestore';
+import { BaseService } from '../base.service';
 import {
   Review,
   ClinicReview,
   PractitionerReview,
   ProcedureReview,
   REVIEWS_COLLECTION,
-} from "../../types/reviews";
-import {
-  createReviewSchema,
-  reviewSchema,
-} from "../../validations/reviews.schema";
-import { z } from "zod";
-import { Auth } from "firebase/auth";
-import { Firestore } from "firebase/firestore";
-import { FirebaseApp } from "firebase/app";
+} from '../../types/reviews';
+import { createReviewSchema, reviewSchema } from '../../validations/reviews.schema';
+import { z } from 'zod';
+import { Auth } from 'firebase/auth';
+import { Firestore } from 'firebase/firestore';
+import { FirebaseApp } from 'firebase/app';
+import { Appointment, APPOINTMENTS_COLLECTION } from '../../types/appointment';
 
 export class ReviewService extends BaseService {
   constructor(db: Firestore, auth: Auth, app: FirebaseApp) {
@@ -38,11 +36,8 @@ export class ReviewService extends BaseService {
    * @returns The created review
    */
   async createReview(
-    data: Omit<
-      Review,
-      "id" | "createdAt" | "updatedAt" | "appointmentId" | "overallRating"
-    >,
-    appointmentId: string
+    data: Omit<Review, 'id' | 'createdAt' | 'updatedAt' | 'appointmentId' | 'overallRating'>,
+    appointmentId: string,
   ): Promise<Review> {
     try {
       // Validate input data
@@ -166,17 +161,63 @@ export class ReviewService extends BaseService {
   }
 
   /**
-   * Gets all reviews for a specific patient
+   * Gets all reviews for a specific patient with enhanced entity names
    * @param patientId The ID of the patient
-   * @returns Array of reviews for the patient
+   * @returns Array of reviews for the patient with clinic, practitioner, and procedure names
    */
   async getReviewsByPatient(patientId: string): Promise<Review[]> {
-    const q = query(
-      collection(this.db, REVIEWS_COLLECTION),
-      where("patientId", "==", patientId)
-    );
+    const q = query(collection(this.db, REVIEWS_COLLECTION), where('patientId', '==', patientId));
     const snapshot = await getDocs(q);
-    return snapshot.docs.map((doc) => doc.data() as Review);
+    const reviews = snapshot.docs.map(doc => doc.data() as Review);
+
+    // Enhance reviews with entity names from appointments
+    const enhancedReviews = await Promise.all(
+      reviews.map(async review => {
+        try {
+          // Fetch the associated appointment
+          const appointmentDoc = await getDoc(
+            doc(this.db, APPOINTMENTS_COLLECTION, review.appointmentId),
+          );
+
+          if (appointmentDoc.exists()) {
+            const appointment = appointmentDoc.data() as Appointment;
+
+            // Create enhanced review with entity names
+            const enhancedReview = { ...review };
+
+            if (enhancedReview.clinicReview && appointment.clinicInfo) {
+              enhancedReview.clinicReview = {
+                ...enhancedReview.clinicReview,
+                clinicName: appointment.clinicInfo.name,
+              };
+            }
+
+            if (enhancedReview.practitionerReview && appointment.practitionerInfo) {
+              enhancedReview.practitionerReview = {
+                ...enhancedReview.practitionerReview,
+                practitionerName: appointment.practitionerInfo.name,
+              };
+            }
+
+            if (enhancedReview.procedureReview && appointment.procedureInfo) {
+              enhancedReview.procedureReview = {
+                ...enhancedReview.procedureReview,
+                procedureName: appointment.procedureInfo.name,
+              };
+            }
+
+            return enhancedReview;
+          }
+
+          return review;
+        } catch (error) {
+          console.warn(`Failed to enhance review ${review.id} with entity names:`, error);
+          return review;
+        }
+      }),
+    );
+
+    return enhancedReviews;
   }
 
   /**
@@ -187,10 +228,10 @@ export class ReviewService extends BaseService {
   async getReviewsByClinic(clinicId: string): Promise<Review[]> {
     const q = query(
       collection(this.db, REVIEWS_COLLECTION),
-      where("clinicReview.clinicId", "==", clinicId)
+      where('clinicReview.clinicId', '==', clinicId),
     );
     const snapshot = await getDocs(q);
-    return snapshot.docs.map((doc) => doc.data() as Review);
+    return snapshot.docs.map(doc => doc.data() as Review);
   }
 
   /**
@@ -201,10 +242,10 @@ export class ReviewService extends BaseService {
   async getReviewsByPractitioner(practitionerId: string): Promise<Review[]> {
     const q = query(
       collection(this.db, REVIEWS_COLLECTION),
-      where("practitionerReview.practitionerId", "==", practitionerId)
+      where('practitionerReview.practitionerId', '==', practitionerId),
     );
     const snapshot = await getDocs(q);
-    return snapshot.docs.map((doc) => doc.data() as Review);
+    return snapshot.docs.map(doc => doc.data() as Review);
   }
 
   /**
@@ -215,10 +256,10 @@ export class ReviewService extends BaseService {
   async getReviewsByProcedure(procedureId: string): Promise<Review[]> {
     const q = query(
       collection(this.db, REVIEWS_COLLECTION),
-      where("procedureReview.procedureId", "==", procedureId)
+      where('procedureReview.procedureId', '==', procedureId),
     );
     const snapshot = await getDocs(q);
-    return snapshot.docs.map((doc) => doc.data() as Review);
+    return snapshot.docs.map(doc => doc.data() as Review);
   }
 
   /**
@@ -229,7 +270,7 @@ export class ReviewService extends BaseService {
   async getReviewByAppointment(appointmentId: string): Promise<Review | null> {
     const q = query(
       collection(this.db, REVIEWS_COLLECTION),
-      where("appointmentId", "==", appointmentId)
+      where('appointmentId', '==', appointmentId),
     );
     const snapshot = await getDocs(q);
 

package/src/services/user/user.service.ts

@@ -178,10 +178,17 @@ export class UserService extends BaseService {
               throw new Error('User already has a patient profile.');
             }
 
-            // Claim the profile: link userRef and set isManual to false
+            // Claim the profile: link userRef, set isManual to false, and update displayName
+            // Get sensitive info to construct full display name
+            const sensitiveInfo = await patientService.getSensitiveInfo(patientProfile.id, userId);
+            const fullDisplayName = sensitiveInfo
+              ? `${sensitiveInfo.firstName} ${sensitiveInfo.lastName}`
+              : patientProfile.displayName;
+
             await patientService.updatePatientProfile(patientProfile.id, {
               userRef: userId,
               isManual: false,
+              displayName: fullDisplayName,
             });
 
             // Mark the token as used

package/src/types/reviews/index.ts

@@ -22,6 +22,7 @@ interface BaseReview {
  */
 export interface ClinicReview extends BaseReview {
   clinicId: string;
+  clinicName?: string; // Enhanced field: clinic name from appointment
   cleanliness: number; // 1-5 stars
   facilities: number; // 1-5 stars
   staffFriendliness: number; // 1-5 stars
@@ -37,6 +38,7 @@ export interface ClinicReview extends BaseReview {
  */
 export interface PractitionerReview extends BaseReview {
   practitionerId: string;
+  practitionerName?: string; // Enhanced field: practitioner name from appointment
   knowledgeAndExpertise: number; // 1-5 stars
   communicationSkills: number; // 1-5 stars
   bedSideManner: number; // 1-5 stars
@@ -52,6 +54,7 @@ export interface PractitionerReview extends BaseReview {
  */
 export interface ProcedureReview extends BaseReview {
   procedureId: string;
+  procedureName?: string; // Enhanced field: procedure name from appointment
   effectivenessOfTreatment: number; // 1-5 stars
   outcomeExplanation: number; // 1-5 stars
   painManagement: number; // 1-5 stars