📈 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
linting fixes
Blue Mouse64392f42c7e3
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex 11fdc56fd..25ab92788 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -588,28 +588,25 @@ export class AnalyticsService {period: 'w' | 'M' = 'w',amountToSubtract = 1,) {- return this.getSummaryStats(pids, period, 'analytics', amountToSubtract)+ return this.getSummaryStats(pids, 'analytics', period, amountToSubtract)}- async getCaptchaSummary(- pids: string[],- period: 'w' | 'M' = 'w',- ) {- return this.getSummaryStats(pids, period, 'captcha')+ async getCaptchaSummary(pids: string[], period: 'w' | 'M' = 'w') {+ return this.getSummaryStats(pids, 'captcha', period)}async getSummaryStats(pids: string[],- period: 'w' | 'M' = 'w',tableName: 'analytics' | 'captcha',- amountToSubtract = 1+ period: 'w' | 'M' = 'w',+ amountToSubtract = 1,) {const result = {}-- const promises = pids.map(async (pid) => {++ const promises = pids.map(async pid => {if (!isValidPID(pid)) {throw new BadRequestException(- `The provided Project ID (${pid}) is incorrect`+ `The provided Project ID (${pid}) is incorrect`,)}@@ -641,19 +638,25 @@ export class AnalyticsService {}try {- const thisWeekResult = await clickhouse.query(queryThisWeek, paramsData).toPromise()- const lastWeekResult = await clickhouse.query(queryLastWeek, paramsData).toPromise()-+ const thisWeekResult = await clickhouse+ .query(queryThisWeek, paramsData)+ .toPromise()+ const lastWeekResult = await clickhouse+ .query(queryLastWeek, paramsData)+ .toPromise()+if (tableName === 'analytics') {const thisWeekUnique =_find(thisWeekResult, ({ unique }) => unique)?.['count()'] || 0const thisWeekPV =- (_find(thisWeekResult, ({ unique }) => !unique)?.['count()'] || 0) + thisWeekUnique+ (_find(thisWeekResult, ({ unique }) => !unique)?.['count()'] || 0) ++ thisWeekUniqueconst lastWeekUnique =_find(lastWeekResult, ({ unique }) => unique)?.['count()'] || 0const lastWeekPV =- (_find(lastWeekResult, ({ unique }) => !unique)?.['count()'] || 0) + lastWeekUnique-+ (_find(lastWeekResult, ({ unique }) => !unique)?.['count()'] || 0) ++ lastWeekUnique+result[pid] = {thisWeek: thisWeekPV,lastWeek: lastWeekPV,@@ -662,13 +665,13 @@ export class AnalyticsService {percChange: calculateRelativePercentage(lastWeekPV, thisWeekPV),percChangeUnique: calculateRelativePercentage(lastWeekUnique,- thisWeekUnique+ thisWeekUnique,),}} else {const thisWeek = thisWeekResult?.['count()'] || 0const lastWeek = lastWeekResult?.['count()'] || 0-+result[pid] = {thisWeek,lastWeek,@@ -677,13 +680,13 @@ export class AnalyticsService {}} catch {throw new InternalServerErrorException(- "Can't process the provided PID. Please, try again later."+ "Can't process the provided PID. Please, try again later.",)}})-+await Promise.all(promises)-+return result}