Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fixed relational query to get reset_at
Francis Caofbe35f4c97a3
diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.tsindex 35eda8f6d..f69d9bb17 100644--- a/queries/analytics/event/getEventMetrics.ts+++ b/queries/analytics/event/getEventMetrics.ts@@ -4,6 +4,7 @@ import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import cache from 'lib/cache';import { WebsiteEventMetric } from 'lib/types';import { EVENT_TYPE } from 'lib/constants';+import { getWebsite } from 'queries';export async function getEventMetrics(...args: [@@ -46,7 +47,7 @@ async function relationalQuery(},) {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 params: any = [websiteId, resetDate, startDate, endDate];diff --git a/queries/analytics/eventData/getEventData.ts b/queries/analytics/eventData/getEventData.tsindex f8e2febb2..cd44d29a9 100644--- a/queries/analytics/eventData/getEventData.ts+++ b/queries/analytics/eventData/getEventData.ts@@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';import prisma from 'lib/prisma';import { WebsiteEventDataMetric } from 'lib/types';+import { getWebsite } from 'queries';export async function getEventData(...args: [@@ -48,7 +49,7 @@ async function relationalQuery() {const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data;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 params: any = [websiteId, resetDate, startDate, endDate, eventName || ''];diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.tsindex 09524047f..534645911 100644--- a/queries/analytics/pageview/getPageviewMetrics.ts+++ b/queries/analytics/pageview/getPageviewMetrics.ts@@ -4,6 +4,7 @@ import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import cache from 'lib/cache';import { Prisma } from '@prisma/client';import { EVENT_TYPE } from 'lib/constants';+import { getWebsite } from 'queries';export async function getPageviewMetrics(...args: [@@ -35,7 +36,7 @@ async function relationalQuery() {const { startDate, endDate, column, filters = {}, type } = data;const { rawQuery, parseFilters, toUuid } = prisma;- const website = await cache.fetchWebsite(websiteId);+ const website = await getWebsite({ id: websiteId });const resetDate = website?.resetAt || website?.createdAt;const params: any = [websiteId,diff --git a/queries/analytics/pageview/getPageviewStats.ts b/queries/analytics/pageview/getPageviewStats.tsindex c6197312b..894f512b9 100644--- a/queries/analytics/pageview/getPageviewStats.ts+++ b/queries/analytics/pageview/getPageviewStats.ts@@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';import prisma from 'lib/prisma';import { EVENT_TYPE } from 'lib/constants';+import { getWebsite } from 'queries';export async function getPageviewStats(...args: [@@ -46,7 +47,7 @@ async function relationalQuery(sessionKey = 'session_id',} = data;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 params: any = [websiteId, resetDate, startDate, endDate];const { filterQuery, joinSession } = parseFilters(filters, params);diff --git a/queries/analytics/session/getSessionMetrics.ts b/queries/analytics/session/getSessionMetrics.tsindex 073f93f66..dc391d84c 100644--- a/queries/analytics/session/getSessionMetrics.ts+++ b/queries/analytics/session/getSessionMetrics.ts@@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import cache from 'lib/cache';import { EVENT_TYPE } from 'lib/constants';+import { getWebsite } from 'queries';export async function getSessionMetrics(...args: [@@ -20,7 +21,7 @@ async function relationalQuery(websiteId: string,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 { startDate, endDate, field, filters = {} } = data;const { toUuid, parseFilters, rawQuery } = prisma;diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/stats/getWebsiteStats.tsindex d11de565e..39a89cbc4 100644--- a/queries/analytics/stats/getWebsiteStats.ts+++ b/queries/analytics/stats/getWebsiteStats.ts@@ -3,6 +3,7 @@ import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import cache from 'lib/cache';import { EVENT_TYPE } from 'lib/constants';+import { getWebsite } from 'queries';export async function getWebsiteStats(...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }]@@ -19,7 +20,7 @@ async function relationalQuery() {const { startDate, endDate, filters = {} } = data;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 params: any = [websiteId, resetDate, startDate, endDate];const { filterQuery, joinSession } = parseFilters(filters, params);