📈 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
using parameterised SELECTs of custom parameters
Blue Mouse5931a2813b9f
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex 4c6ccef5b..64aa4f765 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -94,9 +94,17 @@ export class AnalyticsController {let groupFrom = from, groupTo = to- let queryCustoms = `SELECT ev, count() FROM customEV WHERE pid='${pid}'`+ let queryCustoms = 'SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)}'let subQuery = `FROM analytics WHERE pid='${pid}' ${filtersQuery}`+ const paramsData = {+ params: {+ pid,+ groupFrom: null,+ groupTo: null,+ },+ }+if (!_isEmpty(from) && !_isEmpty(to)) {throw new NotImplementedException('Filtering by from/to params is currently not available')if (dayjs.utc(from).isAfter(dayjs.utc(to), 'second')) {@@ -110,17 +118,22 @@ export class AnalyticsController {queryCustoms += ` AND created BETWEEN ${from} AND ${to} GROUP BY ev`}} else if (!_isEmpty(period)) {- groupFrom = dayjs.utc().subtract(parseInt(period), _last(period)).format('YYYY-MM-DD')- groupTo = dayjs.utc().format('YYYY-MM-DD 23:59:59')- queryCustoms += ` AND created BETWEEN '${groupFrom}' AND '${groupTo}' GROUP BY ev`- subQuery += ` AND created BETWEEN '${groupFrom}' AND '${groupTo}'`+ paramsData.params.groupFrom = dayjs.utc().subtract(parseInt(period), _last(period)).format('YYYY-MM-DD')+ paramsData.params.groupTo = dayjs.utc().format('YYYY-MM-DD 23:59:59')++ // temp+ groupFrom = paramsData.params.groupFrom+ groupTo = paramsData.params.groupTo++ queryCustoms += ' AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev'+ subQuery += ' AND created BETWEEN {groupFrom:String} AND {groupTo:String}'} else {throw new BadRequestException('The timeframe (either from/to pair or period) to be provided')}- const result = await this.analyticsService.groupByTimeBucket(timeBucket, groupFrom, groupTo, subQuery, pid, filtersQuery)+ const result = await this.analyticsService.groupByTimeBucket(timeBucket, groupFrom, groupTo, subQuery, pid, filtersQuery, paramsData)- const customs = await this.analyticsService.processCustomEV(queryCustoms)+ const customs = await this.analyticsService.processCustomEV(queryCustoms, paramsData)return {...result,diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex c825bd7fe..11fa294df 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -340,12 +340,12 @@ export class AnalyticsService {return result}- async groupByTimeBucket(timeBucket: TimeBucketType, from: string, to: string, subQuery: string, pid: string, filtersQuery: string): Promise<object | void> {+ async groupByTimeBucket(timeBucket: TimeBucketType, from: string, to: string, subQuery: string, pid: string, filtersQuery: string, paramsData: object): Promise<object | void> {const params = {}for (let i of cols) {const query1 = `SELECT ${i}, count(*) ${subQuery} AND ${i} IS NOT NULL GROUP BY ${i}`- const res = await clickhouse.query(query1).toPromise()+ const res = await clickhouse.query(query1, paramsData).toPromise()params[i] = {}@@ -454,11 +454,11 @@ export class AnalyticsService {})}- async processCustomEV(query: string): Promise<object> {+ async processCustomEV(query: string, params: object): Promise<object> {const result = {}// @ts-ignore- const rawCustoms: Array<customsCHResponse> = await clickhouse.query(query).toPromise()+ const rawCustoms: Array<customsCHResponse> = await clickhouse.query(query, params).toPromise()const size = _size(rawCustoms)for (let i = 0; i < size; ++i) {