From 1e29e618f52135e064760a3dccf293e728276b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman121@gmail.com>
Date: Fri, 29 Sep 2023 12:29:42 +0200
Subject: [PATCH] Revert "Fix record fetching ending prematurely due to RBAC"

This reverts commit 8e03ea56ef17b6332d6bb841da5ca5965966b78f.
---
 server/compose/dalutils/records.go | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/server/compose/dalutils/records.go b/server/compose/dalutils/records.go
index 680bcec8a..3ceb096f4 100644
--- a/server/compose/dalutils/records.go
+++ b/server/compose/dalutils/records.go
@@ -3,7 +3,6 @@ package dalutils
 import (
 	"context"
 	"fmt"
-
 	"github.com/cortezaproject/corteza/server/compose/types"
 	"github.com/cortezaproject/corteza/server/pkg/dal"
 	"github.com/cortezaproject/corteza/server/pkg/filter"
@@ -130,10 +129,9 @@ func drainIterator(ctx context.Context, iter dal.Iterator, mod *types.Module, f
 	}
 
 	var (
-		ok       bool
-		fetched  uint
-		filtered uint
-		r        *types.Record
+		ok      bool
+		fetched uint
+		r       *types.Record
 	)
 
 	// Get the requested number of record
@@ -146,7 +144,6 @@ func drainIterator(ctx context.Context, iter dal.Iterator, mod *types.Module, f
 	for f.Limit == 0 || uint(len(set)) < f.Limit {
 		// reset counters every drain
 		fetched = 0
-		filtered = 0
 
 		err = WalkIterator(ctx, iter, mod, func(r *types.Record) error {
 			// check fetched record
@@ -154,7 +151,6 @@ func drainIterator(ctx context.Context, iter dal.Iterator, mod *types.Module, f
 				if ok, err = f.Check(r); err != nil {
 					return err
 				} else if !ok {
-					filtered++
 					return nil
 				}
 			}
@@ -170,12 +166,11 @@ func drainIterator(ctx context.Context, iter dal.Iterator, mod *types.Module, f
 			return
 		}
 
-		total := fetched + filtered
-		if total == 0 || f.Limit == 0 || (0 < f.Limit && total < f.Limit) {
+		if fetched == 0 || f.Limit == 0 || (0 < f.Limit && fetched < f.Limit) {
 			// do not re-fetch if:
 			// 1) nothing was fetch in the previous run
 			// 2) there was no limit (everything was fetched)
-			// 3) there are less total (fetched and filtered) items then value of limit
+			// 3) there are less fetched items then value of limit
 			break
 		}