From fac1e90a3993d6d3e3cc36ca43c2d2d8cab6036e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Wed, 23 Oct 2024 22:55:25 +0200 Subject: [PATCH] fix(api): group or statements for chart service --- packages/db/src/services/chart.service.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/db/src/services/chart.service.ts b/packages/db/src/services/chart.service.ts index d408ba29..24e364b4 100644 --- a/packages/db/src/services/chart.service.ts +++ b/packages/db/src/services/chart.service.ts @@ -308,38 +308,38 @@ export function getEventFiltersWhereClause(filters: IChartEventFilter[]) { break; } case 'contains': { - where[id] = value + where[id] = `(${value .map((val) => `${name} LIKE ${escape(`%${String(val).trim()}%`)}`) - .join(' OR '); + .join(' OR ')})`; break; } case 'doesNotContain': { - where[id] = value + where[id] = `(${value .map( (val) => `${name} NOT LIKE ${escape(`%${String(val).trim()}%`)}`, ) - .join(' OR '); + .join(' OR ')})`; break; } case 'startsWith': { - where[id] = value + where[id] = `(${value .map((val) => `${name} LIKE ${escape(`${String(val).trim()}%`)}`) - .join(' OR '); + .join(' OR ')})`; break; } case 'endsWith': { - where[id] = value + where[id] = `(${value .map((val) => `${name} LIKE ${escape(`%${String(val).trim()}`)}`) - .join(' OR '); + .join(' OR ')})`; break; } case 'regex': { - where[id] = value + where[id] = `(${value .map( (val) => `match(${name}, ${escape(stripLeadingAndTrailingSlashes(String(val)).trim())})`, ) - .join(' OR '); + .join(' OR ')})`; break; } }