@blackcode_sa/metaestetics-api 1.13.13 → 1.13.15

package/dist/admin/index.d.mts

@@ -843,131 +843,6 @@ 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
  */
@@ -1266,8 +1141,6 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
-    status?: PractitionerStatus;
-    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -1301,6 +1174,131 @@ 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,131 +843,6 @@ 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
  */
@@ -1266,8 +1141,6 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
-    status?: PractitionerStatus;
-    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -1301,6 +1174,131 @@ 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,6 +1307,29 @@ 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
  */
@@ -1403,29 +1426,6 @@ 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,6 +1307,29 @@ 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
  */
@@ -1403,29 +1426,6 @@ 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,8 +5300,6 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
-    status?: PractitionerStatus;
-    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -6897,6 +6895,7 @@ declare class ProcedureService extends BaseService {
         isActive?: boolean;
         practitionerId?: string;
         clinicId?: string;
+        excludeDraftPractitioners?: boolean;
     }): Promise<{
         procedures: (Procedure & {
             distance?: number;

package/dist/index.d.ts

@@ -5300,8 +5300,6 @@ interface DoctorInfo {
     photo: string | null;
     rating: number;
     services: string[];
-    status?: PractitionerStatus;
-    isActive?: boolean;
 }
 /**
  * Interface for clinic
@@ -6897,6 +6895,7 @@ declare class ProcedureService extends BaseService {
         isActive?: boolean;
         practitionerId?: string;
         clinicId?: string;
+        excludeDraftPractitioners?: boolean;
     }): Promise<{
         procedures: (Procedure & {
             distance?: number;

package/dist/index.js

@@ -13532,25 +13532,17 @@ var import_geofire_common4 = require("geofire-common");
 var import_zod20 = require("zod");
 function filterDoctorsInfo(doctorsInfo) {
   if (!doctorsInfo || doctorsInfo.length === 0) {
-    return [];
+    return doctorsInfo || [];
   }
-  return doctorsInfo.filter((doctor) => {
-    if (doctor.status === "draft" /* DRAFT */) {
-      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-    if (doctor.isActive === false) {
-      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-    return true;
-  });
+  return doctorsInfo;
 }
 function filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners = false) {
   if (!clinic) {
     return clinic;
   }
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
   if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
     return clinic;
   }
   const filteredClinic = { ...clinic };
