@blackcode_sa/metaestetics-api 1.13.2 → 1.13.4

package/dist/index.d.mts

@@ -6794,9 +6794,10 @@ declare class ProcedureService extends BaseService {
     /**
      * Gets all procedures for a practitioner
      * @param practitionerId - The ID of the practitioner
+     * @param clinicBranchId - Optional clinic branch ID to filter by
      * @returns List of procedures
      */
-    getProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
+    getProceduresByPractitioner(practitionerId: string, clinicBranchId?: string): Promise<Procedure[]>;
     /**
      * Gets all inactive procedures for a practitioner
      * @param practitionerId - The ID of the practitioner

package/dist/index.d.ts

@@ -6794,9 +6794,10 @@ declare class ProcedureService extends BaseService {
     /**
      * Gets all procedures for a practitioner
      * @param practitionerId - The ID of the practitioner
+     * @param clinicBranchId - Optional clinic branch ID to filter by
      * @returns List of procedures
      */
-    getProceduresByPractitioner(practitionerId: string): Promise<Procedure[]>;
+    getProceduresByPractitioner(practitionerId: string, clinicBranchId?: string): Promise<Procedure[]>;
     /**
      * Gets all inactive procedures for a practitioner
      * @param practitionerId - The ID of the practitioner

package/dist/index.js

@@ -20035,6 +20035,25 @@ var ProcedureService = class extends BaseService {
       throw new Error(`Practitioner with ID ${validatedData.practitionerId} not found`);
     }
     const practitioner = practitionerSnapshot.data();
+    const existingProceduresQuery = (0, import_firestore58.query)(
+      (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION),
+      (0, import_firestore58.where)("practitionerId", "==", validatedData.practitionerId),
+      (0, import_firestore58.where)("clinicBranchId", "==", validatedData.clinicBranchId),
+      (0, import_firestore58.where)("isActive", "==", true)
+    );
+    const existingProceduresSnapshot = await (0, import_firestore58.getDocs)(existingProceduresQuery);
+    const existingProcedures = existingProceduresSnapshot.docs.map((doc47) => doc47.data());
+    const hasSameTechnology = existingProcedures.some(
+      (proc) => {
+        var _a2;
+        return ((_a2 = proc.technology) == null ? void 0 : _a2.id) === validatedData.technologyId;
+      }
+    );
+    if (hasSameTechnology) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${(technology == null ? void 0 : technology.name) || validatedData.technologyId}" in this clinic branch`
+      );
+    }
     let processedPhotos = [];
     if (validatedData.photos && validatedData.photos.length > 0) {
       processedPhotos = await this.processMediaArray(
@@ -20455,6 +20474,40 @@ var ProcedureService = class extends BaseService {
       const notFoundIds = practitionerIds.filter((id) => !foundIds.includes(id));
       throw new Error(`The following practitioners were not found: ${notFoundIds.join(", ")}`);
     }
+    const duplicatePractitioners = [];
+    const duplicateChecks = await Promise.all(
+      practitionerIds.map(async (practitionerId) => {
+        const existingProceduresQuery = (0, import_firestore58.query)(
+          (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION),
+          (0, import_firestore58.where)("practitionerId", "==", practitionerId),
+          (0, import_firestore58.where)("clinicBranchId", "==", validatedData.clinicBranchId),
+          (0, import_firestore58.where)("isActive", "==", true)
+        );
+        const existingProceduresSnapshot = await (0, import_firestore58.getDocs)(existingProceduresQuery);
+        const existingProcedures = existingProceduresSnapshot.docs.map((doc47) => doc47.data());
+        const hasSameTechnology = existingProcedures.some(
+          (proc) => {
+            var _a2;
+            return ((_a2 = proc.technology) == null ? void 0 : _a2.id) === validatedData.technologyId;
+          }
+        );
+        return { practitionerId, hasSameTechnology };
+      })
+    );
+    duplicateChecks.forEach(({ practitionerId, hasSameTechnology }) => {
+      if (hasSameTechnology) {
+        duplicatePractitioners.push(practitionerId);
+      }
+    });
+    if (duplicatePractitioners.length > 0) {
+      const duplicateNames = duplicatePractitioners.map((id) => {
+        const practitioner = practitionersMap.get(id);
+        return `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`;
+      }).join(", ");
+      throw new Error(
+        `The following practitioner(s) already have a procedure with technology "${(technology == null ? void 0 : technology.name) || validatedData.technologyId}" in this clinic branch: ${duplicateNames}. Please remove them from the selection and try again.`
+      );
+    }
     const batch = (0, import_firestore58.writeBatch)(this.db);
     const createdProcedureIds = [];
     const clinicInfo = {
@@ -20578,13 +20631,20 @@ var ProcedureService = class extends BaseService {
   /**
    * Gets all procedures for a practitioner
    * @param practitionerId - The ID of the practitioner
+   * @param clinicBranchId - Optional clinic branch ID to filter by
    * @returns List of procedures
    */
-  async getProceduresByPractitioner(practitionerId) {
-    const q = (0, import_firestore58.query)(
-      (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION),
+  async getProceduresByPractitioner(practitionerId, clinicBranchId) {
+    const constraints = [
       (0, import_firestore58.where)("practitionerId", "==", practitionerId),
       (0, import_firestore58.where)("isActive", "==", true)
+    ];
+    if (clinicBranchId) {
+      constraints.push((0, import_firestore58.where)("clinicBranchId", "==", clinicBranchId));
+    }
+    const q = (0, import_firestore58.query)(
+      (0, import_firestore58.collection)(this.db, PROCEDURES_COLLECTION),
+      ...constraints
     );
     const snapshot = await (0, import_firestore58.getDocs)(q);
     return snapshot.docs.map((doc47) => doc47.data());

package/dist/index.mjs

@@ -20271,6 +20271,25 @@ var ProcedureService = class extends BaseService {
       throw new Error(`Practitioner with ID ${validatedData.practitionerId} not found`);
     }
     const practitioner = practitionerSnapshot.data();
+    const existingProceduresQuery = query33(
+      collection33(this.db, PROCEDURES_COLLECTION),
+      where33("practitionerId", "==", validatedData.practitionerId),
+      where33("clinicBranchId", "==", validatedData.clinicBranchId),
+      where33("isActive", "==", true)
+    );
+    const existingProceduresSnapshot = await getDocs33(existingProceduresQuery);
+    const existingProcedures = existingProceduresSnapshot.docs.map((doc47) => doc47.data());
+    const hasSameTechnology = existingProcedures.some(
+      (proc) => {
+        var _a2;
+        return ((_a2 = proc.technology) == null ? void 0 : _a2.id) === validatedData.technologyId;
+      }
+    );
+    if (hasSameTechnology) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${(technology == null ? void 0 : technology.name) || validatedData.technologyId}" in this clinic branch`
+      );
+    }
     let processedPhotos = [];
     if (validatedData.photos && validatedData.photos.length > 0) {
       processedPhotos = await this.processMediaArray(
@@ -20691,6 +20710,40 @@ var ProcedureService = class extends BaseService {
       const notFoundIds = practitionerIds.filter((id) => !foundIds.includes(id));
       throw new Error(`The following practitioners were not found: ${notFoundIds.join(", ")}`);
     }
+    const duplicatePractitioners = [];
+    const duplicateChecks = await Promise.all(
+      practitionerIds.map(async (practitionerId) => {
+        const existingProceduresQuery = query33(
+          collection33(this.db, PROCEDURES_COLLECTION),
+          where33("practitionerId", "==", practitionerId),
+          where33("clinicBranchId", "==", validatedData.clinicBranchId),
+          where33("isActive", "==", true)
+        );
+        const existingProceduresSnapshot = await getDocs33(existingProceduresQuery);
+        const existingProcedures = existingProceduresSnapshot.docs.map((doc47) => doc47.data());
+        const hasSameTechnology = existingProcedures.some(
+          (proc) => {
+            var _a2;
+            return ((_a2 = proc.technology) == null ? void 0 : _a2.id) === validatedData.technologyId;
+          }
+        );
+        return { practitionerId, hasSameTechnology };
+      })
+    );
+    duplicateChecks.forEach(({ practitionerId, hasSameTechnology }) => {
+      if (hasSameTechnology) {
+        duplicatePractitioners.push(practitionerId);
+      }
+    });
+    if (duplicatePractitioners.length > 0) {
+      const duplicateNames = duplicatePractitioners.map((id) => {
+        const practitioner = practitionersMap.get(id);
+        return `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`;
+      }).join(", ");
+      throw new Error(
+        `The following practitioner(s) already have a procedure with technology "${(technology == null ? void 0 : technology.name) || validatedData.technologyId}" in this clinic branch: ${duplicateNames}. Please remove them from the selection and try again.`
+      );
+    }
     const batch = writeBatch6(this.db);
     const createdProcedureIds = [];
     const clinicInfo = {
@@ -20814,13 +20867,20 @@ var ProcedureService = class extends BaseService {
   /**
    * Gets all procedures for a practitioner
    * @param practitionerId - The ID of the practitioner
+   * @param clinicBranchId - Optional clinic branch ID to filter by
    * @returns List of procedures
    */
-  async getProceduresByPractitioner(practitionerId) {
-    const q = query33(
-      collection33(this.db, PROCEDURES_COLLECTION),
+  async getProceduresByPractitioner(practitionerId, clinicBranchId) {
+    const constraints = [
       where33("practitionerId", "==", practitionerId),
       where33("isActive", "==", true)
+    ];
+    if (clinicBranchId) {
+      constraints.push(where33("clinicBranchId", "==", clinicBranchId));
+    }
+    const q = query33(
+      collection33(this.db, PROCEDURES_COLLECTION),
+      ...constraints
     );
     const snapshot = await getDocs33(q);
     return snapshot.docs.map((doc47) => doc47.data());

package/package.json

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

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

@@ -244,6 +244,25 @@ export class ProcedureService extends BaseService {
     }
     const practitioner = practitionerSnapshot.data() as Practitioner; // Assert type
 
+    // Check if practitioner already has a procedure with the same technology ID in this clinic branch
+    const existingProceduresQuery = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      where('practitionerId', '==', validatedData.practitionerId),
+      where('clinicBranchId', '==', validatedData.clinicBranchId),
+      where('isActive', '==', true)
+    );
+    const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+    const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+    
+    const hasSameTechnology = existingProcedures.some(
+      proc => proc.technology?.id === validatedData.technologyId
+    );
+    if (hasSameTechnology) {
+      throw new Error(
+        `Practitioner ${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName} already has a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch`
+      );
+    }
+
     // Process photos if provided
     let processedPhotos: string[] = [];
     if (validatedData.photos && validatedData.photos.length > 0) {
@@ -787,7 +806,49 @@ export class ProcedureService extends BaseService {
       throw new Error(`The following practitioners were not found: ${notFoundIds.join(', ')}`);
     }
 
-    // 5. Use a Firestore batch for atomic creation
+    // 5. Check for duplicates across all practitioners before creating any procedures
+    const duplicatePractitioners: string[] = [];
+    const duplicateChecks = await Promise.all(
+      practitionerIds.map(async (practitionerId) => {
+        const existingProceduresQuery = query(
+          collection(this.db, PROCEDURES_COLLECTION),
+          where('practitionerId', '==', practitionerId),
+          where('clinicBranchId', '==', validatedData.clinicBranchId),
+          where('isActive', '==', true)
+        );
+        const existingProceduresSnapshot = await getDocs(existingProceduresQuery);
+        const existingProcedures = existingProceduresSnapshot.docs.map(doc => doc.data() as Procedure);
+        
+        const hasSameTechnology = existingProcedures.some(
+          proc => proc.technology?.id === validatedData.technologyId
+        );
+        
+        return { practitionerId, hasSameTechnology };
+      })
+    );
+
+    // Collect all practitioners with duplicates
+    duplicateChecks.forEach(({ practitionerId, hasSameTechnology }) => {
+      if (hasSameTechnology) {
+        duplicatePractitioners.push(practitionerId);
+      }
+    });
+
+    // If any duplicates found, throw error listing all of them
+    if (duplicatePractitioners.length > 0) {
+      const duplicateNames = duplicatePractitioners
+        .map(id => {
+          const practitioner = practitionersMap.get(id)!;
+          return `${practitioner.basicInfo.firstName} ${practitioner.basicInfo.lastName}`;
+        })
+        .join(', ');
+      
+      throw new Error(
+        `The following practitioner(s) already have a procedure with technology "${technology?.name || validatedData.technologyId}" in this clinic branch: ${duplicateNames}. Please remove them from the selection and try again.`
+      );
+    }
+
+    // 6. Use a Firestore batch for atomic creation
     const batch = writeBatch(this.db);
     const createdProcedureIds: string[] = [];
     const clinicInfo = {
@@ -887,10 +948,10 @@ export class ProcedureService extends BaseService {
       });
     }
 
-    // 6. Commit the atomic batch write
+    // 7. Commit the atomic batch write
     await batch.commit();
 
-    // 7. Fetch and return the newly created procedures
+    // 8. Fetch and return the newly created procedures
     const fetchedProcedures: Procedure[] = [];
     for (let i = 0; i < createdProcedureIds.length; i += 30) {
       const chunk = createdProcedureIds.slice(i, i + 30);
@@ -938,13 +999,22 @@ export class ProcedureService extends BaseService {
   /**
    * Gets all procedures for a practitioner
    * @param practitionerId - The ID of the practitioner
+   * @param clinicBranchId - Optional clinic branch ID to filter by
    * @returns List of procedures
    */
-  async getProceduresByPractitioner(practitionerId: string): Promise<Procedure[]> {
-    const q = query(
-      collection(this.db, PROCEDURES_COLLECTION),
+  async getProceduresByPractitioner(practitionerId: string, clinicBranchId?: string): Promise<Procedure[]> {
+    const constraints: QueryConstraint[] = [
       where('practitionerId', '==', practitionerId),
       where('isActive', '==', true),
+    ];
+    
+    if (clinicBranchId) {
+      constraints.push(where('clinicBranchId', '==', clinicBranchId));
+    }
+    
+    const q = query(
+      collection(this.db, PROCEDURES_COLLECTION),
+      ...constraints
     );
     const snapshot = await getDocs(q);
     return snapshot.docs.map(doc => doc.data() as Procedure);