Skip to content

📈 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!

lint:fix

Blue Mouseec324c4f04e5
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.ts
index 6cc4a8b57..087293b12 100644
--- a/src/analytics/analytics.controller.ts
+++ b/src/analytics/analytics.controller.ts
@@ -395,11 +395,10 @@ export class AnalyticsController {
}
this.analyticsService.validateTimebucket(timeBucket)
- const [filtersQuery, filtersParams] =
- this.analyticsService.getFiltersQuery(
- filters,
- DataType.ANALYTICS,
- )
+ const [filtersQuery, filtersParams] = this.analyticsService.getFiltersQuery(
+ filters,
+ DataType.ANALYTICS,
+ )
const { groupFrom, groupTo } = this.analyticsService.getGroupFromTo(
from,
to,
@@ -409,16 +408,11 @@ export class AnalyticsController {
)
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}`
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.ts
index 9210a83b8..fe94da703 100644
--- a/src/analytics/analytics.service.ts
+++ b/src/analytics/analytics.service.ts
@@ -1047,16 +1047,32 @@ export class AnalyticsService {
const promises = [
// Getting params
async () => {
- params = await this.groupParamsByTimeBucket(subQuery, paramsData, customEVFilterApplied, parsedFilters)
+ 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')
+ 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)
+ const groupedData = await this.groupChartByTimeBucket(
+ timeBucket,
+ from,
+ to,
+ subQuery,
+ filtersQuery,
+ paramsData,
+ timezone,
+ customEVFilterApplied,
+ )
// @ts-ignore
chart = groupedData.chart
@@ -1081,7 +1097,7 @@ export class AnalyticsService {
customEVFilterApplied: boolean,
parsedFilters: Array<{ [key: string]: string }>,
): Promise<object | void> {
- return await this.generateParams(
+ return this.generateParams(
parsedFilters,
subQuery,
customEVFilterApplied,