📈 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
added an endpoint to retreive chart data only
Blue Mouse775a3bb8682a
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex 4e83f1f09..6cc4a8b57 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -373,6 +373,91 @@ export class AnalyticsController {}}+ @Get('chart')+ @Auth([], true, true)+ async getChartData(+ @Query() data: AnalyticsGET_DTO,+ @CurrentUserId() uid: string,+ ): Promise<any> {+ const {+ pid,+ period,+ timeBucket,+ from,+ to,+ filters,+ timezone = DEFAULT_TIMEZONE,+ } = data+ this.analyticsService.validatePID(pid)++ if (!_isEmpty(period)) {+ this.analyticsService.validatePeriod(period)+ }++ this.analyticsService.validateTimebucket(timeBucket)+ const [filtersQuery, filtersParams] =+ this.analyticsService.getFiltersQuery(+ filters,+ DataType.ANALYTICS,+ )+ const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(+ from,+ to,+ timeBucket,+ period,+ timezone,+ )+ await this.analyticsService.checkProjectAccess(pid, uid)++ let queryCustoms = `SELECT ev, count() FROM customEV WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`+ let subQuery = `FROM analytics WHERE pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`+ let customEVFilterApplied = false++ if (filtersParams?.ev) {+ customEVFilterApplied = true+ queryCustoms = `SELECT ev, count() FROM customEV WHERE ${+ filtersParams.ev_exclusive ? 'NOT' : ''+ } ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String} GROUP BY ev`++ subQuery = `FROM customEV WHERE ${+ filtersParams.ev_exclusive ? 'NOT' : ''+ } ev = {ev:String} AND pid = {pid:FixedString(12)} ${filtersQuery} AND created BETWEEN {groupFrom:String} AND {groupTo:String}`+ }++ const paramsData = {+ params: {+ pid,+ groupFrom,+ groupTo,+ ...filtersParams,+ },+ }++ const result = await this.analyticsService.groupChartByTimeBucket(+ timeBucket,+ groupFrom,+ groupTo,+ subQuery,+ filtersQuery,+ paramsData,+ timezone,+ customEVFilterApplied,+ )+ let appliedFilters = filters++ if (filters) {+ try {+ appliedFilters = JSON.parse(filters)+ // eslint-disable-next-line no-empty+ } catch {}+ }++ return {+ ...result,+ appliedFilters,+ }+ }+@Get('performance')@Auth([], true, true)async getPerfData(diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex a0777d3d8..9210a83b8 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -1040,7 +1040,48 @@ export class AnalyticsService {customEVFilterApplied: boolean,parsedFilters: Array<{ [key: string]: string }>,): Promise<object | void> {- const params = await this.generateParams(+ let params: unknown = {}+ let chart: unknown = {}+ let avgSdur = 0++ const promises = [+ // Getting params+ async () => {+ params = await this.groupParamsByTimeBucket(subQuery, paramsData, customEVFilterApplied, parsedFilters)++ if (!_some(_values(params), val => !_isEmpty(val))) {+ throw new BadRequestException('The are no parameters for the specified time frames')+ }+ },++ // Getting chart & average session duration data+ async () => {+ const groupedData = await this.groupChartByTimeBucket(timeBucket, from, to, subQuery, filtersQuery, paramsData, timezone, customEVFilterApplied)++ // @ts-ignore+ chart = groupedData.chart++ // @ts-ignore+ avgSdur = groupedData.avgSdur+ },+ ]++ await Promise.all(promises)++ return {+ params,+ chart,+ avgSdur,+ }+ }++ async groupParamsByTimeBucket(+ subQuery: string,+ paramsData: any,+ customEVFilterApplied: boolean,+ parsedFilters: Array<{ [key: string]: string }>,+ ): Promise<object | void> {+ return await this.generateParams(parsedFilters,subQuery,customEVFilterApplied,@@ -1048,11 +1089,18 @@ export class AnalyticsService {false,false,)+ }- if (!_some(_values(params), val => !_isEmpty(val))) {- return Promise.resolve()- }-+ async groupChartByTimeBucket(+ timeBucket: TimeBucketType,+ from: string,+ to: string,+ subQuery: string,+ filtersQuery: string,+ paramsData: any,+ timezone: string,+ customEVFilterApplied: boolean,+ ): Promise<object | void> {const avgSdur = customEVFilterApplied? 0: await this.calculateAverageSessionDuration(subQuery, paramsData)@@ -1086,7 +1134,6 @@ export class AnalyticsService {x = this.updateXAxisTimezone(x, timezone, timeBucket)return Promise.resolve({- params,chart: {x,visits: uniques,@@ -1110,7 +1157,6 @@ export class AnalyticsService {x = this.updateXAxisTimezone(x, timezone, timeBucket)return Promise.resolve({- params,chart: {x,visits,