@@ -14046,6 +14038,7 @@ async function getClinicsByFilters(db, filters) {
         }
         let clinics = Array.from(uniqueMap.values());
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const pageSize = filters.pagination || 5;
@@ -14101,6 +14094,7 @@ async function getClinicsByFilters(db, filters) {
         const querySnapshot = await (0, import_firestore38.getDocs)(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -14135,6 +14129,7 @@ async function getClinicsByFilters(db, filters) {
         const querySnapshot = await (0, import_firestore38.getDocs)(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -20086,7 +20081,11 @@ var ProcedureService = class extends BaseService {
    * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn("[ProcedureService] practitionerService not available - skipping filtering");
+      }
       return procedures;
     }
     try {
@@ -20322,11 +20321,7 @@ 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 || [],
-      status: practitioner.status,
-      // Include practitioner status for client-side filtering
-      isActive: practitioner.isActive
-      // Include isActive flag for client-side filtering
+      services: practitioner.procedures || []
     };
     const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
     const newProcedure = {
@@ -20485,9 +20480,7 @@ 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 || [],
-      status: practitioner.status,
-      isActive: practitioner.isActive
+      services: practitioner.procedures || []
     };
     const newProcedure = {
       ...sourceProcedure,
@@ -20984,9 +20977,7 @@ 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 || [],
-        status: newPractitioner.status,
-        isActive: newPractitioner.isActive
+        services: newPractitioner.procedures || []
       };
     }
     if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
@@ -21181,6 +21172,7 @@ var ProcedureService = class extends BaseService {
   async getProceduresByFilters(filters) {
     try {
       console.log("[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies");
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners);
       if (filters.location && filters.radiusInKm) {
         console.log("[PROCEDURE_SERVICE] Executing geo query:", {
           location: filters.location,
@@ -21270,10 +21262,12 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            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)) {
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
           return { procedures, lastDoc };
@@ -21311,7 +21305,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21392,7 +21388,9 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21424,7 +21422,9 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures`);
         if (procedures.length < (filters.pagination || 10)) {

package/dist/index.mjs

@@ -13606,25 +13606,17 @@ import {
 import { z as z20 } from "zod";
 function filterDoctorsInfo(doctorsInfo) {
   if (!doctorsInfo || doctorsInfo.length === 0) {
-    return [];
+    return doctorsInfo || [];
   }
-  return doctorsInfo.filter((doctor) => {
-    if (doctor.status === "draft" /* DRAFT */) {
-      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-    if (doctor.isActive === false) {
-      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-    return true;
-  });
+  return doctorsInfo;
 }
 function filterClinicEmbeddedArrays(clinic, excludeDraftPractitioners = false) {
   if (!clinic) {
     return clinic;
   }
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
   if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
     return clinic;
   }
   const filteredClinic = { ...clinic };
@@ -14133,6 +14125,7 @@ async function getClinicsByFilters(db, filters) {
         }
         let clinics = Array.from(uniqueMap.values());
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const pageSize = filters.pagination || 5;
@@ -14188,6 +14181,7 @@ async function getClinicsByFilters(db, filters) {
         const querySnapshot = await getDocs19(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -14222,6 +14216,7 @@ async function getClinicsByFilters(db, filters) {
         const querySnapshot = await getDocs19(q);
         let clinics = querySnapshot.docs.map((doc47) => ({ ...doc47.data(), id: doc47.id }));
         const excludeDrafts = filters.excludeDraftPractitioners === true;
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map((clinic) => filterClinicEmbeddedArrays(clinic, excludeDrafts));
         clinics = applyInMemoryFilters(clinics, filters);
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
@@ -20322,7 +20317,11 @@ var ProcedureService = class extends BaseService {
    * @returns Filtered array of procedures (excluding invalid/inactive/draft practitioners)
    */
   async filterDraftPractitionerProcedures(procedures) {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn("[ProcedureService] practitionerService not available - skipping filtering");
+      }
       return procedures;
     }
     try {
@@ -20558,11 +20557,7 @@ 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 || [],
-      status: practitioner.status,
-      // Include practitioner status for client-side filtering
-      isActive: practitioner.isActive
-      // Include isActive flag for client-side filtering
+      services: practitioner.procedures || []
     };
     const { productsMetadata: _, productId: __, photos: ___, ...validatedDataWithoutProductsMetadata } = validatedData;
     const newProcedure = {
@@ -20721,9 +20716,7 @@ 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 || [],
-      status: practitioner.status,
-      isActive: practitioner.isActive
+      services: practitioner.procedures || []
     };
     const newProcedure = {
       ...sourceProcedure,
@@ -21220,9 +21213,7 @@ 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 || [],
-        status: newPractitioner.status,
-        isActive: newPractitioner.isActive
+        services: newPractitioner.procedures || []
       };
     }
     if (validatedData.clinicBranchId && validatedData.clinicBranchId !== oldClinicId) {
@@ -21417,6 +21408,7 @@ var ProcedureService = class extends BaseService {
   async getProceduresByFilters(filters) {
     try {
       console.log("[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies");
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners);
       if (filters.location && filters.radiusInKm) {
         console.log("[PROCEDURE_SERVICE] Executing geo query:", {
           location: filters.location,
@@ -21506,10 +21498,12 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            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)) {
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
           return { procedures, lastDoc };
@@ -21547,7 +21541,9 @@ var ProcedureService = class extends BaseService {
           if (hasNestedFilters) {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
           if (procedures.length < (filters.pagination || 10)) {
@@ -21628,7 +21624,9 @@ var ProcedureService = class extends BaseService {
           }
         });
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
           procedureCount: procedures.length
         });
@@ -21660,7 +21658,9 @@ var ProcedureService = class extends BaseService {
           (doc47) => ({ ...doc47.data(), id: doc47.id })
         );
         procedures = this.applyInMemoryFilters(procedures, filters);
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if (filters.excludeDraftPractitioners) {
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         console.log(`[PROCEDURE_SERVICE] Strategy 4 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.13",
+  "version": "1.13.15",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/services/clinic/utils/clinic.utils.ts

@@ -26,7 +26,6 @@ import {
   ClinicLocation,
   DoctorInfo,
 } from "../../../types/clinic";
-import { PractitionerStatus } from "../../../types/practitioner";
 import {
   geohashForLocation,
   distanceBetween,
@@ -388,30 +387,19 @@ export async function createClinic(
  */
 /**
  * Filters out draft/inactive practitioners from doctorsInfo array
+ * Note: Since doctorInfo no longer contains status/isActive fields,
+ * filtering is handled at the procedure level by ProcedureService.
+ * This function now returns all doctors as-is.
  * @param doctorsInfo Array of doctor info objects
- * @returns Filtered array excluding draft or inactive practitioners
+ * @returns Array of doctor info objects (no filtering applied)
  */
 function filterDoctorsInfo(doctorsInfo: DoctorInfo[]): DoctorInfo[] {
   if (!doctorsInfo || doctorsInfo.length === 0) {
-    return [];
+    return doctorsInfo || [];
   }
 
-  return doctorsInfo.filter((doctor) => {
-    // Filter out if status is DRAFT
-    if (doctor.status === PractitionerStatus.DRAFT) {
-      console.log(`[CLINIC_UTILS] Filtering out draft practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-
-    // Filter out if isActive is explicitly false
-    if (doctor.isActive === false) {
-      console.log(`[CLINIC_UTILS] Filtering out inactive practitioner ${doctor.id} from doctorsInfo`);
-      return false;
-    }
-
-    // Include if status is ACTIVE or undefined (backward compatibility) and isActive is true or undefined
-    return true;
-  });
+  // Return all doctors - filtering is handled at procedure level
+  return doctorsInfo;
 }
 
 /**
@@ -425,8 +413,11 @@ export function filterClinicEmbeddedArrays(clinic: Clinic, excludeDraftPractitio
     return clinic;
   }
 
+  console.log(`[CLINIC_UTILS] filterClinicEmbeddedArrays called for clinic ${clinic.id} with excludeDraftPractitioners: ${excludeDraftPractitioners}`);
+
   // If excluding drafts is disabled (default), return clinic as-is (for admin views)
   if (!excludeDraftPractitioners) {
+    console.log(`[CLINIC_UTILS] Skipping filtering for clinic ${clinic.id} (excludeDraftPractitioners is false)`);
     return clinic;
   }
 

package/src/services/clinic/utils/filter.utils.ts

@@ -98,6 +98,7 @@ export async function getClinicsByFilters(
 
         // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
         const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
 
         // Apply all remaining filters and compute exact distance + sorting
@@ -170,6 +171,7 @@ export async function getClinicsByFilters(
 
         // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
         const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
 
         // Apply in-memory filters
@@ -217,6 +219,7 @@ export async function getClinicsByFilters(
 
         // Filter embedded arrays (draft/inactive practitioners) only if explicitly requested
         const excludeDrafts = filters.excludeDraftPractitioners === true; // Default to false (show all)
+        console.log(`[CLINIC_SERVICE] getClinicsByFilters - excludeDraftPractitioners from filters: ${filters.excludeDraftPractitioners}, resolved to: ${excludeDrafts}`);
         clinics = clinics.map(clinic => filterClinicEmbeddedArrays(clinic, excludeDrafts));
 
         // Apply in-memory filters

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

@@ -105,7 +105,11 @@ export class ProcedureService extends BaseService {
   private async filterDraftPractitionerProcedures(
     procedures: Procedure[]
   ): Promise<Procedure[]> {
+    console.log(`[ProcedureService] filterDraftPractitionerProcedures called with ${procedures.length} procedures, practitionerService available: ${!!this.practitionerService}`);
     if (!this.practitionerService || procedures.length === 0) {
+      if (!this.practitionerService) {
+        console.warn('[ProcedureService] practitionerService not available - skipping filtering');
+      }
       return procedures;
     }
 
@@ -439,8 +443,6 @@ 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
@@ -630,8 +632,6 @@ export class ProcedureService extends BaseService {
           : '',
       rating: practitioner.reviewInfo?.averageRating || 0,
       services: practitioner.procedures || [],
-      status: practitioner.status,
-      isActive: practitioner.isActive,
     };
 
     // Construct the new procedure object
@@ -1269,8 +1269,6 @@ 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,
       };
     }
 
@@ -1533,12 +1531,14 @@ export class ProcedureService extends BaseService {
     isActive?: boolean;
     practitionerId?: string;
     clinicId?: string;
+    excludeDraftPractitioners?: boolean;
   }): Promise<{
     procedures: (Procedure & { distance?: number })[];
     lastDoc: any;
   }> {
     try {
       console.log('[PROCEDURE_SERVICE] Starting procedure filtering with multiple strategies');
+      console.log("excludeDraftPractitioners is : ", filters.excludeDraftPractitioners)
 
       // Geo query debug i validacija
       if (filters.location && filters.radiusInKm) {
@@ -1652,8 +1652,10 @@ export class ProcedureService extends BaseService {
             procedures = this.applyInMemoryFilters(procedures, filters);
           }
           
-          // Filter out procedures from draft practitioners
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          // Filter out procedures from draft practitioners if requested
+          if (filters.excludeDraftPractitioners) {
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           
           const lastDoc =
             querySnapshot.docs.length > 0
@@ -1663,7 +1665,7 @@ export class ProcedureService extends BaseService {
           console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
 
           // Fix Load More - ako je broj rezultata manji od pagination, nema više
-          if (procedures.length < (filters.pagination || 10)) {
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
           return { procedures, lastDoc };
@@ -1713,7 +1715,9 @@ export class ProcedureService extends BaseService {
           }
           
           // Filter out procedures from draft practitioners
-          procedures = await this.filterDraftPractitionerProcedures(procedures);
+          if(filters.excludeDraftPractitioners){
+            procedures = await this.filterDraftPractitionerProcedures(procedures);
+          }
           
           const lastDoc =
             querySnapshot.docs.length > 0
@@ -1826,7 +1830,9 @@ export class ProcedureService extends BaseService {
         procedures = this.applyInMemoryFilters(procedures, filters);
         
         // Filter out procedures from draft practitioners
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
         
         console.log('[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):', {
           procedureCount: procedures.length,
@@ -1870,7 +1876,9 @@ export class ProcedureService extends BaseService {
         procedures = this.applyInMemoryFilters(procedures, filters);
         
         // Filter out procedures from draft practitioners
-        procedures = await this.filterDraftPractitionerProcedures(procedures);
+        if(filters.excludeDraftPractitioners){
+          procedures = await this.filterDraftPractitionerProcedures(procedures);
+        }
 
         const lastDoc =
           querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;

package/src/types/clinic/index.ts

@@ -3,7 +3,6 @@ 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';
@@ -352,8 +351,6 @@ 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
 }