mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-16 02:05:04 +01:00
8732d056dd
* 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>
40 lines
1.0 KiB
TypeScript
40 lines
1.0 KiB
TypeScript
import { subMinutes } from 'date-fns';
|
|
import prisma from 'lib/prisma';
|
|
import clickhouse from 'lib/clickhouse';
|
|
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
|
|
|
|
export async function getActiveVisitors(...args: [websiteId: string]) {
|
|
return runQuery({
|
|
[PRISMA]: () => relationalQuery(...args),
|
|
[CLICKHOUSE]: () => clickhouseQuery(...args),
|
|
});
|
|
}
|
|
|
|
async function relationalQuery(websiteId: string) {
|
|
const date = subMinutes(new Date(), 5);
|
|
const params = [date];
|
|
|
|
return prisma.rawQuery(
|
|
`select count(distinct session_id) x
|
|
from pageview
|
|
join website
|
|
on pageview.website_id = website.website_id
|
|
where website.website_id = '${websiteId}'
|
|
and pageview.created_at >= $1`,
|
|
params,
|
|
);
|
|
}
|
|
|
|
async function clickhouseQuery(websiteId: string) {
|
|
const { rawQuery, getDateFormat } = clickhouse;
|
|
const params = [websiteId];
|
|
|
|
return rawQuery(
|
|
`select count(distinct session_id) x
|
|
from event
|
|
where website_id = $1
|
|
and created_at >= ${getDateFormat(subMinutes(new Date(), 5))}`,
|
|
params,
|
|
);
|
|
}
|