📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
moved clickhouse reset data to the service
Blue Mouseaa26e668ee87
diff --git a/src/project/project.controller.ts b/src/project/project.controller.tsindex b704095f5..e2b72dad5 100644--- a/src/project/project.controller.ts+++ b/src/project/project.controller.ts@@ -827,9 +827,6 @@ export class ProjectController {throw new BadRequestException('The provided \'to\' date is incorrect',)}- from = dayjs(from).format('YYYY-MM-DD')- to = dayjs(to).format('YYYY-MM-DD 23:59:59')-const project = await this.projectService.findOne(pid, {relations: ['admin', 'share'],})@@ -840,20 +837,10 @@ export class ProjectController {this.projectService.allowedToManage(project, uid)- const queryAnalytics = 'ALTER TABLE analytics DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryCustomEvents = 'ALTER TABLE customEV DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const queryPerformance = 'ALTER TABLE performance DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'- const params = {- params: {- pid, from, to,- },- }+ from = dayjs(from).format('YYYY-MM-DD')+ to = dayjs(to).format('YYYY-MM-DD 23:59:59')- await Promise.all([- clickhouse.query(queryAnalytics, params).toPromise(),- clickhouse.query(queryCustomEvents, params).toPromise(),- clickhouse.query(queryPerformance, params).toPromise(),- ])+ await this.projectService.removeDataFromClickhouse(pid, from, to)}// The routes related to sharing projects featurediff --git a/src/project/project.service.ts b/src/project/project.service.tsindex 3f9d059c2..e70bd5fd8 100644--- a/src/project/project.service.ts+++ b/src/project/project.service.ts@@ -347,6 +347,23 @@ export class ProjectService {}}+ async removeDataFromClickhouse(pid: string, from: string, to: string): Promise<void> {+ const queryAnalytics = 'ALTER TABLE analytics DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'+ const queryCustomEvents = 'ALTER TABLE customEV DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'+ const queryPerformance = 'ALTER TABLE performance DELETE WHERE pid = {pid:FixedString(12)} AND created BETWEEN {from:String} AND {to:String}'+ const params = {+ params: {+ pid, from, to,+ },+ }++ await Promise.all([+ clickhouse.query(queryAnalytics, params).toPromise(),+ clickhouse.query(queryCustomEvents, params).toPromise(),+ clickhouse.query(queryPerformance, params).toPromise(),+ ])+ }+formatToClickhouse(project: Project): object {const updProject = { ...project }// @ts-ignore