update schema and queries to implement reset_at

db/clickhouse/schema.sql

@@ -6,7 +6,6 @@ CREATE TABLE umami.event
     website_id UUID,
     session_id UUID,
     event_id UUID,
-    rev_id UInt32,
     --session
     hostname LowCardinality(String),
     browser LowCardinality(String),
@@ -38,7 +37,6 @@ CREATE TABLE umami.event_queue (
     website_id UUID,
     session_id UUID,
     event_id UUID,
-    rev_id UInt32,
     --session
     hostname LowCardinality(String),
     browser LowCardinality(String),
@@ -74,7 +72,6 @@ CREATE MATERIALIZED VIEW umami.event_queue_mv TO umami.event AS
 SELECT website_id,
     session_id,
     event_id,
-    rev_id,
     hostname,
     browser,
     os,
@@ -101,7 +98,6 @@ CREATE TABLE umami.event_data
     website_id UUID,
     session_id UUID,
     event_id UUID,
-    rev_id UInt32,
     url_path String,
     event_name String,
     event_key String,
@@ -119,7 +115,6 @@ CREATE TABLE umami.event_data_queue (
     website_id UUID,
     session_id UUID,
     event_id UUID,
-    rev_id UInt32,
     url_path String,
     event_name String,
     event_key String,
@@ -141,7 +136,6 @@ CREATE MATERIALIZED VIEW umami.event_data_queue_mv TO umami.event_data AS
 SELECT website_id,
     session_id,
     event_id,
-    rev_id,
     url_path,
     event_name,
     event_key,

db/mysql/schema.prisma

@@ -50,7 +50,7 @@ model Website {
   name      String    @db.VarChar(100)
   domain    String?   @db.VarChar(500)
   shareId   String?   @unique @map("share_id") @db.VarChar(50)
-  revId     Int       @default(0) @map("rev_id") @db.UnsignedInt
+  resetAt   DateTime? @map("reset_at") @db.Timestamp(0)
   userId    String?   @map("user_id") @db.VarChar(36)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
   updatedAt DateTime? @map("updated_at") @db.Timestamp(0)

db/postgresql/schema.prisma

@@ -50,7 +50,7 @@ model Website {
   name      String    @db.VarChar(100)
   domain    String?   @db.VarChar(500)
   shareId   String?   @unique @map("share_id") @db.VarChar(50)
-  revId     Int       @default(0) @map("rev_id") @db.Integer
+  resetAt   DateTime? @map("reset_at") @db.Timestamptz(6)
   userId    String?   @map("user_id") @db.Uuid
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
   updatedAt DateTime? @map("updated_at") @db.Timestamptz(6)

lib/types.ts

@@ -48,7 +48,7 @@ export interface User {
 export interface Website {
   id: string;
   userId: string;
-  revId: number;
+  resetAt: Date;
   name: string;
   domain: string;
   shareId: string;

queries/admin/website.ts

@@ -49,8 +49,6 @@ export async function resetWebsite(
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
 
-  const { revId } = await getWebsite({ id: websiteId });
-
   return transaction([
     client.websiteEvent.deleteMany({
       where: { websiteId },
@@ -58,7 +56,12 @@ export async function resetWebsite(
     client.session.deleteMany({
       where: { websiteId },
     }),
-    client.website.update({ where: { id: websiteId }, data: { revId: revId + 1 } }),
+    client.website.update({
+      where: { id: websiteId },
+      data: {
+        resetAt: new Date(),
+      },
+    }),
   ]).then(async data => {
     if (cache.enabled) {
       await cache.storeWebsite(data[2]);

queries/analytics/event/getEventMetrics.ts

@@ -46,7 +46,9 @@ async function relationalQuery(
   },
 ) {
   const { toUuid, rawQuery, getDateQuery, getFilterQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate];
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params: any = [websiteId, resetDate, startDate, endDate];
 
   return rawQuery(
     `select
@@ -55,7 +57,8 @@ async function relationalQuery(
       count(*) y
     from website_event
     where website_id = $1${toUuid()}
-      and created_at between $2 and $3
+      and created_at >= $2
+      and created_at between $3 and $4
       and event_type = ${EVENT_TYPE.customEvent}
       ${getFilterQuery(filters, params)}
     group by 1, 2
@@ -83,9 +86,10 @@ async function clickhouseQuery(
     };
   },
 ) {
-  const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
+  const { rawQuery, getDateQuery, getDateFormat, getBetweenDates, getFilterQuery } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params = { websiteId };
 
   return rawQuery(
     `select
@@ -94,8 +98,8 @@ async function clickhouseQuery(
       count(*) y
     from event
     where website_id = {websiteId:UUID}
-    and rev_id = {revId:UInt32}
       and event_type = ${EVENT_TYPE.customEvent}
+      and created_at >= ${getDateFormat(resetDate)}
       and ${getBetweenDates('created_at', startDate, endDate)}
       ${getFilterQuery(filters, params)}
     group by x, t

queries/analytics/event/saveEvent.ts

@@ -3,7 +3,6 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
 import { uuid } from 'lib/crypto';
-import cache from 'lib/cache';
 import { saveEventData } from '../eventData/saveEventData';
 
 export async function saveEvent(args: {
@@ -41,7 +40,6 @@ async function relationalQuery(data: {
   eventData?: any;
 }) {
   const { websiteId, id: sessionId, urlPath, urlQuery, eventName, eventData, pageTitle } = data;
-  const website = await cache.fetchWebsite(websiteId);
   const websiteEventId = uuid();
 
   const websiteEvent = prisma.client.websiteEvent.create({
@@ -62,7 +60,6 @@ async function relationalQuery(data: {
       websiteId,
       sessionId,
       eventId: websiteEventId,
-      revId: website?.revId,
       urlPath: urlPath?.substring(0, URL_LENGTH),
       eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
       eventData,
@@ -106,7 +103,6 @@ async function clickhouseQuery(data: {
     ...args
   } = data;
   const { getDateFormat, sendMessage } = kafka;
-  const website = await cache.fetchWebsite(websiteId);
   const eventId = uuid();
   const createdAt = getDateFormat(new Date());
 
@@ -123,7 +119,6 @@ async function clickhouseQuery(data: {
     page_title: pageTitle,
     event_type: EVENT_TYPE.customEvent,
     event_name: eventName?.substring(0, EVENT_NAME_LENGTH),
-    rev_id: website?.revId || 0,
     created_at: createdAt,
     ...args,
   };
@@ -135,7 +130,6 @@ async function clickhouseQuery(data: {
       websiteId,
       sessionId,
       eventId,
-      revId: website?.revId,
       urlPath: urlPath?.substring(0, URL_LENGTH),
       eventName: eventName?.substring(0, EVENT_NAME_LENGTH),
       eventData,

queries/analytics/eventData/getEventData.ts

@@ -48,7 +48,9 @@ async function relationalQuery(
 ) {
   const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data;
   const { toUuid, rawQuery, getEventDataFilterQuery, getDateQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate, eventName || ''];
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params: any = [websiteId, resetDate, startDate, endDate, eventName || ''];
 
   return rawQuery(
     `select
@@ -65,8 +67,9 @@ async function relationalQuery(
           : ''
       }
     where website_id = $1${toUuid()}
-      and created_at between $2 and $3
+      and created_at >= $2
-      ${eventName ? `and eventName = $4` : ''}
+      and created_at between $3 and $4
+      ${eventName ? `and eventName = $5` : ''}
       ${getEventDataFilterQuery(filters, params)}
       ${timeSeries ? 'group by t' : ''}`,
     params,
@@ -93,9 +96,11 @@ async function clickhouseQuery(
   },
 ) {
   const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data;
-  const { rawQuery, getBetweenDates, getDateQuery, getEventDataFilterQuery } = clickhouse;
+  const { rawQuery, getDateFormat, getBetweenDates, getDateQuery, getEventDataFilterQuery } =
+    clickhouse;
   const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params = { websiteId };
 
   return rawQuery(
     `select
@@ -107,8 +112,8 @@ async function clickhouseQuery(
         }
     from event_data
     where website_id = {websiteId:UUID}
-      and rev_id = {revId:UInt32}
       ${eventName ? `and eventName = ${eventName}` : ''}
+      and created_at >= ${getDateFormat(resetDate)}
       and ${getBetweenDates('created_at', startDate, endDate)}
       ${getEventDataFilterQuery(filters, params)}
       ${timeSeries ? 'group by t' : ''}`,

queries/analytics/eventData/saveEventData.ts

@@ -11,7 +11,6 @@ export async function saveEventData(args: {
   websiteId: string;
   eventId: string;
   sessionId?: string;
-  revId?: number;
   urlPath?: string;
   eventName?: string;
   eventData: EventData;
@@ -58,13 +57,12 @@ async function clickhouseQuery(data: {
   websiteId: string;
   eventId: string;
   sessionId?: string;
-  revId?: number;
   urlPath?: string;
   eventName?: string;
   eventData: EventData;
   createdAt?: string;
 }) {
-  const { websiteId, sessionId, eventId, revId, urlPath, eventName, eventData, createdAt } = data;
+  const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
   const { getDateFormat, sendMessages } = kafka;
 
@@ -74,7 +72,6 @@ async function clickhouseQuery(data: {
     website_id: websiteId,
     session_id: sessionId,
     event_id: eventId,
-    rev_id: revId,
     url_path: urlPath,
     event_name: eventName,
     event_key: a.key,

queries/analytics/pageview/getPageviewMetrics.ts

@@ -35,8 +35,11 @@ async function relationalQuery(
 ) {
   const { startDate, endDate, column, filters = {}, type } = data;
   const { rawQuery, parseFilters, toUuid } = prisma;
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
   const params: any = [
     websiteId,
+    resetDate,
     startDate,
     endDate,
     type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
@@ -48,8 +51,9 @@ async function relationalQuery(
     from website_event
       ${joinSession}
     where website_event.website_id = $1${toUuid()}
-      and website_event.created_at between $2 and $3
+      and website_event.created_at >= $2
-      and event_type = $4
+      and website_event.created_at between $3 and $4
+      and event_type = $5
       ${filterQuery}
     group by 1
     order by 2 desc
@@ -69,11 +73,11 @@ async function clickhouseQuery(
   },
 ) {
   const { startDate, endDate, column, filters = {}, type } = data;
-  const { rawQuery, parseFilters, getBetweenDates } = clickhouse;
+  const { rawQuery, getDateFormat, parseFilters, getBetweenDates } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
   const params = {
     websiteId,
-    revId: website?.revId || 0,
     eventType: type === 'event' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   };
   const { filterQuery } = parseFilters(filters, params);
@@ -82,8 +86,8 @@ async function clickhouseQuery(
     `select ${column} x, count(*) y
     from event
     where website_id = {websiteId:UUID}
-      and rev_id = {revId:UInt32}
       and event_type = {eventType:UInt32}
+      and created_at >= ${getDateFormat(resetDate)}
       and ${getBetweenDates('created_at', startDate, endDate)}
       ${filterQuery}
     group by x

queries/analytics/pageview/getPageviewStats.ts

@@ -46,7 +46,9 @@ async function relationalQuery(
     sessionKey = 'session_id',
   } = data;
   const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate];
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params: any = [websiteId, resetDate, startDate, endDate];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
@@ -55,7 +57,8 @@ async function relationalQuery(
       from website_event
         ${joinSession}
       where website_event.website_id = $1${toUuid()}
-        and website_event.created_at between $2 and $3
+        and website_event.created_at >= $2
+        and website_event.created_at between $3 and $4
         and event_type = ${EVENT_TYPE.pageView}
         ${filterQuery}
       group by 1`,
@@ -76,9 +79,17 @@ async function clickhouseQuery(
   },
 ) {
   const { startDate, endDate, timezone = 'UTC', unit = 'day', count = '*', filters = {} } = data;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery, getBetweenDates } = clickhouse;
+  const {
+    parseFilters,
+    getDateFormat,
+    rawQuery,
+    getDateStringQuery,
+    getDateQuery,
+    getBetweenDates,
+  } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 
   return rawQuery(
@@ -91,8 +102,8 @@ async function clickhouseQuery(
         count(${count !== '*' ? 'distinct session_id' : count}) y
       from event
       where website_id = {websiteId:UUID}
-        and rev_id = {revId:UInt32}
         and event_type = ${EVENT_TYPE.pageView}
+        and created_at >= ${getDateFormat(resetDate)}
         and ${getBetweenDates('created_at', startDate, endDate)}
         ${filterQuery}
       group by t) g

queries/analytics/pageview/savePageView.ts

@@ -2,7 +2,6 @@ import { URL_LENGTH, EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
-import cache from 'lib/cache';
 import { uuid } from 'lib/crypto';
 
 export async function savePageView(args: {
@@ -104,13 +103,11 @@ async function clickhouseQuery(data: {
     ...args
   } = data;
   const { getDateFormat, sendMessage } = kafka;
-  const website = await cache.fetchWebsite(websiteId);
 
   const message = {
     website_id: websiteId,
     session_id: sessionId,
     event_id: uuid(),
-    rev_id: website?.revId || 0,
     country: country ? country : null,
     subdivision1: subdivision1 ? subdivision1 : null,
     subdivision2: subdivision2 ? subdivision2 : null,

queries/analytics/session/createSession.ts

@@ -50,7 +50,6 @@ async function clickhouseQuery(data: {
     city,
   } = data;
   const { getDateFormat, sendMessage } = kafka;
-  const website = await cache.fetchWebsite(websiteId);
 
   const msg = {
     session_id: id,
@@ -65,7 +64,6 @@ async function clickhouseQuery(data: {
     subdivision1,
     subdivision2,
     city,
-    rev_id: website?.revId || 0,
     created_at: getDateFormat(new Date()),
   };
 

queries/analytics/session/getSessionMetrics.ts

@@ -20,9 +20,11 @@ async function relationalQuery(
   websiteId: string,
   data: { startDate: Date; endDate: Date; field: string; filters: object },
 ) {
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
   const { startDate, endDate, field, filters = {} } = data;
   const { toUuid, parseFilters, rawQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate];
+  const params: any = [websiteId, resetDate, startDate, endDate];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
@@ -35,7 +37,8 @@ async function relationalQuery(
           on website_event.website_id = website.website_id
         ${joinSession}
       where website.website_id = $1${toUuid()}
-      and website_event.created_at between $2 and $3
+        and website_event.created_at >= $2
+        and website_event.created_at between $3 and $4
       ${filterQuery}
     )
     group by 1
@@ -50,17 +53,18 @@ async function clickhouseQuery(
   data: { startDate: Date; endDate: Date; field: string; filters: object },
 ) {
   const { startDate, endDate, field, filters = {} } = data;
-  const { parseFilters, getBetweenDates, rawQuery } = clickhouse;
+  const { getDateFormat, parseFilters, getBetweenDates, rawQuery } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 
   return rawQuery(
     `select ${field} x, count(distinct session_id) y
     from event as x
     where website_id = {websiteId:UUID}
-    and rev_id = {revId:UInt32}
     and event_type = ${EVENT_TYPE.pageView}
+      and created_at >= ${getDateFormat(resetDate)}
       and ${getBetweenDates('created_at', startDate, endDate)}
       ${filterQuery}
     group by x

queries/analytics/stats/getWebsiteStats.ts

@@ -19,7 +19,9 @@ async function relationalQuery(
 ) {
   const { startDate, endDate, filters = {} } = data;
   const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
-  const params: any = [websiteId, startDate, endDate];
+  const website = await cache.fetchWebsite(websiteId);
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params: any = [websiteId, resetDate, startDate, endDate];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
@@ -37,7 +39,8 @@ async function relationalQuery(
             on website_event.website_id = website.website_id
           ${joinSession}
         where website.website_id = $1${toUuid()}
-          and website_event.created_at between $2 and $3
+          and website_event.created_at >= $2
+          and website_event.created_at between $3 and $4
           ${filterQuery}
         group by 1, 2
      ) t`,
@@ -50,9 +53,10 @@ async function clickhouseQuery(
   data: { startDate: Date; endDate: Date; filters: object },
 ) {
   const { startDate, endDate, filters = {} } = data;
-  const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
+  const { rawQuery, getDateFormat, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
-  const params = { websiteId, revId: website?.revId || 0 };
+  const resetDate = website?.resetAt || website?.createdAt;
+  const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 
   return rawQuery(
@@ -70,8 +74,8 @@ async function clickhouseQuery(
        from event
        where event_type = ${EVENT_TYPE.pageView}
         and website_id = {websiteId:UUID}
-        and rev_id = {revId:UInt32}
+          and created_at >= ${getDateFormat(resetDate)}
-         and ${getBetweenDates('created_at', startDate, endDate)}
+          and ${getBetweenDates('created_at', startDate, endDate)}
          ${filterQuery}
        group by session_id, time_series
      ) t;`,