@blackcode_sa/metaestetics-api 1.13.8 → 1.13.11

package/dist/admin/index.d.mts

@@ -843,6 +843,131 @@ interface ProcedureSummaryInfo {
     practitionerName: string;
 }
 
+/**
+ * Osnovne informacije o zdravstvenom radniku
+ */
+interface PractitionerBasicInfo {
+    firstName: string;
+    lastName: string;
+    title: string;
+    email: string;
+    phoneNumber: string | null;
+    dateOfBirth: Timestamp | Date | null;
+    gender: "male" | "female" | "other";
+    profileImageUrl?: MediaResource | null;
+    bio?: string;
+    languages: string[];
+}
+/**
+ * Sertifikacija zdravstvenog radnika
+ */
+interface PractitionerCertification {
+    level: CertificationLevel;
+    specialties: CertificationSpecialty[];
+    licenseNumber: string;
+    issuingAuthority: string;
+    issueDate: Timestamp | Date;
+    expiryDate?: Timestamp | Date | null;
+    verificationStatus: "pending" | "verified" | "rejected";
+}
+/**
+ * Interfejs za radno vreme zdravstvenog radnika u klinici
+ */
+interface PractitionerClinicWorkingHours {
+    clinicId: string;
+    workingHours: {
+        monday: {
+            start: string;
+            end: string;
+        } | null;
+        tuesday: {
+            start: string;
+            end: string;
+        } | null;
+        wednesday: {
+            start: string;
+            end: string;
+        } | null;
+        thursday: {
+            start: string;
+            end: string;
+        } | null;
+        friday: {
+            start: string;
+            end: string;
+        } | null;
+        saturday: {
+            start: string;
+            end: string;
+        } | null;
+        sunday: {
+            start: string;
+            end: string;
+        } | null;
+    };
+    isActive: boolean;
+    createdAt: Timestamp | Date;
+    updatedAt: Timestamp | Date;
+}
+/**
+ * Status of practitioner profile
+ */
+declare enum PractitionerStatus {
+    DRAFT = "draft",
+    ACTIVE = "active"
+}
+/**
+ * Token status for practitioner invitations
+ */
+declare enum PractitionerTokenStatus {
+    ACTIVE = "active",
+    USED = "used",
+    EXPIRED = "expired",
+    REVOKED = "revoked"
+}
+/**
+ * Interfejs za zdravstvenog radnika
+ */
+interface Practitioner {
+    id: string;
+    userRef: string;
+    basicInfo: PractitionerBasicInfo;
+    fullNameLower: string;
+    certification: PractitionerCertification;
+    clinics: string[];
+    clinicWorkingHours: PractitionerClinicWorkingHours[];
+    clinicsInfo: ClinicInfo[];
+    procedures: string[];
+    freeConsultations?: Record<string, string> | null;
+    proceduresInfo: ProcedureSummaryInfo[];
+    reviewInfo: PractitionerReviewInfo;
+    isActive: boolean;
+    isVerified: boolean;
+    status: PractitionerStatus;
+    createdAt: Timestamp;
+    updatedAt: Timestamp;
+}
+/**
+ * Token za pozivanje zdravstvenog radnika
+ */
+interface PractitionerToken {
+    id: string;
+    token: string;
+    practitionerId: string;
+    email: string;
+    clinicId: string;
+    status: PractitionerTokenStatus;
+    createdBy: string;
+    createdAt: Timestamp;
+    expiresAt: Timestamp;
+    usedBy?: string;
+    usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
+}
+
 /**
  * Enum for all possible clinic tags
  */
@@ -1141,6 +1266,8 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
+    status?: PractitionerStatus;
+    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -1174,131 +1301,6 @@ interface Clinic {
     logo?: MediaResource | null;
 }
 
