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

clean-up session api endpoints and queries

Browse source
This commit is contained in:
Francis Cao 2025-10-21 19:54:50 -07:00
parent f98e683979
commit 533a42eb2e
10 changed files with 64 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/queries/sql/sessions/getSessionDataProperties.ts
View file

@ -1,12 +1,12 @@
import prisma from '@/lib/prisma';
import clickhouse from '@/lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
import prisma from '@/lib/prisma';
import { QueryFilters } from '@/lib/types';
const FUNCTION_NAME = 'getSessionDataProperties';
export async function getSessionDataProperties(
...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
...args: [websiteId: string, filters: QueryFilters]
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@ -14,17 +14,12 @@ export async function getSessionDataProperties(
});
}
async function relationalQuery(
websiteId: string,
filters: QueryFilters & { propertyName?: string },
) {
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { rawQuery, parseFilters } = prisma;
const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
});
return rawQuery(
`
@ -50,15 +45,10 @@ async function relationalQuery(
async function clickhouseQuery(
websiteId: string,
filters: QueryFilters & { propertyName?: string },
filters: QueryFilters,
): Promise<{ propertyName: string; total: number }[]> {
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters(
{ ...filters, websiteId },
{
columns: { propertyName: 'data_key' },
},
);
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
return rawQuery(
`
@ -69,6 +59,7 @@ async function clickhouseQuery(
${cohortQuery}
join session_data final
on session_data.session_id = website_event.session_id
and session_data.website_id = {websiteId:UUID}
where website_event.website_id = {websiteId:UUID}
and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and session_data.data_key != ''

1
src/queries/sql/sessions/getSessionDataValues.ts
View file

@ -69,6 +69,7 @@ async function clickhouseQuery(
${cohortQuery}
join session_data final
on session_data.session_id = website_event.session_id
and session_data.website_id = {websiteId:UUID}
where website_event.website_id = {websiteId:UUID}
and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and session_data.data_key = {propertyName:String}

5
src/queries/sql/sessions/getWebsiteSessions.ts
View file

@ -98,6 +98,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
select
session_id as id,
website_id as websiteId,
hostname,
browser,
os,
device,
@ -117,7 +118,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
${dateQuery}
${filterQuery}
${searchQuery}
group by session_id, website_id, browser, os, device, screen, language, country, region, city
group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
order by lastAt desc
`;
} else {
@ -125,7 +126,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
select
session_id as id,
website_id as websiteId,
hostname,
arrayFirst(x -> 1, hostname) hostname,
browser,
os,
device,