fix: searchLogs

Author: venki91

lib/index.js

@@ -400,21 +400,21 @@ class ErrsolePostgres extends EventEmitter {
    * @returns {Promise<{items: Log[], filters: LogFilter[]}>} - A promise that resolves with an object containing an array of log items and the applied filters.
    * @throws {Error} - Throws an error if the operation fails.
    */
-  async searchLogs (searchTerms, filters = {}) {
+  async searchLogs (searchTerms = [], filters = {}) {
     const DEFAULT_LOGS_LIMIT = 100;
     filters.limit = filters.limit || DEFAULT_LOGS_LIMIT;
 
     const whereClauses = [];
     const values = [];
     let orderBy = 'id DESC';
     let shouldReverse = true;
-    let index = 1;
 
-    // Search terms with AND logic
-    if (searchTerms && searchTerms.length > 0) {
-      const tsQuery = searchTerms.map(term => `${term}:*`).join(' & '); // AND logic for search terms
-      whereClauses.push(`message_tsv @@ to_tsquery('english', $${index++})`);
-      values.push(tsQuery);
+    if (searchTerms.length > 0) {
+      const whereConditions = searchTerms.map(
+        (_, i) => `message_tsv @@ phraseto_tsquery('english', $${values.length + i + 1})`
+      );
+      whereClauses.push(`(${whereConditions.join(' AND ')})`);
+      values.push(...searchTerms);
     }
 
     // Apply filters
@@ -438,48 +438,48 @@ class ErrsolePostgres extends EventEmitter {
       whereClauses.push(`(${orConditions.join(' OR ')})`);
     }
     if (filters.lt_id) {
-      whereClauses.push(`id < $${index++}`);
+      whereClauses.push(`id < $${values.length + 1}`);
       values.push(filters.lt_id);
       orderBy = 'id DESC';
       shouldReverse = true;
     }
     if (filters.gt_id) {
-      whereClauses.push(`id > $${index++}`);
+      whereClauses.push(`id > $${values.length + 1}`);
       values.push(filters.gt_id);
       orderBy = 'id ASC';
       shouldReverse = false;
     }
     if (filters.lte_timestamp || filters.gte_timestamp) {
       if (filters.lte_timestamp) {
         filters.lte_timestamp = new Date(filters.lte_timestamp);
-        whereClauses.push(`timestamp <= $${index++}`);
+        whereClauses.push(`timestamp <= $${values.length + 1}`);
         values.push(filters.lte_timestamp);
         orderBy = 'timestamp DESC, id DESC';
         shouldReverse = true;
       }
       if (filters.gte_timestamp) {
         filters.gte_timestamp = new Date(filters.gte_timestamp);
-        whereClauses.push(`timestamp >= $${index++}`);
+        whereClauses.push(`timestamp >= $${values.length + 1}`);
         values.push(filters.gte_timestamp);
         orderBy = 'timestamp ASC, id ASC';
         shouldReverse = false;
       }
       if (filters.lte_timestamp && !filters.gte_timestamp) {
         const gteTimestamp = new Date(filters.lte_timestamp.getTime() - 24 * 60 * 60 * 1000);
-        whereClauses.push(`timestamp >= $${index++}`);
+        whereClauses.push(`timestamp >= $${values.length + 1}`);
         values.push(gteTimestamp);
         filters.gte_timestamp = gteTimestamp;
       }
       if (filters.gte_timestamp && !filters.lte_timestamp) {
         const lteTimestamp = new Date(filters.gte_timestamp.getTime() + 24 * 60 * 60 * 1000);
-        whereClauses.push(`timestamp <= $${index++}`);
+        whereClauses.push(`timestamp <= $${values.length + 1}`);
         values.push(lteTimestamp);
         filters.lte_timestamp = lteTimestamp;
       }
     }
 
     const whereClause = whereClauses.length ? `WHERE ${whereClauses.join(' AND ')}` : '';
-    const query = `SELECT id, hostname, pid, source, timestamp, level, message,errsole_id FROM ${this.logsTable} ${whereClause} ORDER BY ${orderBy} LIMIT $${index}`;
+    const query = `SELECT id, hostname, pid, source, timestamp, level, message,errsole_id FROM ${this.logsTable} ${whereClause} ORDER BY ${orderBy} LIMIT $${values.length + 1}`;
     values.push(filters.limit);
 
     const { rows } = await this.pool.query(query, values);