📈 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
Metrics support from request
Blue Moused90f7092ff1e
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex fa7e4e316..a3cd88807 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -342,7 +342,12 @@ export class AnalyticsController {console.log('parsedMetrics:', parsedMetrics)if (!_isEmpty(parsedMetrics)) {- meta = await this.analyticsService.getMetaResult(pid, parsedMetrics)+ meta = await this.analyticsService.getMetaResult(+ pid,+ parsedMetrics,+ filtersQuery,+ paramsData,+ )}}diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex 8fdceeef0..47ef901df 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -3806,8 +3806,19 @@ export class AnalyticsService {}}- async getMetaResult(pid: string, customEvents: ProjectViewCustomEventDto[]) {- const metaKeys = customEvents.map(event => event.metaKey)+ async getMetaResult(+ pid: string,+ customEvents: ProjectViewCustomEventDto[],+ filtersQuery: string,+ paramsData: any,+ ) {+ const nonStringCustomEvents = _filter(+ customEvents,+ event =>+ event.metaValueType !== ProjectViewCustomEventMetaValueType.STRING,+ )++ const metaKeys = nonStringCustomEvents.map(event => event.metaKey)const params = {pid,..._reduce(@@ -3815,9 +3826,10 @@ export class AnalyticsService {(acc, key, index) => ({ ...acc, [`metaKey_${index}`]: key }),{},),+ ...paramsData.params,}- const casesSum = customEvents+ const casesSum = nonStringCustomEvents.map((event, index) => `WHEN key = {metaKey_${index}:String} THEN ${@@ -3829,7 +3841,7 @@ export class AnalyticsService {).join(' ')- const casesAvg = customEvents+ const casesAvg = nonStringCustomEvents.map((event, index) => `WHEN key = {metaKey_${index}:String} THEN ${@@ -3845,6 +3857,12 @@ export class AnalyticsService {.map((_, index) => `{metaKey_${index}:String}`).join(', ')+ /*+ query += `indexOf(meta.key, {${keyParam}:String}) > 0 AND meta.value[indexOf(meta.key, {${keyParam}:String})] ${+ isExclusive ? '!= ' : '='+ } {${param}:String}`+ */+const query = `SELECTkey,@@ -3852,7 +3870,11 @@ export class AnalyticsService {avg(CASE ${casesAvg} ELSE 0 END) AS avgFROM customEVARRAY JOIN meta.key AS key, meta.value AS value- WHERE pid = {pid:FixedString(12)} AND key IN (${metaKeysParams})+ WHERE+ pid = {pid:FixedString(12)}+ AND key IN (${metaKeysParams})+ AND created BETWEEN {groupFrom:String} AND {groupTo:String}+ ${filtersQuery}GROUP BY key`