fix: updatedBetween issues on pagination

Author: rodrigopavezi

packages/data-access/src/data-read.ts

@@ -70,7 +70,6 @@ export class DataAccessRead implements DataAccessTypes.IDataRead {
     }
 
     const pending = this.pendingStore?.findByTopics(topics) || [];
-
     const pendingItems = pending.map((item) => ({
       hash: item.storageResult.id,
       channelId: item.channelId,
@@ -113,25 +112,33 @@ export class DataAccessRead implements DataAccessTypes.IDataRead {
 
     const transactions = result.transactions.concat(...pendingItems);
 
-    // list of channels having at least one tx updated during the updatedBetween boundaries
-    const channels = (
-      updatedBetween
-        ? transactions.filter(
-            (tx) =>
-              tx.blockTimestamp >= (updatedBetween.from || 0) &&
-              tx.blockTimestamp <= (updatedBetween.to || Number.MAX_SAFE_INTEGER),
-          )
-        : transactions
-    ).map((x) => x.channelId);
+    // Apply timestamp filtering FIRST
+    const filteredTransactions = updatedBetween
+      ? transactions.filter(
+          (tx) =>
+            tx.blockTimestamp >= (updatedBetween.from || 0) &&
+            tx.blockTimestamp <= (updatedBetween.to || Number.MAX_SAFE_INTEGER),
+        )
+      : transactions;
+
+    // Then get unique channels from filtered transactions
+    const channels = [...new Set(filteredTransactions.map((x) => x.channelId))];
 
+    // Get all transactions for these channels
     const filteredTxs = transactions.filter((tx) => channels.includes(tx.channelId));
+
+    // Apply pagination to the filtered results
+    const start = ((page || 1) - 1) * (pageSize || filteredTxs.length);
+    const end = start + (pageSize || filteredTxs.length);
+    const paginatedTxs = filteredTxs.slice(start, end);
+
     return {
       meta: {
-        storageMeta: filteredTxs.reduce((acc, tx) => {
+        storageMeta: paginatedTxs.reduce((acc, tx) => {
           acc[tx.channelId] = [this.toStorageMeta(tx, result.blockNumber, this.network)];
           return acc;
         }, {} as Record<string, StorageTypes.IEntryMetadata[]>),
-        transactionsStorageLocation: filteredTxs.reduce((prev, curr) => {
+        transactionsStorageLocation: paginatedTxs.reduce((prev, curr) => {
           if (!prev[curr.channelId]) {
             prev[curr.channelId] = [];
           }
@@ -141,17 +148,15 @@ export class DataAccessRead implements DataAccessTypes.IDataRead {
         pagination:
           page && pageSize
             ? {
-                total: result.transactions.length + pendingItems.length,
+                total: filteredTxs.length,
                 page,
                 pageSize,
-                hasMore:
-                  (page - 1) * pageSize + filteredTxs.length - pendingItemsOnCurrentPage <
-                  result.transactions.length,
+                hasMore: end < filteredTxs.length,
               }
             : undefined,
       },
       result: {
-        transactions: filteredTxs.reduce((prev, curr) => {
+        transactions: paginatedTxs.reduce((prev, curr) => {
           if (!prev[curr.channelId]) {
             prev[curr.channelId] = [];
           }