m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed relational query to get reset_at

Browse Source
This commit is contained in:
Francis Cao 2023-03-27 12:11:06 -07:00
parent cb79d806e8
commit fbe35f4c97
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
queries/analytics/event/getEventMetrics.ts
View File

@ -4,6 +4,7 @@ import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache'; import cache from 'lib/cache';
import { WebsiteEventMetric } from 'lib/types'; import { WebsiteEventMetric } from 'lib/types';
import { EVENT_TYPE } from 'lib/constants'; import { EVENT_TYPE } from 'lib/constants';
import { getWebsite } from 'queries';
export async function getEventMetrics( export async function getEventMetrics(
...args: [ ...args: [
@ -46,7 +47,7 @@ async function relationalQuery(
}, },
) { ) {
const { toUuid, rawQuery, getDateQuery, getFilterQuery } = prisma; const { toUuid, rawQuery, getDateQuery, getFilterQuery } = prisma;
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params: any = [websiteId, resetDate, startDate, endDate]; const params: any = [websiteId, resetDate, startDate, endDate];

3
queries/analytics/eventData/getEventData.ts
View File

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db'; import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma'; import prisma from 'lib/prisma';
import { WebsiteEventDataMetric } from 'lib/types'; import { WebsiteEventDataMetric } from 'lib/types';
import { getWebsite } from 'queries';
export async function getEventData( export async function getEventData(
...args: [ ...args: [
@ -48,7 +49,7 @@ async function relationalQuery(
) { ) {
const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data; const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data;
const { toUuid, rawQuery, getEventDataFilterQuery, getDateQuery } = prisma; const { toUuid, rawQuery, getEventDataFilterQuery, getDateQuery } = prisma;
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params: any = [websiteId, resetDate, startDate, endDate, eventName || '']; const params: any = [websiteId, resetDate, startDate, endDate, eventName || ''];

3
queries/analytics/pageview/getPageviewMetrics.ts
View File

@ -4,6 +4,7 @@ import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache'; import cache from 'lib/cache';
import { Prisma } from '@prisma/client'; import { Prisma } from '@prisma/client';
import { EVENT_TYPE } from 'lib/constants'; import { EVENT_TYPE } from 'lib/constants';
import { getWebsite } from 'queries';
export async function getPageviewMetrics( export async function getPageviewMetrics(
...args: [ ...args: [
@ -35,7 +36,7 @@ async function relationalQuery(
) { ) {
const { startDate, endDate, column, filters = {}, type } = data; const { startDate, endDate, column, filters = {}, type } = data;
const { rawQuery, parseFilters, toUuid } = prisma; const { rawQuery, parseFilters, toUuid } = prisma;
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params: any = [ const params: any = [
websiteId, websiteId,

3
queries/analytics/pageview/getPageviewStats.ts
View File

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db'; import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
import prisma from 'lib/prisma'; import prisma from 'lib/prisma';
import { EVENT_TYPE } from 'lib/constants'; import { EVENT_TYPE } from 'lib/constants';
import { getWebsite } from 'queries';
export async function getPageviewStats( export async function getPageviewStats(
...args: [ ...args: [
@ -46,7 +47,7 @@ async function relationalQuery(
sessionKey = 'session_id', sessionKey = 'session_id',
} = data; } = data;
const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma; const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma;
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params: any = [websiteId, resetDate, startDate, endDate]; const params: any = [websiteId, resetDate, startDate, endDate];
const { filterQuery, joinSession } = parseFilters(filters, params); const { filterQuery, joinSession } = parseFilters(filters, params);

3
queries/analytics/session/getSessionMetrics.ts
View File

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db'; import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache'; import cache from 'lib/cache';
import { EVENT_TYPE } from 'lib/constants'; import { EVENT_TYPE } from 'lib/constants';
import { getWebsite } from 'queries';
export async function getSessionMetrics( export async function getSessionMetrics(
...args: [ ...args: [
@ -20,7 +21,7 @@ async function relationalQuery(
websiteId: string, websiteId: string,
data: { startDate: Date; endDate: Date; field: string; filters: object }, data: { startDate: Date; endDate: Date; field: string; filters: object },
) { ) {
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const { startDate, endDate, field, filters = {} } = data; const { startDate, endDate, field, filters = {} } = data;
const { toUuid, parseFilters, rawQuery } = prisma; const { toUuid, parseFilters, rawQuery } = prisma;

3
queries/analytics/stats/getWebsiteStats.ts
View File

@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';
import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db'; import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
import cache from 'lib/cache'; import cache from 'lib/cache';
import { EVENT_TYPE } from 'lib/constants'; import { EVENT_TYPE } from 'lib/constants';
import { getWebsite } from 'queries';
export async function getWebsiteStats( export async function getWebsiteStats(
...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }] ...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }]
@ -19,7 +20,7 @@ async function relationalQuery(
) { ) {
const { startDate, endDate, filters = {} } = data; const { startDate, endDate, filters = {} } = data;
const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma; const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const website = await cache.fetchWebsite(websiteId); const website = await getWebsite({ id: websiteId });
const resetDate = website?.resetAt || website?.createdAt; const resetDate = website?.resetAt || website?.createdAt;
const params: any = [websiteId, resetDate, startDate, endDate]; const params: any = [websiteId, resetDate, startDate, endDate];
const { filterQuery, joinSession } = parseFilters(filters, params); const { filterQuery, joinSession } = parseFilters(filters, params);