@blackcode_sa/metaestetics-api 1.7.30 → 1.7.31

package/dist/index.d.mts

@@ -6058,6 +6058,12 @@ declare class ProcedureService extends BaseService {
      * @returns List of procedures
      */
     getProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
+    /**
+     * Gets all inactive procedures for a practitioner
+     * @param practitionerId - The ID of the practitioner
+     * @returns List of inactive procedures
+     */
+    getInactiveProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
     /**
      * Updates a procedure
      * @param id - The ID of the procedure to update
@@ -6345,6 +6351,11 @@ declare class PractitionerService extends BaseService {
      * @returns The created consultation procedure
      */
     EnableFreeConsultation(practitionerId: string, clinicId: string): Promise<void>;
+    /**
+     * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+     * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+     */
+    ensureFreeConsultationInfrastructure(): Promise<boolean>;
     /**
      * Disables free consultation for a practitioner in a specific clinic
      * Finds and deactivates the existing free consultation procedure

package/dist/index.d.ts

@@ -6058,6 +6058,12 @@ declare class ProcedureService extends BaseService {
      * @returns List of procedures
      */
     getProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
+    /**
+     * Gets all inactive procedures for a practitioner
+     * @param practitionerId - The ID of the practitioner
+     * @returns List of inactive procedures
+     */
+    getInactiveProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
     /**
      * Updates a procedure
      * @param id - The ID of the procedure to update
@@ -6345,6 +6351,11 @@ declare class PractitionerService extends BaseService {
      * @returns The created consultation procedure
      */
     EnableFreeConsultation(practitionerId: string, clinicId: string): Promise<void>;
+    /**
+     * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+     * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+     */
+    ensureFreeConsultationInfrastructure(): Promise<boolean>;
     /**
      * Disables free consultation for a practitioner in a specific clinic
      * Finds and deactivates the existing free consultation procedure

package/dist/index.js

@@ -5543,6 +5543,7 @@ var PractitionerService = class extends BaseService {
    */
   async EnableFreeConsultation(practitionerId, clinicId) {
     try {
+      await this.ensureFreeConsultationInfrastructure();
       const practitioner = await this.getPractitioner(practitionerId);
       if (!practitioner) {
         throw new Error(`Practitioner ${practitionerId} not found`);
@@ -5559,17 +5560,32 @@ var PractitionerService = class extends BaseService {
           `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
         );
       }
-      const existingProcedures = await this.getProcedureService().getProceduresByPractitioner(
-        practitionerId
-      );
-      const existingConsultation = existingProcedures.find(
-        (procedure) => procedure.name === "Free Consultation" && procedure.clinicBranchId === clinicId && procedure.isActive
+      const [activeProcedures, inactiveProcedures] = await Promise.all([
+        this.getProcedureService().getProceduresByPractitioner(practitionerId),
+        this.getProcedureService().getInactiveProceduresByPractitioner(
+          practitionerId
+        )
+      ]);
+      const allProcedures = [...activeProcedures, ...inactiveProcedures];
+      const existingConsultation = allProcedures.find(
+        (procedure) => procedure.technology.id === "free-consultation-tech" && procedure.clinicBranchId === clinicId
       );
       if (existingConsultation) {
-        console.log(
-          `Free consultation already exists for practitioner ${practitionerId} in clinic ${clinicId}`
-        );
-        return;
+        if (existingConsultation.isActive) {
+          console.log(
+            `Free consultation already active for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        } else {
+          await this.getProcedureService().updateProcedure(
+            existingConsultation.id,
+            { isActive: true }
+          );
+          console.log(
+            `Reactivated existing free consultation for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        }
       }
       const consultationData = {
         name: "Free Consultation",
@@ -5602,6 +5618,74 @@ var PractitionerService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+   * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+   */
+  async ensureFreeConsultationInfrastructure() {
+    try {
+      console.log(
+        "[PRACTITIONER_SERVICE] Ensuring free consultation infrastructure via HTTP"
+      );
+      const currentUser = this.auth.currentUser;
+      if (!currentUser) {
+        throw new Error(
+          "User must be authenticated to ensure free consultation infrastructure"
+        );
+      }
+      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/ensureFreeConsultationInfrastructure`;
+      const idToken = await currentUser.getIdToken();
+      console.log(
+        `[PRACTITIONER_SERVICE] Making fetch request to ${functionUrl}`
+      );
+      const response = await fetch(functionUrl, {
+        method: "POST",
+        mode: "cors",
+        cache: "no-cache",
+        credentials: "omit",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${idToken}`
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+        body: JSON.stringify({})
+        // Empty body as no parameters needed
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Received response ${response.status}: ${response.statusText}`
+      );
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error(
+          `[PRACTITIONER_SERVICE] Error response details: ${errorText}`
+        );
+        throw new Error(
+          `Failed to ensure free consultation infrastructure: ${response.status} ${response.statusText} - ${errorText}`
+        );
+      }
+      const result = await response.json();
+      console.log(
+        `[PRACTITIONER_SERVICE] Infrastructure check response:`,
+        result
+      );
+      if (!result.success) {
+        throw new Error(
+          result.error || "Failed to ensure free consultation infrastructure"
+        );
+      }
+      console.log(
+        `[PRACTITIONER_SERVICE] Free consultation infrastructure ensured successfully`
+      );
+      return result.infrastructureExists;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error ensuring free consultation infrastructure:",
+        error
+      );
+      throw error;
+    }
+  }
   /**
    * Disables free consultation for a practitioner in a specific clinic
    * Finds and deactivates the existing free consultation procedure
@@ -5627,7 +5711,7 @@ var PractitionerService = class extends BaseService {
         practitionerId
       );
       const freeConsultation = existingProcedures.find(
-        (procedure) => procedure.name === "Free Consultation" && procedure.clinicBranchId === clinicId && procedure.isActive
+        (procedure) => procedure.technology.id === "free-consultation-tech" && procedure.clinicBranchId === clinicId && procedure.isActive
       );
       if (!freeConsultation) {
         console.log(
@@ -9001,6 +9085,20 @@ var ProcedureService = class extends BaseService {
     const snapshot = await (0, import_firestore27.getDocs)(q);
     return snapshot.docs.map((doc36) => doc36.data());
   }
+  /**
+   * Gets all inactive procedures for a practitioner
+   * @param practitionerId - The ID of the practitioner
+   * @returns List of inactive procedures
+   */
+  async getInactiveProceduresByPractitioner(practitionerId) {
+    const q = (0, import_firestore27.query)(
+      (0, import_firestore27.collection)(this.db, PROCEDURES_COLLECTION),
+      (0, import_firestore27.where)("practitionerId", "==", practitionerId),
+      (0, import_firestore27.where)("isActive", "==", false)
+    );
+    const snapshot = await (0, import_firestore27.getDocs)(q);
+    return snapshot.docs.map((doc36) => doc36.data());
+  }
   /**
    * Updates a procedure
    * @param id - The ID of the procedure to update

package/dist/index.mjs

@@ -5447,6 +5447,7 @@ var PractitionerService = class extends BaseService {
    */
   async EnableFreeConsultation(practitionerId, clinicId) {
     try {
+      await this.ensureFreeConsultationInfrastructure();
       const practitioner = await this.getPractitioner(practitionerId);
       if (!practitioner) {
         throw new Error(`Practitioner ${practitionerId} not found`);
@@ -5463,17 +5464,32 @@ var PractitionerService = class extends BaseService {
           `Practitioner ${practitionerId} is not associated with clinic ${clinicId}`
         );
       }
-      const existingProcedures = await this.getProcedureService().getProceduresByPractitioner(
-        practitionerId
-      );
-      const existingConsultation = existingProcedures.find(
-        (procedure) => procedure.name === "Free Consultation" && procedure.clinicBranchId === clinicId && procedure.isActive
+      const [activeProcedures, inactiveProcedures] = await Promise.all([
+        this.getProcedureService().getProceduresByPractitioner(practitionerId),
+        this.getProcedureService().getInactiveProceduresByPractitioner(
+          practitionerId
+        )
+      ]);
+      const allProcedures = [...activeProcedures, ...inactiveProcedures];
+      const existingConsultation = allProcedures.find(
+        (procedure) => procedure.technology.id === "free-consultation-tech" && procedure.clinicBranchId === clinicId
       );
       if (existingConsultation) {
-        console.log(
-          `Free consultation already exists for practitioner ${practitionerId} in clinic ${clinicId}`
-        );
-        return;
+        if (existingConsultation.isActive) {
+          console.log(
+            `Free consultation already active for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        } else {
+          await this.getProcedureService().updateProcedure(
+            existingConsultation.id,
+            { isActive: true }
+          );
+          console.log(
+            `Reactivated existing free consultation for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        }
       }
       const consultationData = {
         name: "Free Consultation",
@@ -5506,6 +5522,74 @@ var PractitionerService = class extends BaseService {
       throw error;
     }
   }
+  /**
+   * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+   * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+   */
+  async ensureFreeConsultationInfrastructure() {
+    try {
+      console.log(
+        "[PRACTITIONER_SERVICE] Ensuring free consultation infrastructure via HTTP"
+      );
+      const currentUser = this.auth.currentUser;
+      if (!currentUser) {
+        throw new Error(
+          "User must be authenticated to ensure free consultation infrastructure"
+        );
+      }
+      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/ensureFreeConsultationInfrastructure`;
+      const idToken = await currentUser.getIdToken();
+      console.log(
+        `[PRACTITIONER_SERVICE] Making fetch request to ${functionUrl}`
+      );
+      const response = await fetch(functionUrl, {
+        method: "POST",
+        mode: "cors",
+        cache: "no-cache",
+        credentials: "omit",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${idToken}`
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+        body: JSON.stringify({})
+        // Empty body as no parameters needed
+      });
+      console.log(
+        `[PRACTITIONER_SERVICE] Received response ${response.status}: ${response.statusText}`
+      );
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error(
+          `[PRACTITIONER_SERVICE] Error response details: ${errorText}`
+        );
+        throw new Error(
+          `Failed to ensure free consultation infrastructure: ${response.status} ${response.statusText} - ${errorText}`
+        );
+      }
+      const result = await response.json();
+      console.log(
+        `[PRACTITIONER_SERVICE] Infrastructure check response:`,
+        result
+      );
+      if (!result.success) {
+        throw new Error(
+          result.error || "Failed to ensure free consultation infrastructure"
+        );
+      }
+      console.log(
+        `[PRACTITIONER_SERVICE] Free consultation infrastructure ensured successfully`
+      );
+      return result.infrastructureExists;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error ensuring free consultation infrastructure:",
+        error
+      );
+      throw error;
+    }
+  }
   /**
    * Disables free consultation for a practitioner in a specific clinic
    * Finds and deactivates the existing free consultation procedure
@@ -5531,7 +5615,7 @@ var PractitionerService = class extends BaseService {
         practitionerId
       );
       const freeConsultation = existingProcedures.find(
-        (procedure) => procedure.name === "Free Consultation" && procedure.clinicBranchId === clinicId && procedure.isActive
+        (procedure) => procedure.technology.id === "free-consultation-tech" && procedure.clinicBranchId === clinicId && procedure.isActive
       );
       if (!freeConsultation) {
         console.log(
@@ -8986,6 +9070,20 @@ var ProcedureService = class extends BaseService {
     const snapshot = await getDocs16(q);
     return snapshot.docs.map((doc36) => doc36.data());
   }
+  /**
+   * Gets all inactive procedures for a practitioner
+   * @param practitionerId - The ID of the practitioner
+   * @returns List of inactive procedures
+   */
+  async getInactiveProceduresByPractitioner(practitionerId) {
+    const q = query16(
+      collection16(this.db, PROCEDURES_COLLECTION),
+      where16("practitionerId", "==", practitionerId),
+      where16("isActive", "==", false)
+    );
+    const snapshot = await getDocs16(q);
+    return snapshot.docs.map((doc36) => doc36.data());
+  }
   /**
    * Updates a procedure
    * @param id - The ID of the procedure to update

package/package.json

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

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

@@ -1217,6 +1217,9 @@ export class PractitionerService extends BaseService {
     clinicId: string
   ): Promise<void> {
     try {
+      // First, ensure the free consultation infrastructure exists
+      await this.ensureFreeConsultationInfrastructure();
+
       // Validate that practitioner exists and is active
       const practitioner = await this.getPractitioner(practitionerId);
       if (!practitioner) {
@@ -1243,23 +1246,41 @@ export class PractitionerService extends BaseService {
         );
       }
 
-      // Check if free consultation already exists for this practitioner in this clinic
-      const existingProcedures =
-        await this.getProcedureService().getProceduresByPractitioner(
+      // Get all procedures for this practitioner (including inactive ones)
+      const [activeProcedures, inactiveProcedures] = await Promise.all([
+        this.getProcedureService().getProceduresByPractitioner(practitionerId),
+        this.getProcedureService().getInactiveProceduresByPractitioner(
           practitionerId
-        );
-      const existingConsultation = existingProcedures.find(
+        ),
+      ]);
+
+      // Combine active and inactive procedures
+      const allProcedures = [...activeProcedures, ...inactiveProcedures];
+
+      // Check if free consultation already exists (active or inactive)
+      const existingConsultation = allProcedures.find(
         (procedure) =>
-          procedure.name === "Free Consultation" &&
-          procedure.clinicBranchId === clinicId &&
-          procedure.isActive
+          procedure.technology.id === "free-consultation-tech" &&
+          procedure.clinicBranchId === clinicId
       );
 
       if (existingConsultation) {
-        console.log(
-          `Free consultation already exists for practitioner ${practitionerId} in clinic ${clinicId}`
-        );
-        return;
+        if (existingConsultation.isActive) {
+          console.log(
+            `Free consultation already active for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        } else {
+          // Reactivate the existing disabled consultation
+          await this.getProcedureService().updateProcedure(
+            existingConsultation.id,
+            { isActive: true }
+          );
+          console.log(
+            `Reactivated existing free consultation for practitioner ${practitionerId} in clinic ${clinicId}`
+          );
+          return;
+        }
       }
 
       // Create procedure data for free consultation (without productId)
@@ -1297,6 +1318,91 @@ export class PractitionerService extends BaseService {
     }
   }
 
+  /**
+   * Ensures that the free consultation infrastructure exists by calling the Cloud Function
+   * @returns Promise<boolean> - True if infrastructure exists or was created successfully
+   */
+  async ensureFreeConsultationInfrastructure(): Promise<boolean> {
+    try {
+      console.log(
+        "[PRACTITIONER_SERVICE] Ensuring free consultation infrastructure via HTTP"
+      );
+
+      // Check if user is authenticated
+      const currentUser = this.auth.currentUser;
+      if (!currentUser) {
+        throw new Error(
+          "User must be authenticated to ensure free consultation infrastructure"
+        );
+      }
+
+      // Construct the function URL for the Express app endpoint
+      const functionUrl = `https://europe-west6-metaestetics.cloudfunctions.net/bookingApi/ensureFreeConsultationInfrastructure`;
+
+      // Get the authenticated user's ID token
+      const idToken = await currentUser.getIdToken();
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Making fetch request to ${functionUrl}`
+      );
+
+      // Make the HTTP request
+      const response = await fetch(functionUrl, {
+        method: "POST",
+        mode: "cors",
+        cache: "no-cache",
+        credentials: "omit",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${idToken}`,
+        },
+        redirect: "follow",
+        referrerPolicy: "no-referrer",
+        body: JSON.stringify({}), // Empty body as no parameters needed
+      });
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Received response ${response.status}: ${response.statusText}`
+      );
+
+      // Check if the request was successful
+      if (!response.ok) {
+        const errorText = await response.text();
+        console.error(
+          `[PRACTITIONER_SERVICE] Error response details: ${errorText}`
+        );
+        throw new Error(
+          `Failed to ensure free consultation infrastructure: ${response.status} ${response.statusText} - ${errorText}`
+        );
+      }
+
+      // Parse the response
+      const result = await response.json();
+      console.log(
+        `[PRACTITIONER_SERVICE] Infrastructure check response:`,
+        result
+      );
+
+      if (!result.success) {
+        throw new Error(
+          result.error || "Failed to ensure free consultation infrastructure"
+        );
+      }
+
+      console.log(
+        `[PRACTITIONER_SERVICE] Free consultation infrastructure ensured successfully`
+      );
+
+      return result.infrastructureExists;
+    } catch (error) {
+      console.error(
+        "[PRACTITIONER_SERVICE] Error ensuring free consultation infrastructure:",
+        error
+      );
+      throw error;
+    }
+  }
+
   /**
    * Disables free consultation for a practitioner in a specific clinic
    * Finds and deactivates the existing free consultation procedure
@@ -1328,13 +1434,14 @@ export class PractitionerService extends BaseService {
       }
 
       // Find the free consultation procedure for this practitioner in this clinic
+      // Use the more specific search by technology ID instead of name
       const existingProcedures =
         await this.getProcedureService().getProceduresByPractitioner(
           practitionerId
         );
       const freeConsultation = existingProcedures.find(
         (procedure) =>
-          procedure.name === "Free Consultation" &&
+          procedure.technology.id === "free-consultation-tech" &&
           procedure.clinicBranchId === clinicId &&
           procedure.isActive
       );

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

@@ -354,6 +354,23 @@ export class ProcedureService extends BaseService {
     return snapshot.docs.map((doc) => doc.data() as Procedure);
   }
 
+  /**
+   * Gets all inactive procedures for a practitioner
+   * @param practitionerId - The ID of the practitioner
+   * @returns List of inactive procedures
+   */
+  async getInactiveProceduresByPractitioner(
+    practitionerId: string
+  ): Promise<Procedure[]> {
+    const q = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where("practitionerId", "==", practitionerId),
+      where("isActive", "==", false)
+    );
+    const snapshot = await getDocs(q);
+    return snapshot.docs.map((doc) => doc.data() as Procedure);
+  }
+
   /**
    * Updates a procedure
    * @param id - The ID of the procedure to update