fix: return filters in searchLogs API

Author: venki91

lib/index.js

@@ -344,14 +344,34 @@ class ErrsolePostgres extends EventEmitter {
    */
   async searchLogs (searchTerms, filters = {}) {
     const DEFAULT_LOGS_LIMIT = 100;
-
     filters.limit = filters.limit || DEFAULT_LOGS_LIMIT;
 
-    const whereClauses = searchTerms.map(() => 'message ILIKE $' + (whereClauses.length + 1));
-    const values = searchTerms.map(term => `%${term}%`);
+    const whereClauses = [];
+    const values = [];
     let sortOrder = 'DESC';
     let shouldReverse = true;
-    let index = values.length + 1;
+    let index = 1;
+    let gteTimestamp, lteTimestamp;
+
+    // Handle timestamp adjustments
+    if (filters.gte_timestamp && !filters.lte_timestamp) {
+      filters.gte_timestamp = new Date(filters.gte_timestamp);
+      lteTimestamp = new Date(filters.gte_timestamp.getTime() + 24 * 60 * 60 * 1000);
+      filters.lte_timestamp = lteTimestamp;
+    }
+    if (filters.lte_timestamp && !filters.gte_timestamp) {
+      filters.lte_timestamp = new Date(filters.lte_timestamp);
+      gteTimestamp = new Date(filters.lte_timestamp.getTime() - 24 * 60 * 60 * 1000);
+      filters.gte_timestamp = gteTimestamp;
+    }
+
+    // Search terms with AND logic
+    if (searchTerms && searchTerms.length > 0) {
+      searchTerms.forEach(term => {
+        whereClauses.push(`message ILIKE $${index++}`);
+        values.push(`%${term}%`);
+      });
+    }
 
     // Apply filters
     if (filters.hostname) {
@@ -382,24 +402,17 @@ class ErrsolePostgres extends EventEmitter {
       values.push(filters.lt_id);
       sortOrder = 'DESC';
       shouldReverse = true;
-    } else if (filters.gt_id) {
+    }
+    if (filters.gt_id) {
       whereClauses.push(`id > $${index++}`);
       values.push(filters.gt_id);
       sortOrder = 'ASC';
       shouldReverse = false;
-    } else if (filters.lte_timestamp || filters.gte_timestamp) {
-      if (filters.lte_timestamp) {
-        whereClauses.push(`timestamp <= $${index++}`);
-        values.push(new Date(filters.lte_timestamp));
-        sortOrder = 'DESC';
-        shouldReverse = true;
-      }
-      if (filters.gte_timestamp) {
-        whereClauses.push(`timestamp >= $${index++}`);
-        values.push(new Date(filters.gte_timestamp));
-        sortOrder = 'ASC';
-        shouldReverse = false;
-      }
+    }
+    if (filters.lte_timestamp || filters.gte_timestamp) {
+      whereClauses.push(`timestamp >= $${index++} AND timestamp <= $${index++}`);
+      values.push(gteTimestamp || new Date(filters.gte_timestamp));
+      values.push(lteTimestamp || new Date(filters.lte_timestamp));
     }
 
     const whereClause = whereClauses.length ? `WHERE ${whereClauses.join(' AND ')}` : '';
@@ -408,7 +421,7 @@ class ErrsolePostgres extends EventEmitter {
 
     const { rows } = await this.pool.query(query, values);
     if (shouldReverse) rows.reverse();
-    return { items: rows };
+    return { items: rows, filters };
   }
 
   /**