From 7f85b2ac0a1551c4b510e3ffb44f574b9ed7f37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Tue, 3 Mar 2026 12:53:11 +0100
Subject: [PATCH] fix: pagination bug #296

---
 packages/db/src/services/event.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/db/src/services/event.service.ts b/packages/db/src/services/event.service.ts
index fc1667b0..94df1477 100644
--- a/packages/db/src/services/event.service.ts
+++ b/packages/db/src/services/event.service.ts
@@ -477,7 +477,7 @@ export async function getEventList(options: GetEventListOptions) {
     sb.where.cursor = `created_at < ${sqlstring.escape(formatClickhouseDate(cursor))}`;
   }
 
-  if (!cursor) {
+  if (!cursor && !(startDate && endDate)) {
     sb.where.cursorWindow = `created_at >= toDateTime64(${sqlstring.escape(formatClickhouseDate(new Date()))}, 3) - INTERVAL ${safeDateIntervalInDays} DAY`;
   }
 
@@ -628,7 +628,7 @@ export async function getEventList(options: GetEventListOptions) {
     }
   }
 
-  sb.orderBy.created_at = 'created_at DESC';
+  sb.orderBy.created_at = 'created_at DESC, id ASC';
 
   if (custom) {
     custom(sb);