@blackcode_sa/metaestetics-api 1.13.15 → 1.13.16

package/dist/index.js

@@ -21125,7 +21125,6 @@ var ProcedureService = class extends BaseService {
         proceduresQuery = (0, import_firestore58.query)(proceduresCollection, (0, import_firestore58.orderBy)("name"));
       }
       const proceduresSnapshot = await (0, import_firestore58.getDocs)(proceduresQuery);
-      const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
       let procedures = proceduresSnapshot.docs.map((doc47) => {
         const data = doc47.data();
         return {
@@ -21137,9 +21136,10 @@ var ProcedureService = class extends BaseService {
       if (excludeDraftPractitioners) {
         procedures = await this.filterDraftPractitionerProcedures(procedures);
       }
+      const lastDocForPagination = pagination && pagination > 0 && proceduresSnapshot.docs.length < pagination ? null : proceduresSnapshot.docs.length > 0 ? proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1] : null;
       return {
         procedures,
-        lastDoc: lastVisible
+        lastDoc: lastDocForPagination
       };
     } catch (error) {
       console.error("[PROCEDURE_SERVICE] Error getting all procedures:", error);
@@ -21265,11 +21265,11 @@ var ProcedureService = class extends BaseService {
           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`);
+          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           return { procedures, lastDoc };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 1 failed:", error);
@@ -21308,11 +21308,11 @@ var ProcedureService = class extends BaseService {
           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)) {
+          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           return { procedures, lastDoc };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 2 failed:", error);
@@ -21392,13 +21392,14 @@ var ProcedureService = class extends BaseService {
           procedures = await this.filterDraftPractitionerProcedures(procedures);
         }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
-          procedureCount: procedures.length
+          procedureCount: procedures.length,
+          queryDocCount: querySnapshot.docs.length
         });
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures`);
-        if (procedures.length < (filters.pagination || 10)) {
+        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         return { procedures, lastDoc };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 3 failed:", error);
@@ -21425,11 +21426,11 @@ var ProcedureService = class extends BaseService {
         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)) {
+        console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         return { procedures, lastDoc };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 4 failed:", error);

package/dist/index.mjs

@@ -21361,7 +21361,6 @@ var ProcedureService = class extends BaseService {
         proceduresQuery = query33(proceduresCollection, orderBy18("name"));
       }
       const proceduresSnapshot = await getDocs33(proceduresQuery);
-      const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
       let procedures = proceduresSnapshot.docs.map((doc47) => {
         const data = doc47.data();
         return {
@@ -21373,9 +21372,10 @@ var ProcedureService = class extends BaseService {
       if (excludeDraftPractitioners) {
         procedures = await this.filterDraftPractitionerProcedures(procedures);
       }
+      const lastDocForPagination = pagination && pagination > 0 && proceduresSnapshot.docs.length < pagination ? null : proceduresSnapshot.docs.length > 0 ? proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1] : null;
       return {
         procedures,
-        lastDoc: lastVisible
+        lastDoc: lastDocForPagination
       };
     } catch (error) {
       console.error("[PROCEDURE_SERVICE] Error getting all procedures:", error);
@@ -21501,11 +21501,11 @@ var ProcedureService = class extends BaseService {
           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`);
+          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           return { procedures, lastDoc };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 1 failed:", error);
@@ -21544,11 +21544,11 @@ var ProcedureService = class extends BaseService {
           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)) {
+          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
+          const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
           return { procedures, lastDoc };
         } catch (error) {
           console.log("[PROCEDURE_SERVICE] Strategy 2 failed:", error);
@@ -21628,13 +21628,14 @@ var ProcedureService = class extends BaseService {
           procedures = await this.filterDraftPractitionerProcedures(procedures);
         }
         console.log("[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):", {
-          procedureCount: procedures.length
+          procedureCount: procedures.length,
+          queryDocCount: querySnapshot.docs.length
         });
-        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures`);
-        if (procedures.length < (filters.pagination || 10)) {
+        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         return { procedures, lastDoc };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 3 failed:", error);
@@ -21661,11 +21662,11 @@ var ProcedureService = class extends BaseService {
         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)) {
+        console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        const lastDoc = querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
         return { procedures, lastDoc };
       } catch (error) {
         console.log("[PROCEDURE_SERVICE] Strategy 4 failed:", error);

package/package.json

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

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

@@ -1465,7 +1465,6 @@ export class ProcedureService extends BaseService {
       }
 
       const proceduresSnapshot = await getDocs(proceduresQuery);
-      const lastVisible = proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1];
 
       let procedures = proceduresSnapshot.docs.map(doc => {
         const data = doc.data() as Procedure;
@@ -1480,9 +1479,17 @@ export class ProcedureService extends BaseService {
         procedures = await this.filterDraftPractitionerProcedures(procedures);
       }
 
+      // Fix lastDoc - if we got fewer documents from Firestore than requested, no more pages
+      const lastDocForPagination = 
+        pagination && pagination > 0 && proceduresSnapshot.docs.length < pagination
+          ? null
+          : proceduresSnapshot.docs.length > 0
+          ? proceduresSnapshot.docs[proceduresSnapshot.docs.length - 1]
+          : null;
+
       return {
         procedures,
-        lastDoc: lastVisible,
+        lastDoc: lastDocForPagination,
       };
     } catch (error) {
       console.error('[PROCEDURE_SERVICE] Error getting all procedures:', error);
@@ -1657,17 +1664,20 @@ export class ProcedureService extends BaseService {
             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 (${querySnapshot.docs.length} from query)`);
 
-          console.log(`[PROCEDURE_SERVICE] Strategy 1 success: ${procedures.length} procedures`);
-
-          // Fix Load More - ako je broj rezultata manji od pagination, nema više
+          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
           if (querySnapshot.docs.length < (filters.pagination || 10)) {
             return { procedures, lastDoc: null };
           }
+          
+          // If we filtered out some procedures but got full query results, use last doc for pagination
+          // This allows fetching more pages to get enough filtered results
+          const lastDoc =
+            querySnapshot.docs.length > 0
+              ? querySnapshot.docs[querySnapshot.docs.length - 1]
+              : null;
+          
           return { procedures, lastDoc };
         } catch (error) {
           console.log('[PROCEDURE_SERVICE] Strategy 1 failed:', error);
@@ -1719,17 +1729,19 @@ export class ProcedureService extends BaseService {
             procedures = await this.filterDraftPractitionerProcedures(procedures);
           }
           
+          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
+
+          // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+          if (querySnapshot.docs.length < (filters.pagination || 10)) {
+            return { procedures, lastDoc: null };
+          }
+          
+          // If we filtered out some procedures but got full query results, use last doc for pagination
           const lastDoc =
             querySnapshot.docs.length > 0
               ? querySnapshot.docs[querySnapshot.docs.length - 1]
               : null;
-
-          console.log(`[PROCEDURE_SERVICE] Strategy 2 success: ${procedures.length} procedures`);
-
-          // Fix Load More - ako je broj rezultata manji od pagination, nema više
-          if (procedures.length < (filters.pagination || 10)) {
-            return { procedures, lastDoc: null };
-          }
+          
           return { procedures, lastDoc };
         } catch (error) {
           console.log('[PROCEDURE_SERVICE] Strategy 2 failed:', error);
@@ -1836,16 +1848,20 @@ export class ProcedureService extends BaseService {
         
         console.log('[PROCEDURE_SERVICE] After applyInMemoryFilters (Strategy 3):', {
           procedureCount: procedures.length,
+          queryDocCount: querySnapshot.docs.length,
         });
 
-        const lastDoc =
-          querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
-        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures`);
+        console.log(`[PROCEDURE_SERVICE] Strategy 3 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
 
-        // Fix Load More - ako je broj rezultata manji od pagination, nema više
-        if (procedures.length < (filters.pagination || 10)) {
+        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        
+        // If we filtered out some procedures but got full query results, use last doc for pagination
+        const lastDoc =
+          querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        
         return { procedures, lastDoc };
       } catch (error) {
         console.log('[PROCEDURE_SERVICE] Strategy 3 failed:', error);
@@ -1880,14 +1896,17 @@ export class ProcedureService extends BaseService {
           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`);
+        console.log(`[PROCEDURE_SERVICE] Strategy 4 success: ${procedures.length} procedures (${querySnapshot.docs.length} from query)`);
 
-        // Fix Load More - ako je broj rezultata manji od pagination, nema više
-        if (procedures.length < (filters.pagination || 10)) {
+        // Fix Load More - if we got fewer documents from Firestore than requested, no more pages
+        if (querySnapshot.docs.length < (filters.pagination || 10)) {
           return { procedures, lastDoc: null };
         }
+        
+        // If we filtered out some procedures but got full query results, use last doc for pagination
+        const lastDoc =
+          querySnapshot.docs.length > 0 ? querySnapshot.docs[querySnapshot.docs.length - 1] : null;
+        
         return { procedures, lastDoc };
       } catch (error) {
         console.log('[PROCEDURE_SERVICE] Strategy 4 failed:', error);