watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 06:37:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove snake_case.

Browse source
This commit is contained in:
Brian Cao 2022-12-26 17:36:48 -08:00
parent e1f99a7d01
commit a91386434d
21 changed files with 86 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/clickhouse.js
View file

@ -64,8 +64,8 @@ function getCommaSeparatedStringFormat(data) {
return data.map(a => `'${a}'`).join(',') || '';
}
function getBetweenDates(field, start_at, end_at) {
return `${field} between ${getDateFormat(start_at)} and ${getDateFormat(end_at)}`;
function getBetweenDates(field, startAt, endAt) {
return `${field} between ${getDateFormat(startAt)} and ${getDateFormat(endAt)}`;
}
function getJsonField(column, property) {
@ -120,7 +120,7 @@ function getFilterQuery(filters = {}, params = []) {
case 'browser':
case 'device':
case 'country':
case 'event_name':
case 'eventName':
arr.push(`and ${key}=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
@ -147,18 +147,18 @@ function getFilterQuery(filters = {}, params = []) {
}
function parseFilters(filters = {}, params = []) {
const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =
const { domain, url, event_url, referrer, os, browser, device, country, eventName, query } =
filters;
const pageviewFilters = { domain, url, referrer, query };
const sessionFilters = { os, browser, device, country };
const eventFilters = { url: event_url, event_name };
const eventFilters = { url: event_url, eventName };
return {
pageviewFilters,
sessionFilters,
eventFilters,
event: { event_name },
event: { eventName },
filterQuery: getFilterQuery(filters, params),
};
}

8
lib/prisma.ts
View file

@ -159,7 +159,7 @@ function getFilterQuery(filters = {}, params = []): string {
case 'browser':
case 'device':
case 'country':
case 'event_name':
case 'eventName':
arr.push(`and ${key}=$${params.length + 1}`);
params.push(decodeURIComponent(filter));
break;
@ -187,18 +187,18 @@ function parseFilters(
params = [],
sessionKey = 'session_id',
) {
const { domain, url, event_url, referrer, os, browser, device, country, event_name, query } =
const { domain, url, event_url, referrer, os, browser, device, country, eventName, query } =
filters;
const pageviewFilters = { domain, url, referrer, query };
const sessionFilters = { os, browser, device, country };
const eventFilters = { url: event_url, event_name };
const eventFilters = { url: event_url, eventName };
return {
pageviewFilters,
sessionFilters,
eventFilters,
event: { event_name },
event: { eventName },
joinSession:
os || browser || device || country
? `inner join session on ${sessionKey} = session.${sessionKey}`