mirror of
https://github.com/umami-software/umami.git
synced 2026-02-05 13:17:19 +01:00
* Initial Typescript models. * Re-add realtime data * get distinct sessions for session metrics * Add queries for new schema. * Fix Typo. * Add some api/team endpoints. * Fix destructure error. * Fix getWebsites call. * Ignore typescript build errors. * Fix enum issue. * add clickhouse route to deleteWebsite * Fix Website auth. * Updated lint-staged config. * Add permission checks. * Add user role api. * Fix error when updating website. * Fix isAdmin check. Fix Schema. * Initial conversion to react-basics. * Remove user/team transfer from website update. * delete website in relational query * Fix login secure token creation. * Add event type to event. * Allow user to be added to team with role. * Updated login form. * Add Role to TeamUser. * Add database migration. * Refactored permissions check. Updated redis lib. * Feat/um 114 roles and permissions (#1683) * Auth checkpoint. * Merge branch 'dev' into feat/um-114-roles-and-permissions * Add 02 migration. * Added lib/types. * Updated schema. * Updated roles and permissions logic. * Implement react-basics styles. Fix queries. * Update website details layout. * Add 01 migration. * Fix admin create. * Update react-basics. Co-authored-by: Francis Cao <franciscao@gmail.com> Co-authored-by: Mike Cao <mike@mikecao.com> Co-authored-by: Mike Cao <moocao@gmail.com>
68 lines
1.9 KiB
TypeScript
68 lines
1.9 KiB
TypeScript
import prisma from 'lib/prisma';
|
|
import clickhouse from 'lib/clickhouse';
|
|
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
|
|
import cache from 'lib/cache';
|
|
|
|
export async function getSessionMetrics(
|
|
...args: [
|
|
websiteId: string,
|
|
data: { startDate: Date; endDate: Date; field: string; filters: object },
|
|
]
|
|
) {
|
|
return runQuery({
|
|
[PRISMA]: () => relationalQuery(...args),
|
|
[CLICKHOUSE]: () => clickhouseQuery(...args),
|
|
});
|
|
}
|
|
|
|
async function relationalQuery(
|
|
websiteId: string,
|
|
data: { startDate: Date; endDate: Date; field: string; filters: object },
|
|
) {
|
|
const { startDate, endDate, field, filters = {} } = data;
|
|
const { parseFilters, rawQuery } = prisma;
|
|
const params = [startDate, endDate];
|
|
const { filterQuery, joinSession } = parseFilters(filters, params);
|
|
|
|
return rawQuery(
|
|
`select ${field} x, count(*) y
|
|
from session as x
|
|
where x.session_id in (
|
|
select pageview.session_id
|
|
from pageview
|
|
join website
|
|
on pageview.website_id = website.website_id
|
|
${joinSession}
|
|
where website.website_id='${websiteId}'
|
|
and pageview.created_at between $1 and $2
|
|
${filterQuery}
|
|
)
|
|
group by 1
|
|
order by 2 desc`,
|
|
params,
|
|
);
|
|
}
|
|
|
|
async function clickhouseQuery(
|
|
websiteId: string,
|
|
data: { startDate: Date; endDate: Date; field: string; filters: object },
|
|
) {
|
|
const { startDate, endDate, field, filters = {} } = data;
|
|
const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
|
|
const website = await cache.fetchWebsite(websiteId);
|
|
const params = [websiteId, website?.revId || 0];
|
|
const { filterQuery } = parseFilters(filters, params);
|
|
|
|
return rawQuery(
|
|
`select ${field} x, count(distinct session_id) y
|
|
from event as x
|
|
where website_id = $1
|
|
and rev_id = $2
|
|
and event_name = ''
|
|
and ${getBetweenDates('created_at', startDate, endDate)}
|
|
${filterQuery}
|
|
group by x
|
|
order by y desc`,
|
|
params,
|
|
);
|
|
}
|