Support wildcard for goals report Closes #4086
This commit is contained in:
@@ -29,10 +29,18 @@ async function relationalQuery(
|
||||
const { rawQuery, parseFilters } = prisma;
|
||||
const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;
|
||||
const column = type === 'path' ? 'url_path' : 'event_name';
|
||||
|
||||
let operator = '=';
|
||||
let paramValue = value;
|
||||
if (value.startsWith('*') || value.endsWith('*')) {
|
||||
operator = 'like';
|
||||
paramValue = value.replace(/^\*|\*$/g, '%');
|
||||
}
|
||||
|
||||
const { filterQuery, dateQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
value,
|
||||
value: paramValue,
|
||||
startDate,
|
||||
endDate,
|
||||
eventType,
|
||||
@@ -60,7 +68,7 @@ async function relationalQuery(
|
||||
${cohortQuery}
|
||||
${joinSessionQuery}
|
||||
where website_event.website_id = {{websiteId::uuid}}
|
||||
and ${column} = {{value}}
|
||||
and ${column} ${operator} {{value}}
|
||||
${dateQuery}
|
||||
${filterQuery}
|
||||
`,
|
||||
@@ -77,10 +85,18 @@ async function clickhouseQuery(
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const eventType = type === 'path' ? EVENT_TYPE.pageView : EVENT_TYPE.customEvent;
|
||||
const column = type === 'path' ? 'url_path' : 'event_name';
|
||||
|
||||
let operator = '=';
|
||||
let paramValue = value;
|
||||
if (value.startsWith('*') || value.endsWith('*')) {
|
||||
operator = 'like';
|
||||
paramValue = value.replace(/^\*|\*$/g, '%');
|
||||
}
|
||||
|
||||
const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
value,
|
||||
value: paramValue,
|
||||
startDate,
|
||||
endDate,
|
||||
eventType,
|
||||
@@ -106,7 +122,7 @@ async function clickhouseQuery(
|
||||
from website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and ${column} = {value:String}
|
||||
and ${column} ${operator} {value:String}
|
||||
${dateQuery}
|
||||
${filterQuery}
|
||||
`,
|
||||
|
||||
Reference in New Issue
Block a user