From 5a8b85be48e90082f8db0b442a331dc7e01f30e5 Mon Sep 17 00:00:00 2001 From: Dmitryii Osipov Date: Fri, 16 Aug 2024 15:52:37 +0300 Subject: [PATCH] fix(idea/squid): case insensetive queries (#1620) --- idea/explorer/src/services/code.ts | 2 +- idea/explorer/src/services/event.ts | 4 ++-- idea/explorer/src/services/message.ts | 8 ++++---- idea/explorer/src/services/program.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/explorer/src/services/code.ts b/idea/explorer/src/services/code.ts index 6d118b2afa..80d1810a61 100644 --- a/idea/explorer/src/services/code.ts +++ b/idea/explorer/src/services/code.ts @@ -44,7 +44,7 @@ export class CodeService { } if (query) { - qb.andWhere('(code.id ILIKE :query OR code.name ILIKE :query)', { query: `%${query}%` }); + qb.andWhere('(code.id ILIKE :query OR code.name ILIKE :query)', { query: `%${query.toLowerCase()}%` }); } qb.orderBy('code.timestamp', 'DESC').limit(limit).offset(offset); diff --git a/idea/explorer/src/services/event.ts b/idea/explorer/src/services/event.ts index 6df1786e13..eb1e397a11 100644 --- a/idea/explorer/src/services/event.ts +++ b/idea/explorer/src/services/event.ts @@ -32,11 +32,11 @@ export class EventService { } if (service) { - builder.andWhere('event.service = :service', { service: service.toLowerCase() }); + builder.andWhere('event.service ILIKE :service', { service: `%${service.toLowerCase()}%` }); } if (name) { - builder.andWhere('event.name = :name', { name: name.toLowerCase() }); + builder.andWhere('event.name ILIKE :name', { name: `%${name.toLowerCase()}%` }); } builder.orderBy('event.timestamp', 'DESC').take(limit).skip(offset); diff --git a/idea/explorer/src/services/message.ts b/idea/explorer/src/services/message.ts index b22ca193e6..326aea7a58 100644 --- a/idea/explorer/src/services/message.ts +++ b/idea/explorer/src/services/message.ts @@ -68,11 +68,11 @@ export class MessageService { } if (service) { - qb.andWhere('msg.service = :service', { service: service.toLowerCase() }); + qb.andWhere('msg.service ILIKE :service', { service: `%${service.toLowerCase()}%` }); } if (fn) { - qb.andWhere('msg.fn = :fn', { fn: fn.toLowerCase() }); + qb.andWhere('msg.fn ILIKE :fn', { fn: `%${fn.toLowerCase()}%` }); } qb.orderBy('msg.timestamp', 'DESC').limit(limit).offset(offset); @@ -110,11 +110,11 @@ export class MessageService { } if (service) { - qb.andWhere('msg.service = :service', { service: service.toLowerCase() }); + qb.andWhere('msg.service ILIKE :service', { service: `%${service.toLowerCase()}%` }); } if (fn) { - qb.andWhere('msg.fn = :fn', { fn: fn.toLowerCase() }); + qb.andWhere('msg.fn ILIKE :fn', { fn: `%${fn.toLowerCase()}%` }); } qb.orderBy('msg.timestamp', 'DESC').limit(limit).offset(offset); diff --git a/idea/explorer/src/services/program.ts b/idea/explorer/src/services/program.ts index 9b5c0e322f..3a5b54a5a8 100644 --- a/idea/explorer/src/services/program.ts +++ b/idea/explorer/src/services/program.ts @@ -56,7 +56,7 @@ export class ProgramService { } if (query) { - qb.andWhere('(program.id ILIKE :query OR program.name ILIKE :query)', { query: `%${query}%` }); + qb.andWhere('(program.id ILIKE :query OR program.name ILIKE :query)', { query: `%${query.toLowerCase()}%` }); } qb.orderBy('program.timestamp', 'DESC').limit(limit).offset(offset);