watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Added limit to metrics queries.

Browse source
This commit is contained in:
Mike Cao 2023-12-12 19:00:44 -08:00
parent a851ebf124
commit 907685b96e
7 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/queries/analytics/pageviews/getPageviewMetrics.ts
View file

@ -5,7 +5,7 @@ import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
import { QueryFilters } from 'lib/types';
export async function getPageviewMetrics(
...args: [websiteId: string, columns: string, filters: QueryFilters]
...args: [websiteId: string, columns: string, filters: QueryFilters, limit?: number]
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@ -13,7 +13,12 @@ export async function getPageviewMetrics(
});
}
async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
async function relationalQuery(
websiteId: string,
column: string,
filters: QueryFilters,
limit: number = 100,
) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(
websiteId,
@ -42,7 +47,7 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
${filterQuery}
group by 1
order by 2 desc
limit 100
limit ${limit}
`,
params,
);
@ -52,6 +57,7 @@ async function clickhouseQuery(
websiteId: string,
column: string,
filters: QueryFilters,
limit: number = 100,
): Promise<{ x: string; y: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, {
@ -75,7 +81,7 @@ async function clickhouseQuery(
${filterQuery}
group by x
order by y desc
limit 100
limit ${limit}
`,
params,
).then(a => {

14
src/queries/analytics/sessions/getSessionMetrics.ts
View file

@ -5,7 +5,7 @@ import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
import { QueryFilters } from 'lib/types';
export async function getSessionMetrics(
...args: [websiteId: string, column: string, filters: QueryFilters]
...args: [websiteId: string, column: string, filters: QueryFilters, limit?: number]
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@ -13,7 +13,12 @@ export async function getSessionMetrics(
});
}
async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
async function relationalQuery(
websiteId: string,
column: string,
filters: QueryFilters,
limit: number = 100,
) {
const { parseFilters, rawQuery } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(
websiteId,
@ -42,7 +47,7 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
group by 1
${includeCountry ? ', 3' : ''}
order by 2 desc
limit 100`,
limit ${limit}`,
params,
);
}
@ -51,6 +56,7 @@ async function clickhouseQuery(
websiteId: string,
column: string,
filters: QueryFilters,
limit: number = 100,
): Promise<{ x: string; y: number }[]> {
const { parseFilters, rawQuery } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, {
@ -73,7 +79,7 @@ async function clickhouseQuery(
group by x
${includeCountry ? ', country' : ''}
order by y desc
limit 100
limit ${limit}
`,
params,
).then(a => {