zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2025-11-08 22:17:21 +01:00
parent ed8deeec3c
commit 843f95f237
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/db/src/services/event.service.ts
View File

@@ -412,15 +412,22 @@ export async function getEventList(options: GetEventListOptions) {
} = options; } = options;
const { sb, getSql, join } = createSqlBuilder(); const { sb, getSql, join } = createSqlBuilder();
const MAX_DATE_INTERVAL_IN_DAYS = 365;
// Cap the date interval to prevent infinity
const safeDateIntervalInDays = Math.min(
dateIntervalInDays,
MAX_DATE_INTERVAL_IN_DAYS,
);
if (typeof cursor === 'number') { if (typeof cursor === 'number') {
sb.offset = Math.max(0, (cursor ?? 0) * take); sb.offset = Math.max(0, (cursor ?? 0) * take);
} else if (cursor instanceof Date) { } else if (cursor instanceof Date) {
sb.where.cursorWindow = `created_at >= toDateTime64(${sqlstring.escape(formatClickhouseDate(cursor))}, 3) - INTERVAL ${dateIntervalInDays} DAY`; sb.where.cursorWindow = `created_at >= toDateTime64(${sqlstring.escape(formatClickhouseDate(cursor))}, 3) - INTERVAL ${safeDateIntervalInDays} DAY`;
sb.where.cursor = `created_at <= ${sqlstring.escape(formatClickhouseDate(cursor))}`; sb.where.cursor = `created_at <= ${sqlstring.escape(formatClickhouseDate(cursor))}`;
} }
if (!cursor) { if (!cursor) {
sb.where.cursorWindow = `created_at >= toDateTime64(${sqlstring.escape(formatClickhouseDate(new Date()))}, 3) - INTERVAL ${dateIntervalInDays} DAY`; sb.where.cursorWindow = `created_at >= toDateTime64(${sqlstring.escape(formatClickhouseDate(new Date()))}, 3) - INTERVAL ${safeDateIntervalInDays} DAY`;
} }
sb.limit = take; sb.limit = take;
@@ -580,7 +587,11 @@ export async function getEventList(options: GetEventListOptions) {
}); });
// If we dont get any events, try without the cursor window // If we dont get any events, try without the cursor window
if (data.length === 0 && sb.where.cursorWindow) { if (
data.length === 0 &&
sb.where.cursorWindow &&
safeDateIntervalInDays < MAX_DATE_INTERVAL_IN_DAYS
) {
return getEventList({ return getEventList({
...options, ...options,
dateIntervalInDays: dateIntervalInDays * 2, dateIntervalInDays: dateIntervalInDays * 2,

2
packages/queue/src/queues.ts
View File

@@ -216,7 +216,7 @@ export type ImportQueuePayload = {
}; };
}; };
export const importQueue = new Queue<ImportQueuePayload>('import', { export const importQueue = new Queue<ImportQueuePayload>('{import}', {
connection: getRedisQueue(), connection: getRedisQueue(),
defaultJobOptions: { defaultJobOptions: {
removeOnComplete: 10, removeOnComplete: 10,