Skip to content

Commit 11cf8d3

Browse files
committed
refactor: refactor searchLogs API
1 parent b36dca0 commit 11cf8d3

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

lib/index.js

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -351,19 +351,6 @@ class ErrsolePostgres extends EventEmitter {
351351
let sortOrder = 'DESC';
352352
let shouldReverse = true;
353353
let index = 1;
354-
let gteTimestamp, lteTimestamp;
355-
356-
// Handle timestamp adjustments
357-
if (filters.gte_timestamp && !filters.lte_timestamp) {
358-
filters.gte_timestamp = new Date(filters.gte_timestamp);
359-
lteTimestamp = new Date(filters.gte_timestamp.getTime() + 24 * 60 * 60 * 1000);
360-
filters.lte_timestamp = lteTimestamp;
361-
}
362-
if (filters.lte_timestamp && !filters.gte_timestamp) {
363-
filters.lte_timestamp = new Date(filters.lte_timestamp);
364-
gteTimestamp = new Date(filters.lte_timestamp.getTime() - 24 * 60 * 60 * 1000);
365-
filters.gte_timestamp = gteTimestamp;
366-
}
367354

368355
// Search terms with AND logic
369356
if (searchTerms && searchTerms.length > 0) {
@@ -410,9 +397,32 @@ class ErrsolePostgres extends EventEmitter {
410397
shouldReverse = false;
411398
}
412399
if (filters.lte_timestamp || filters.gte_timestamp) {
413-
whereClauses.push(`timestamp >= $${index++} AND timestamp <= $${index++}`);
414-
values.push(gteTimestamp || new Date(filters.gte_timestamp));
415-
values.push(lteTimestamp || new Date(filters.lte_timestamp));
400+
if (filters.lte_timestamp) {
401+
filters.lte_timestamp = new Date(filters.lte_timestamp);
402+
whereClauses.push(`timestamp <= $${index++}`);
403+
values.push(filters.lte_timestamp);
404+
sortOrder = 'DESC';
405+
shouldReverse = true;
406+
}
407+
if (filters.gte_timestamp) {
408+
filters.gte_timestamp = new Date(filters.gte_timestamp);
409+
whereClauses.push(`timestamp >= $${index++}`);
410+
values.push(filters.gte_timestamp);
411+
sortOrder = 'ASC';
412+
shouldReverse = false;
413+
}
414+
if (filters.lte_timestamp && !filters.gte_timestamp) {
415+
const gteTimestamp = new Date(filters.lte_timestamp.getTime() - 24 * 60 * 60 * 1000);
416+
whereClauses.push(`timestamp >= $${index++}`);
417+
values.push(gteTimestamp);
418+
filters.gte_timestamp = gteTimestamp;
419+
}
420+
if (filters.gte_timestamp && !filters.lte_timestamp) {
421+
const lteTimestamp = new Date(filters.gte_timestamp.getTime() + 24 * 60 * 60 * 1000);
422+
whereClauses.push(`timestamp <= $${index++}`);
423+
values.push(lteTimestamp);
424+
filters.lte_timestamp = lteTimestamp;
425+
}
416426
}
417427

418428
const whereClause = whereClauses.length ? `WHERE ${whereClauses.join(' AND ')}` : '';

0 commit comments

Comments
 (0)