mirror of
https://github.com/umami-software/umami.git
synced 2026-02-08 14:47:14 +01:00
Merge branch 'dev' into jajaja
# Conflicts: # db/postgresql/schema.prisma # pnpm-lock.yaml # src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx # src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx # src/app/api/reports/route.ts # src/app/api/websites/[websiteId]/events/series/route.ts # src/app/api/websites/[websiteId]/metrics/route.ts # src/app/api/websites/[websiteId]/pageviews/route.ts # src/app/api/websites/[websiteId]/sessions/stats/route.ts # src/app/api/websites/[websiteId]/stats/route.ts # src/app/api/websites/[websiteId]/values/route.ts # src/components/hooks/useFields.ts # src/components/hooks/useFilterParams.ts # src/lang/vi-VN.json # src/lib/clickhouse.ts # src/lib/detect.ts # src/lib/prisma.ts # src/lib/request.ts # src/lib/schema.ts # src/lib/types.ts # src/queries/sql/events/getEventDataFields.ts # src/queries/sql/events/getEventDataProperties.ts # src/queries/sql/events/getEventDataStats.ts # src/queries/sql/events/getEventDataValues.ts # src/queries/sql/events/getEventMetrics.ts # src/queries/sql/events/getWebsiteEvents.ts # src/queries/sql/getChannelMetrics.ts # src/queries/sql/getRealtimeActivity.ts # src/queries/sql/getWebsiteStats.ts # src/queries/sql/pageviews/getPageviewMetrics.ts # src/queries/sql/pageviews/getPageviewStats.ts # src/queries/sql/reports/getBreakdown.ts # src/queries/sql/sessions/getSessionDataProperties.ts # src/queries/sql/sessions/getSessionDataValues.ts # src/queries/sql/sessions/getSessionMetrics.ts # src/queries/sql/sessions/getSessionStats.ts # src/queries/sql/sessions/getWebsiteSessionStats.ts # src/queries/sql/sessions/getWebsiteSessions.ts
This commit is contained in:
Mike Cao
commit
87449ece9e
49 changed files with 704 additions and 345 deletions
|
|
@ -12,7 +12,7 @@ export async function getEventDataFields(...args: [websiteId: string, filters: Q
|
|||
|
||||
async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
||||
const { rawQuery, parseFilters, getDateSQL } = prisma;
|
||||
const { filterQuery, queryParams } = parseFilters(filters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -27,6 +27,9 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
|||
count(*) as "total"
|
||||
from event_data
|
||||
join website_event on website_event.event_id = event_data.website_event_id
|
||||
and website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
${cohortQuery}
|
||||
where event_data.website_id = {{websiteId::uuid}}
|
||||
and event_data.created_at between {{startDate}} and {{endDate}}
|
||||
${filterQuery}
|
||||
|
|
@ -43,7 +46,7 @@ async function clickhouseQuery(
|
|||
filters: QueryFilters,
|
||||
): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const { filterQuery, queryParams } = parseFilters(filters);
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters);
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -54,7 +57,8 @@ async function clickhouseQuery(
|
|||
data_type = 4, toString(date_trunc('hour', date_value)),
|
||||
string_value) as "value",
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
from event_data website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ async function relationalQuery(
|
|||
filters: QueryFilters & { propertyName?: string },
|
||||
) {
|
||||
const { rawQuery, parseFilters } = prisma;
|
||||
const { filterQuery, queryParams } = parseFilters(filters, {
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
|
||||
columns: { propertyName: 'data_key' },
|
||||
});
|
||||
|
||||
|
|
@ -29,6 +29,9 @@ async function relationalQuery(
|
|||
count(*) as "total"
|
||||
from event_data
|
||||
join website_event on website_event.event_id = event_data.website_event_id
|
||||
and website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
${cohortQuery}
|
||||
where event_data.website_id = {{websiteId::uuid}}
|
||||
and event_data.created_at between {{startDate}} and {{endDate}}
|
||||
${filterQuery}
|
||||
|
|
@ -45,7 +48,7 @@ async function clickhouseQuery(
|
|||
filters: QueryFilters & { propertyName?: string },
|
||||
): Promise<{ eventName: string; propertyName: string; total: number }[]> {
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const { filterQuery, queryParams } = parseFilters(filters, {
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters(filters, {
|
||||
columns: { propertyName: 'data_key' },
|
||||
});
|
||||
|
||||
|
|
@ -55,7 +58,8 @@ async function clickhouseQuery(
|
|||
event_name as eventName,
|
||||
data_key as propertyName,
|
||||
count(*) as total
|
||||
from event_data
|
||||
from event_data website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ export async function getEventDataStats(
|
|||
|
||||
async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
||||
const { rawQuery, parseFilters } = prisma;
|
||||
const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -32,8 +32,12 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
|||
data_key,
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
where website_id = {{websiteId::uuid}}
|
||||
and created_at between {{startDate}} and {{endDate}}
|
||||
join website_event on website_event.event_id = event_data.website_event_id
|
||||
and website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
${cohortQuery}
|
||||
where event_data.website_id = {{websiteId::uuid}}
|
||||
and event_data.created_at between {{startDate}} and {{endDate}}
|
||||
${filterQuery}
|
||||
group by website_event_id, data_key
|
||||
) as t
|
||||
|
|
@ -47,7 +51,7 @@ async function clickhouseQuery(
|
|||
filters: QueryFilters,
|
||||
): Promise<{ events: number; properties: number; records: number }[]> {
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -60,7 +64,8 @@ async function clickhouseQuery(
|
|||
event_id,
|
||||
data_key,
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
from event_data website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
${filterQuery}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import clickhouse from '@/lib/clickhouse';
|
|||
import { CLICKHOUSE, PRISMA, runQuery } from '@/lib/db';
|
||||
import { QueryFilters } from '@/lib/types';
|
||||
|
||||
export interface WebsiteEventData {
|
||||
interface WebsiteEventData {
|
||||
value: string;
|
||||
total: number;
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ async function relationalQuery(
|
|||
filters: QueryFilters & { eventName?: string; propertyName?: string },
|
||||
) {
|
||||
const { rawQuery, parseFilters, getDateSQL } = prisma;
|
||||
const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -38,6 +38,9 @@ async function relationalQuery(
|
|||
count(*) as "total"
|
||||
from event_data
|
||||
join website_event on website_event.event_id = event_data.website_event_id
|
||||
and website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
${cohortQuery}
|
||||
where event_data.website_id = {{websiteId::uuid}}
|
||||
and event_data.created_at between {{startDate}} and {{endDate}}
|
||||
and event_data.data_key = {{propertyName}}
|
||||
|
|
@ -56,7 +59,7 @@ async function clickhouseQuery(
|
|||
filters: QueryFilters & { eventName?: string; propertyName?: string },
|
||||
): Promise<{ value: string; total: number }[]> {
|
||||
const { rawQuery, parseFilters } = clickhouse;
|
||||
const { filterQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId });
|
||||
|
||||
return rawQuery(
|
||||
`
|
||||
|
|
@ -65,7 +68,8 @@ async function clickhouseQuery(
|
|||
data_type = 4, toString(date_trunc('hour', date_value)),
|
||||
string_value) as "value",
|
||||
count(*) as "total"
|
||||
from event_data
|
||||
from event_data website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
and data_key = {propertyName:String}
|
||||
|
|
|
|||
|
|
@ -22,9 +22,8 @@ export async function getEventMetrics(
|
|||
async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
||||
const { timezone = 'utc', unit = 'day' } = filters;
|
||||
const { rawQuery, getDateSQL, parseFilters } = prisma;
|
||||
const { filterQuery, joinSessionQuery, queryParams } = parseFilters({
|
||||
const { filterQuery, joinSessionQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
eventType: EVENT_TYPE.customEvent,
|
||||
});
|
||||
|
||||
|
|
@ -36,6 +35,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
|||
count(*) y
|
||||
from website_event
|
||||
${joinSessionQuery}
|
||||
${cohortQuery}
|
||||
where website_event.website_id = {{websiteId::uuid}}
|
||||
and website_event.created_at between {{startDate}} and {{endDate}}
|
||||
and event_type = {{eventType}}
|
||||
|
|
@ -53,7 +53,7 @@ async function clickhouseQuery(
|
|||
): Promise<WebsiteEventMetricData[]> {
|
||||
const { timezone = 'UTC', unit = 'day' } = filters;
|
||||
const { rawQuery, getDateSQL, parseFilters } = clickhouse;
|
||||
const { filterQuery, queryParams } = parseFilters({
|
||||
const { filterQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
eventType: EVENT_TYPE.customEvent,
|
||||
|
|
@ -61,13 +61,14 @@ async function clickhouseQuery(
|
|||
|
||||
let sql = '';
|
||||
|
||||
if (filterQuery) {
|
||||
if (filterQuery || cohortQuery) {
|
||||
sql = `
|
||||
select
|
||||
event_name x,
|
||||
${getDateSQL('created_at', unit, timezone)} t,
|
||||
count(*) y
|
||||
from website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
|
||||
and event_type = {eventType:UInt32}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export function getWebsiteEvents(...args: [websiteId: string, filters: QueryFilt
|
|||
async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
||||
const { pagedRawQuery, parseFilters } = prisma;
|
||||
const { search } = filters;
|
||||
const { filterQuery, dateQuery, queryParams } = parseFilters({
|
||||
const { filterQuery, dateQuery, cohortQuery, queryParams } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
});
|
||||
|
|
@ -39,6 +39,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
|||
event_type as "eventType",
|
||||
event_name as "eventName"
|
||||
from website_event
|
||||
${cohortQuery}
|
||||
where website_id = {{websiteId::uuid}}
|
||||
${dateQuery}
|
||||
${filterQuery}
|
||||
|
|
@ -52,7 +53,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
|
|||
|
||||
async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
|
||||
const { pagedRawQuery, parseFilters } = clickhouse;
|
||||
const { queryParams, dateQuery, filterQuery } = parseFilters({
|
||||
const { queryParams, dateQuery, cohortQuery, filterQuery } = parseFilters({
|
||||
...filters,
|
||||
websiteId,
|
||||
});
|
||||
|
|
@ -82,6 +83,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
|
|||
event_type as eventType,
|
||||
event_name as eventName
|
||||
from website_event
|
||||
${cohortQuery}
|
||||
where website_id = {websiteId:UUID}
|
||||
${dateQuery}
|
||||
${filterQuery}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue