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

Fix Website auth.

Browse source
This commit is contained in:
Brian Cao 2022-11-18 18:49:58 -08:00
parent 1af93a17a3
commit e28ee6597a
23 changed files with 108 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

16
queries/analytics/event/getEventData.ts
View file

@ -3,7 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import cache from 'lib/cache';
import { WebsiteMetric } from 'interface/api/models';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function getEventData(
...args: [
@ -11,7 +11,7 @@ export async function getEventData(
data: {
startDate: Date;
endDate: Date;
event_name: string;
eventName: string;
columns: any;
filters: object;
},
@ -32,12 +32,12 @@ async function relationalQuery(
data: {
startDate: Date;
endDate: Date;
event_name: string;
eventName: string;
columns: any;
filters: object;
},
) {
const { startDate, endDate, event_name, columns, filters } = data;
const { startDate, endDate, eventName, columns, filters } = data;
const { rawQuery, getEventDataColumnsQuery, getEventDataFilterQuery } = prisma;
const params = [startDate, endDate];
@ -48,7 +48,7 @@ async function relationalQuery(
where website_id ='${websiteId}'
and created_at between $1 and $2
and event_type = ${UmamiApi.EventType.Event}
${event_name ? `and event_name = ${event_name}` : ''}
${eventName ? `and eventName = ${eventName}` : ''}
${
Object.keys(filters).length > 0
? `and ${getEventDataFilterQuery('event_data', filters)}`
@ -63,12 +63,12 @@ async function clickhouseQuery(
data: {
startDate: Date;
endDate: Date;
event_name: string;
eventName: string;
columns: any;
filters: object;
},
) {
const { startDate, endDate, event_name, columns, filters } = data;
const { startDate, endDate, eventName, columns, filters } = data;
const { rawQuery, getBetweenDates, getEventDataColumnsQuery, getEventDataFilterQuery } =
clickhouse;
const website = await cache.fetchWebsite(websiteId);
@ -81,7 +81,7 @@ async function clickhouseQuery(
where website_id = $1
and rev_id = $2
and event_type = ${UmamiApi.EventType.Event}
${event_name ? `and event_name = ${event_name}` : ''}
${eventName ? `and eventName = ${eventName}` : ''}
and ${getBetweenDates('created_at', startDate, endDate)}
${
Object.keys(filters).length > 0

2
queries/analytics/event/getEventMetrics.ts
View file

@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { WebsiteEventMetric } from 'interface/api/models';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function getEventMetrics(
...args: [

2
queries/analytics/event/saveEvent.ts
View file

@ -4,7 +4,7 @@ import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import { uuid } from 'lib/crypto';
import cache from 'lib/cache';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function saveEvent(args: {
id: string;

2
queries/analytics/pageview/getPageviewMetrics.ts
View file

@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache';
import { Prisma } from '@prisma/client';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function getPageviewMetrics(
...args: [

2
queries/analytics/pageview/getPageviewStats.ts
View file

@ -2,7 +2,7 @@ import cache from 'lib/cache';
import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function getPageviewStats(
...args: [

2
queries/analytics/pageview/savePageView.ts
View file

@ -4,7 +4,7 @@ import kafka from 'lib/kafka';
import prisma from 'lib/prisma';
import cache from 'lib/cache';
import { uuid } from 'lib/crypto';
import { UmamiApi } from 'lib/enum';
import { UmamiApi } from 'lib/constants';
export async function savePageView(args: {
id: string;