@blackcode_sa/metaestetics-api 1.13.14 → 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

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

package/dist/index.js

@@ -13532,19 +13532,9 @@ 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) {
@@ -20331,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 = {
@@ -20494,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,
@@ -20993,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) {
@@ -21285,7 +21267,7 @@ var ProcedureService = class extends BaseService {
           }
           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 };

package/dist/index.mjs

@@ -13606,19 +13606,9 @@ 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) {
@@ -20567,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 = {
@@ -20730,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,
@@ -21229,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) {
@@ -21521,7 +21503,7 @@ var ProcedureService = class extends BaseService {
           }
           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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.13.14",
+  "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;
 }
 
 /**

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

@@ -443,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
@@ -634,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
@@ -1273,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,
       };
     }
 
@@ -1671,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 };

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
 }