-/**
- * Osnovne informacije o zdravstvenom radniku
- */
-interface PractitionerBasicInfo {
-    firstName: string;
-    lastName: string;
-    title: string;
-    email: string;
-    phoneNumber: string | null;
-    dateOfBirth: Timestamp | Date | null;
-    gender: "male" | "female" | "other";
-    profileImageUrl?: MediaResource | null;
-    bio?: string;
-    languages: string[];
-}
-/**
- * Sertifikacija zdravstvenog radnika
- */
-interface PractitionerCertification {
-    level: CertificationLevel;
-    specialties: CertificationSpecialty[];
-    licenseNumber: string;
-    issuingAuthority: string;
-    issueDate: Timestamp | Date;
-    expiryDate?: Timestamp | Date | null;
-    verificationStatus: "pending" | "verified" | "rejected";
-}
-/**
- * Interfejs za radno vreme zdravstvenog radnika u klinici
- */
-interface PractitionerClinicWorkingHours {
-    clinicId: string;
-    workingHours: {
-        monday: {
-            start: string;
-            end: string;
-        } | null;
-        tuesday: {
-            start: string;
-            end: string;
-        } | null;
-        wednesday: {
-            start: string;
-            end: string;
-        } | null;
-        thursday: {
-            start: string;
-            end: string;
-        } | null;
-        friday: {
-            start: string;
-            end: string;
-        } | null;
-        saturday: {
-            start: string;
-            end: string;
-        } | null;
-        sunday: {
-            start: string;
-            end: string;
-        } | null;
-    };
-    isActive: boolean;
-    createdAt: Timestamp | Date;
-    updatedAt: Timestamp | Date;
-}
-/**
- * Status of practitioner profile
- */
-declare enum PractitionerStatus {
-    DRAFT = "draft",
-    ACTIVE = "active"
-}
-/**
- * Token status for practitioner invitations
- */
-declare enum PractitionerTokenStatus {
-    ACTIVE = "active",
-    USED = "used",
-    EXPIRED = "expired",
-    REVOKED = "revoked"
-}
-/**
- * Interfejs za zdravstvenog radnika
- */
-interface Practitioner {
-    id: string;
-    userRef: string;
-    basicInfo: PractitionerBasicInfo;
-    fullNameLower: string;
-    certification: PractitionerCertification;
-    clinics: string[];
-    clinicWorkingHours: PractitionerClinicWorkingHours[];
-    clinicsInfo: ClinicInfo[];
-    procedures: string[];
-    freeConsultations?: Record<string, string> | null;
-    proceduresInfo: ProcedureSummaryInfo[];
-    reviewInfo: PractitionerReviewInfo;
-    isActive: boolean;
-    isVerified: boolean;
-    status: PractitionerStatus;
-    createdAt: Timestamp;
-    updatedAt: Timestamp;
-}
-/**
- * Token za pozivanje zdravstvenog radnika
- */
-interface PractitionerToken {
-    id: string;
-    token: string;
-    practitionerId: string;
-    email: string;
-    clinicId: string;
-    status: PractitionerTokenStatus;
-    createdBy: string;
-    createdAt: Timestamp;
-    expiresAt: Timestamp;
-    usedBy?: string;
-    usedAt?: Timestamp;
-    emailSent?: boolean;
-    emailSentAt?: Timestamp;
-    emailError?: string;
-    emailErrorAt?: Timestamp;
-}
-
 declare enum AllergyType {
     MEDICATION = "medication",
     FOOD = "food",

package/dist/admin/index.d.ts

@@ -843,6 +843,131 @@ interface ProcedureSummaryInfo {
     practitionerName: string;
 }
 
+/**
+ * Osnovne informacije o zdravstvenom radniku
+ */
+interface PractitionerBasicInfo {
+    firstName: string;
+    lastName: string;
+    title: string;
+    email: string;
+    phoneNumber: string | null;
+    dateOfBirth: Timestamp | Date | null;
+    gender: "male" | "female" | "other";
+    profileImageUrl?: MediaResource | null;
+    bio?: string;
+    languages: string[];
+}
+/**
+ * Sertifikacija zdravstvenog radnika
+ */
+interface PractitionerCertification {
+    level: CertificationLevel;
+    specialties: CertificationSpecialty[];
+    licenseNumber: string;
+    issuingAuthority: string;
+    issueDate: Timestamp | Date;
+    expiryDate?: Timestamp | Date | null;
+    verificationStatus: "pending" | "verified" | "rejected";
+}
+/**
+ * Interfejs za radno vreme zdravstvenog radnika u klinici
+ */
+interface PractitionerClinicWorkingHours {
+    clinicId: string;
+    workingHours: {
+        monday: {
+            start: string;
+            end: string;
+        } | null;
+        tuesday: {
+            start: string;
+            end: string;
+        } | null;
+        wednesday: {
+            start: string;
+            end: string;
+        } | null;
+        thursday: {
+            start: string;
+            end: string;
+        } | null;
+        friday: {
+            start: string;
+            end: string;
+        } | null;
+        saturday: {
+            start: string;
+            end: string;
+        } | null;
+        sunday: {
+            start: string;
+            end: string;
+        } | null;
+    };
+    isActive: boolean;
+    createdAt: Timestamp | Date;
+    updatedAt: Timestamp | Date;
+}
+/**
+ * Status of practitioner profile
+ */
+declare enum PractitionerStatus {
+    DRAFT = "draft",
+    ACTIVE = "active"
+}
+/**
+ * Token status for practitioner invitations
+ */
+declare enum PractitionerTokenStatus {
+    ACTIVE = "active",
+    USED = "used",
+    EXPIRED = "expired",
+    REVOKED = "revoked"
+}
+/**
+ * Interfejs za zdravstvenog radnika
+ */
+interface Practitioner {
+    id: string;
+    userRef: string;
+    basicInfo: PractitionerBasicInfo;
+    fullNameLower: string;
+    certification: PractitionerCertification;
+    clinics: string[];
+    clinicWorkingHours: PractitionerClinicWorkingHours[];
+    clinicsInfo: ClinicInfo[];
+    procedures: string[];
+    freeConsultations?: Record<string, string> | null;
+    proceduresInfo: ProcedureSummaryInfo[];
+    reviewInfo: PractitionerReviewInfo;
+    isActive: boolean;
+    isVerified: boolean;
+    status: PractitionerStatus;
+    createdAt: Timestamp;
+    updatedAt: Timestamp;
+}
+/**
+ * Token za pozivanje zdravstvenog radnika
+ */
+interface PractitionerToken {
+    id: string;
+    token: string;
+    practitionerId: string;
+    email: string;
+    clinicId: string;
+    status: PractitionerTokenStatus;
+    createdBy: string;
+    createdAt: Timestamp;
+    expiresAt: Timestamp;
+    usedBy?: string;
+    usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
+}
+
 /**
  * Enum for all possible clinic tags
  */
@@ -1141,6 +1266,8 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
+    status?: PractitionerStatus;
+    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -1174,131 +1301,6 @@ interface Clinic {
     logo?: MediaResource | null;
 }
 
-/**
- * Osnovne informacije o zdravstvenom radniku
- */
-interface PractitionerBasicInfo {
-    firstName: string;
-    lastName: string;
-    title: string;
-    email: string;
-    phoneNumber: string | null;
-    dateOfBirth: Timestamp | Date | null;
-    gender: "male" | "female" | "other";
-    profileImageUrl?: MediaResource | null;
-    bio?: string;
-    languages: string[];
-}
-/**
- * Sertifikacija zdravstvenog radnika
- */
-interface PractitionerCertification {
-    level: CertificationLevel;
-    specialties: CertificationSpecialty[];
-    licenseNumber: string;
-    issuingAuthority: string;
-    issueDate: Timestamp | Date;
-    expiryDate?: Timestamp | Date | null;
-    verificationStatus: "pending" | "verified" | "rejected";
-}
-/**
- * Interfejs za radno vreme zdravstvenog radnika u klinici
- */
-interface PractitionerClinicWorkingHours {
-    clinicId: string;
-    workingHours: {
-        monday: {
-            start: string;
-            end: string;
-        } | null;
-        tuesday: {
-            start: string;
-            end: string;
-        } | null;
-        wednesday: {
-            start: string;
-            end: string;
-        } | null;
-        thursday: {
-            start: string;
-            end: string;
-        } | null;
-        friday: {
-            start: string;
-            end: string;
-        } | null;
-        saturday: {
-            start: string;
-            end: string;
-        } | null;
-        sunday: {
-            start: string;
-            end: string;
-        } | null;
-    };
-    isActive: boolean;
-    createdAt: Timestamp | Date;
-    updatedAt: Timestamp | Date;
-}
-/**
- * Status of practitioner profile
- */
-declare enum PractitionerStatus {
-    DRAFT = "draft",
-    ACTIVE = "active"
-}
-/**
- * Token status for practitioner invitations
- */
-declare enum PractitionerTokenStatus {
-    ACTIVE = "active",
-    USED = "used",
-    EXPIRED = "expired",
-    REVOKED = "revoked"
-}
-/**
- * Interfejs za zdravstvenog radnika
- */
-interface Practitioner {
-    id: string;
-    userRef: string;
-    basicInfo: PractitionerBasicInfo;
-    fullNameLower: string;
-    certification: PractitionerCertification;
-    clinics: string[];
-    clinicWorkingHours: PractitionerClinicWorkingHours[];
-    clinicsInfo: ClinicInfo[];
-    procedures: string[];
-    freeConsultations?: Record<string, string> | null;
-    proceduresInfo: ProcedureSummaryInfo[];
-    reviewInfo: PractitionerReviewInfo;
-    isActive: boolean;
-    isVerified: boolean;
-    status: PractitionerStatus;
-    createdAt: Timestamp;
-    updatedAt: Timestamp;
-}
-/**
- * Token za pozivanje zdravstvenog radnika
- */
-interface PractitionerToken {
-    id: string;
-    token: string;
-    practitionerId: string;
-    email: string;
-    clinicId: string;
-    status: PractitionerTokenStatus;
-    createdBy: string;
-    createdAt: Timestamp;
-    expiresAt: Timestamp;
-    usedBy?: string;
-    usedAt?: Timestamp;
-    emailSent?: boolean;
-    emailSentAt?: Timestamp;
-    emailError?: string;
-    emailErrorAt?: Timestamp;
-}
-
 declare enum AllergyType {
     MEDICATION = "medication",
     FOOD = "food",

package/dist/backoffice/index.d.mts

@@ -1307,29 +1307,6 @@ interface ProcedureSummaryInfo {
     practitionerName: string;
 }
 
-/**
- * Interface for clinic contact information
- */
-interface ClinicContactInfo {
-    email: string;
-    phoneNumber: string;
-    alternativePhoneNumber?: string | null;
-    website?: string | null;
-}
-/**
- * Interface for clinic location
- */
-interface ClinicLocation {
-    address: string;
-    city: string;
-    country: string;
-    postalCode: string;
-    latitude: number;
-    longitude: number;
-    geohash?: string | null;
-    tz?: string | null;
-}
-
 /**
  * Osnovne informacije o zdravstvenom radniku
  */
@@ -1426,6 +1403,29 @@ interface Practitioner {
     updatedAt: Timestamp;
 }
 
+/**
+ * Interface for clinic contact information
+ */
+interface ClinicContactInfo {
+    email: string;
+    phoneNumber: string;
+    alternativePhoneNumber?: string | null;
+    website?: string | null;
+}
+/**
+ * Interface for clinic location
+ */
+interface ClinicLocation {
+    address: string;
+    city: string;
+    country: string;
+    postalCode: string;
+    latitude: number;
+    longitude: number;
+    geohash?: string | null;
+    tz?: string | null;
+}
+
 /**
  * Interface for clinic profile information
  */

package/dist/backoffice/index.d.ts

@@ -1307,29 +1307,6 @@ interface ProcedureSummaryInfo {
     practitionerName: string;
 }
 
-/**
- * Interface for clinic contact information
- */
-interface ClinicContactInfo {
-    email: string;
-    phoneNumber: string;
-    alternativePhoneNumber?: string | null;
-    website?: string | null;
-}
-/**
- * Interface for clinic location
- */
-interface ClinicLocation {
-    address: string;
-    city: string;
-    country: string;
-    postalCode: string;
-    latitude: number;
-    longitude: number;
-    geohash?: string | null;
-    tz?: string | null;
-}
-
 /**
  * Osnovne informacije o zdravstvenom radniku
  */
@@ -1426,6 +1403,29 @@ interface Practitioner {
     updatedAt: Timestamp;
 }
 
+/**
+ * Interface for clinic contact information
+ */
+interface ClinicContactInfo {
+    email: string;
+    phoneNumber: string;
+    alternativePhoneNumber?: string | null;
+    website?: string | null;
+}
+/**
+ * Interface for clinic location
+ */
+interface ClinicLocation {
+    address: string;
+    city: string;
+    country: string;
+    postalCode: string;
+    latitude: number;
+    longitude: number;
+    geohash?: string | null;
+    tz?: string | null;
+}
+
 /**
  * Interface for clinic profile information
  */

package/dist/index.d.mts

@@ -5300,6 +5300,8 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
+    status?: PractitionerStatus;
+    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -6697,9 +6699,17 @@ declare class ProcedureService extends BaseService {
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, categoryService: CategoryService, subcategoryService: SubcategoryService, technologyService: TechnologyService, productService: ProductService, mediaService: MediaService);
     setPractitionerService(practitionerService: PractitionerService): void;
     /**
-     * Filters out procedures from draft practitioners
+     * Filters out procedures that should not be visible to patients:
+     * 1. Procedures with no practitioner (missing practitionerId)
+     * 2. Procedures where practitioner doesn't exist
+     * 3. Procedures from draft practitioners
+     * 4. Procedures from inactive practitioners (isActive === false)
+     *
+     * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+     * the procedure is filtered out.
+     *
      * @param procedures - Array of procedures to filter
-     * @returns Filtered array of procedures (excluding those from draft practitioners)
+     * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
      */
     private filterDraftPractitionerProcedures;
     /**

package/dist/index.d.ts

@@ -5300,6 +5300,8 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
+    status?: PractitionerStatus;
+    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -6697,9 +6699,17 @@ declare class ProcedureService extends BaseService {
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, categoryService: CategoryService, subcategoryService: SubcategoryService, technologyService: TechnologyService, productService: ProductService, mediaService: MediaService);
     setPractitionerService(practitionerService: PractitionerService): void;
     /**
-     * Filters out procedures from draft practitioners
+     * Filters out procedures that should not be visible to patients:
+     * 1. Procedures with no practitioner (missing practitionerId)
+     * 2. Procedures where practitioner doesn't exist
+     * 3. Procedures from draft practitioners
+     * 4. Procedures from inactive practitioners (isActive === false)
+     *
+     * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+     * the procedure is filtered out.
+     *
      * @param procedures - Array of procedures to filter
-     * @returns Filtered array of procedures (excluding those from draft practitioners)
+     * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
      */
     private filterDraftPractitionerProcedures;
     /**

package/dist/index.js

@@ -20022,44 +20022,82 @@ var ProcedureService = class extends BaseService {
     this.practitionerService = practitionerService;
   }
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
     if (!this.practitionerService || procedures.length === 0) {
       return procedures;
     }
     try {
+      const proceduresWithPractitioner = procedures.filter(
+        (p) => p.practitionerId && p.practitionerId.trim() !== ""
+      );
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
       const practitionerPromises = practitionerIds.map(
         (id) => this.practitionerService.getPractitioner(id).catch(() => null)
       );
       const practitioners = await Promise.all(practitionerPromises);
-      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      const practitionerMap = /* @__PURE__ */ new Map();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== "draft" /* DRAFT */;
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+        if (practitioner.status === "draft" /* DRAFT */) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+        return true;
       });
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ${noPractitionerCount} with no practitionerId, ${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
       return filteredProcedures;
     } catch (error) {
       console.error(
-        "[ProcedureService] Error filtering draft practitioner procedures:",
+        "[ProcedureService] Error filtering practitioner procedures:",
         error
       );
       return procedures;
@@ -20233,7 +20271,11 @@ var ProcedureService = class extends BaseService {
       photo: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : "",
       // Default to empty string if not a processed URL
       rating: ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0,
-      services: practitioner.procedures || []
+      services: practitioner.procedures || [],
+      status: practitioner.status,
+      // Include practitioner status for client-side filtering
+      isActive: practitioner.isActive
+      // Include isActive flag for client-side filtering
     };
     const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
     const newProcedure = {
@@ -20392,7 +20434,9 @@ var ProcedureService = class extends BaseService {
       description: practitioner.basicInfo.bio || "",
       photo: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : "",
       rating: ((_c = practitioner.reviewInfo) == null ? void 0 : _c.averageRating) || 0,
-      services: practitioner.procedures || []
+      services: practitioner.procedures || [],
+      status: practitioner.status,
+      isActive: practitioner.isActive
     };
     const newProcedure = {
       ...sourceProcedure,
@@ -20769,7 +20813,8 @@ var ProcedureService = class extends BaseService {
       (0, import_firestore58.where)("isActive", "==", true)
     );
     const snapshot = await (0, import_firestore58.getDocs)(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
   /**
    * Gets all procedures for a practitioner
@@ -20888,7 +20933,9 @@ var ProcedureService = class extends BaseService {
         photo: typeof newPractitioner.basicInfo.profileImageUrl === "string" ? newPractitioner.basicInfo.profileImageUrl : "",
         // Default to empty string if not a processed URL
         rating: ((_b = newPractitioner.reviewInfo) == null ? void 0 : _b.averageRating) || 0,
-        services: newPractitioner.procedures || []
+        services: newPractitioner.procedures || [],
+        status: newPractitioner.status,
+        isActive: newPractitioner.isActive
       };
     }
     if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
@@ -21172,6 +21219,7 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {

package/dist/index.mjs

@@ -20258,44 +20258,82 @@ var ProcedureService = class extends BaseService {
     this.practitionerService = practitionerService;
   }
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
     if (!this.practitionerService || procedures.length === 0) {
       return procedures;
     }
     try {
+      const proceduresWithPractitioner = procedures.filter(
+        (p) => p.practitionerId && p.practitionerId.trim() !== ""
+      );
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
       const practitionerPromises = practitionerIds.map(
         (id) => this.practitionerService.getPractitioner(id).catch(() => null)
       );
       const practitioners = await Promise.all(practitionerPromises);
-      const practitionerStatusMap = /* @__PURE__ */ new Map();
+      const practitionerMap = /* @__PURE__ */ new Map();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== "draft" /* DRAFT */;
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+        if (practitioner.status === "draft" /* DRAFT */) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+        return true;
       });
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${procedures.length - filteredProcedures.length} procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ${noPractitionerCount} with no practitionerId, ${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
       return filteredProcedures;
     } catch (error) {
       console.error(
-        "[ProcedureService] Error filtering draft practitioner procedures:",
+        "[ProcedureService] Error filtering practitioner procedures:",
         error
       );
       return procedures;
@@ -20469,7 +20507,11 @@ var ProcedureService = class extends BaseService {
       photo: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : "",
       // Default to empty string if not a processed URL
       rating: ((_a = practitioner.reviewInfo) == null ? void 0 : _a.averageRating) || 0,
-      services: practitioner.procedures || []
+      services: practitioner.procedures || [],
+      status: practitioner.status,
+      // Include practitioner status for client-side filtering
+      isActive: practitioner.isActive
+      // Include isActive flag for client-side filtering
     };
     const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
     const newProcedure = {
@@ -20628,7 +20670,9 @@ var ProcedureService = class extends BaseService {
       description: practitioner.basicInfo.bio || "",
       photo: typeof practitioner.basicInfo.profileImageUrl === "string" ? practitioner.basicInfo.profileImageUrl : "",
       rating: ((_c = practitioner.reviewInfo) == null ? void 0 : _c.averageRating) || 0,
-      services: practitioner.procedures || []
+      services: practitioner.procedures || [],
+      status: practitioner.status,
+      isActive: practitioner.isActive
     };
     const newProcedure = {
       ...sourceProcedure,
@@ -21005,7 +21049,8 @@ var ProcedureService = class extends BaseService {
       where33("isActive", "==", true)
     );
     const snapshot = await getDocs33(q);
-    return snapshot.docs.map((doc47) => doc47.data());
+    const procedures = snapshot.docs.map((doc47) => doc47.data());
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
   /**
    * Gets all procedures for a practitioner
@@ -21124,7 +21169,9 @@ var ProcedureService = class extends BaseService {
         photo: typeof newPractitioner.basicInfo.profileImageUrl === "string" ? newPractitioner.basicInfo.profileImageUrl : "",
         // Default to empty string if not a processed URL
         rating: ((_b = newPractitioner.reviewInfo) == null ? void 0 : _b.averageRating) || 0,
-        services: newPractitioner.procedures || []
+        services: newPractitioner.procedures || [],
+        status: newPractitioner.status,
+        isActive: newPractitioner.isActive
       };
     }
     if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
@@ -21408,6 +21455,7 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {

package/package.json

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

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

@@ -90,9 +90,17 @@ export class ProcedureService extends BaseService {
   }
 
   /**
-   * Filters out procedures from draft practitioners
+   * Filters out procedures that should not be visible to patients:
+   * 1. Procedures with no practitioner (missing practitionerId)
+   * 2. Procedures where practitioner doesn't exist
+   * 3. Procedures from draft practitioners
+   * 4. Procedures from inactive practitioners (isActive === false)
+   * 
+   * Note: Each procedure has ONE practitionerId. If that practitioner is inactive/draft/missing,
+   * the procedure is filtered out.
+   * 
    * @param procedures - Array of procedures to filter
-   * @returns Filtered array of procedures (excluding those from draft practitioners)
+   * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   private async filterDraftPractitionerProcedures(
     procedures: Procedure[]
@@ -102,13 +110,25 @@ export class ProcedureService extends BaseService {
     }
 
     try {
+      // First, filter out procedures with no practitionerId
+      const proceduresWithPractitioner = procedures.filter((p) => 
+        p.practitionerId && p.practitionerId.trim() !== ''
+      );
+
+      if (proceduresWithPractitioner.length === 0) {
+        console.log(
+          `[ProcedureService] All ${procedures.length} procedures have no practitionerId - filtering out`
+        );
+        return [];
+      }
+
       // Get unique practitioner IDs from procedures
       const practitionerIds = Array.from(
-        new Set(procedures.map((p) => p.practitionerId).filter(Boolean))
+        new Set(proceduresWithPractitioner.map((p) => p.practitionerId).filter(Boolean))
       );
 
       if (practitionerIds.length === 0) {
-        return procedures;
+        return [];
       }
 
       // Fetch all practitioners in parallel
@@ -117,32 +137,64 @@ export class ProcedureService extends BaseService {
       );
       const practitioners = await Promise.all(practitionerPromises);
 
-      // Create a map of practitioner ID to status
-      const practitionerStatusMap = new Map<string, PractitionerStatus>();
+      // Create a map of practitioner ID to practitioner data
+      const practitionerMap = new Map<string, Practitioner>();
       practitioners.forEach((practitioner, index) => {
         if (practitioner) {
-          practitionerStatusMap.set(practitionerIds[index], practitioner.status);
+          practitionerMap.set(practitionerIds[index], practitioner);
         }
       });
 
-      // Filter out procedures from draft practitioners
-      const filteredProcedures = procedures.filter((procedure) => {
-        const practitionerStatus = practitionerStatusMap.get(procedure.practitionerId);
-        return practitionerStatus !== PractitionerStatus.DRAFT;
+      // Filter out procedures that:
+      // 1. Have no practitionerId (already filtered above, but double-check)
+      // 2. Have a practitioner that doesn't exist
+      // 3. Have a practitioner with DRAFT status
+      // 4. Have a practitioner that is not active (isActive === false)
+      const filteredProcedures = proceduresWithPractitioner.filter((procedure) => {
+        // Check if practitioner exists
+        const practitioner = practitionerMap.get(procedure.practitionerId);
+        
+        if (!practitioner) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} not found`
+          );
+          return false;
+        }
+
+        // Check if practitioner is DRAFT
+        if (practitioner.status === PractitionerStatus.DRAFT) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is DRAFT`
+          );
+          return false;
+        }
+
+        // Check if practitioner is active (must be true to show procedure)
+        if (!practitioner.isActive) {
+          console.log(
+            `[ProcedureService] Filtering out procedure ${procedure.id} - practitioner ${procedure.practitionerId} is not active`
+          );
+          return false;
+        }
+
+        return true;
       });
 
-      if (filteredProcedures.length !== procedures.length) {
+      const filteredCount = procedures.length - filteredProcedures.length;
+      if (filteredCount > 0) {
+        const noPractitionerCount = procedures.length - proceduresWithPractitioner.length;
+        const invalidPractitionerCount = proceduresWithPractitioner.length - filteredProcedures.length;
         console.log(
-          `[ProcedureService] Filtered out ${
-            procedures.length - filteredProcedures.length
-          } procedures from draft practitioners`
+          `[ProcedureService] Filtered out ${filteredCount} procedures: ` +
+          `${noPractitionerCount} with no practitionerId, ` +
+          `${invalidPractitionerCount} with missing/draft/inactive practitioners`
         );
       }
 
       return filteredProcedures;
     } catch (error) {
       console.error(
-        '[ProcedureService] Error filtering draft practitioner procedures:',
+        '[ProcedureService] Error filtering practitioner procedures:',
         error
       );
       // On error, return original procedures to avoid breaking functionality
@@ -387,6 +439,8 @@ export class ProcedureService extends BaseService {
           : '', // Default to empty string if not a processed URL
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
+      status: practitioner.status, // Include practitioner status for client-side filtering
+      isActive: practitioner.isActive, // Include isActive flag for client-side filtering
     };
 
     // Create the procedure object
@@ -576,6 +630,8 @@ export class ProcedureService extends BaseService {
           : '',
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
+      status: practitioner.status,
+      isActive: practitioner.isActive,
     };
 
     // Construct the new procedure object
@@ -1062,7 +1118,10 @@ export class ProcedureService extends BaseService {
       where('isActive', '==', true),
     );
     const snapshot = await getDocs(q);
-    return snapshot.docs.map(doc => doc.data() as Procedure);
+    const procedures = snapshot.docs.map(doc => doc.data() as Procedure);
+    
+    // Filter out procedures from draft practitioners
+    return await this.filterDraftPractitionerProcedures(procedures);
   }
 
   /**
@@ -1210,6 +1269,8 @@ export class ProcedureService extends BaseService {
             : '', // Default to empty string if not a processed URL
         rating: newPractitioner.reviewInfo?.averageRating || 0,
         services: newPractitioner.procedures || [],
+        status: newPractitioner.status,
+        isActive: newPractitioner.isActive,
       };
     }
 
@@ -1591,6 +1652,9 @@ export class ProcedureService extends BaseService {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
           
+          // Filter out procedures from draft practitioners
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          
           const lastDoc =
             querySnapshot.docs.length > 0
               ? querySnapshot.docs[querySnapshot.docs.length - 1]

package/src/types/clinic/index.ts

@@ -3,6 +3,7 @@ import { Timestamp, FieldValue } from 'firebase/firestore';
 import type { ClinicInfo } from '../profile';
 import { ClinicReviewInfo } from '../reviews';
 import { ProcedureSummaryInfo } from '../procedure';
+import { PractitionerStatus } from '../practitioner';
 
 export const CLINIC_GROUPS_COLLECTION = 'clinic_groups';
 export const CLINIC_ADMINS_COLLECTION = 'clinic_admins';
@@ -351,6 +352,8 @@ export interface DoctorInfo {
   photo: string | null;
   rating: number;
   services: string[]; // Used for search and filtering
+  status?: PractitionerStatus; // Practitioner status (DRAFT, ACTIVE, etc.)
+  isActive?: boolean; // Whether practitioner is active
   // TODO: Add aggregated fields, like rating, reviews, services this doctor provides in this clinic and similar
 }