m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-01 12:29:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed region view. Closes #2648.

Browse Source
This commit is contained in:
Mike Cao 2024-04-09 22:20:11 -07:00
parent 3749e22d4d
commit 1ffef86f2a
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/api/websites/[websiteId]/metrics.ts
View File

@ -87,7 +87,7 @@ export default async (
} }
if (SESSION_COLUMNS.includes(type)) { if (SESSION_COLUMNS.includes(type)) {
const data = await getSessionMetrics(websiteId, column, filters, limit, offset); const data = await getSessionMetrics(websiteId, type, filters, limit, offset);
if (type === 'language') { if (type === 'language') {
const combined = {}; const combined = {};

18
src/queries/analytics/sessions/getSessionMetrics.ts
View File

@ -1,17 +1,11 @@
import prisma from 'lib/prisma'; import prisma from 'lib/prisma';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db'; import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants'; import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
import { QueryFilters } from 'lib/types'; import { QueryFilters } from 'lib/types';
export async function getSessionMetrics( export async function getSessionMetrics(
...args: [ ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
websiteId: string,
column: string,
filters: QueryFilters,
limit?: number,
offset?: number,
]
) { ) {
return runQuery({ return runQuery({
[PRISMA]: () => relationalQuery(...args), [PRISMA]: () => relationalQuery(...args),
@ -21,11 +15,12 @@ export async function getSessionMetrics(
async function relationalQuery( async function relationalQuery(
websiteId: string, websiteId: string,
column: string, type: string,
filters: QueryFilters, filters: QueryFilters,
limit: number = 500, limit: number = 500,
offset: number = 0, offset: number = 0,
) { ) {
const column = FILTER_COLUMNS[type] || type;
const { parseFilters, rawQuery } = prisma; const { parseFilters, rawQuery } = prisma;
const { filterQuery, joinSession, params } = await parseFilters( const { filterQuery, joinSession, params } = await parseFilters(
websiteId, websiteId,
@ -34,7 +29,7 @@ async function relationalQuery(
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
}, },
{ {
joinSession: SESSION_COLUMNS.includes(column), joinSession: SESSION_COLUMNS.includes(type),
}, },
); );
const includeCountry = column === 'city' || column === 'subdivision1'; const includeCountry = column === 'city' || column === 'subdivision1';
@ -63,11 +58,12 @@ async function relationalQuery(
async function clickhouseQuery( async function clickhouseQuery(
websiteId: string, websiteId: string,
column: string, type: string,
filters: QueryFilters, filters: QueryFilters,
limit: number = 500, limit: number = 500,
offset: number = 0, offset: number = 0,
): Promise<{ x: string; y: number }[]> { ): Promise<{ x: string; y: number }[]> {
const column = FILTER_COLUMNS[type] || type;
const { parseFilters, rawQuery } = clickhouse; const { parseFilters, rawQuery } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,