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!

added errors to getRedisCount

Blue Mouse498d3df0b169
diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.ts
index b4d2559d6..0f22654c0 100644
--- a/apps/production/src/project/project.service.ts
+++ b/apps/production/src/project/project.service.ts
@@ -673,31 +673,34 @@ export class ProjectService {
return 0
}
- const countEVQuery = `SELECT COUNT() FROM analytics WHERE pid IN (${_join(
- _map(pids, el => `'${el.id}'`),
- ',',
- )}) AND created BETWEEN '${monthStart}' AND '${monthEnd}'`
- const countCustomEVQuery = `SELECT COUNT() FROM customEV WHERE pid IN (${_join(
- _map(pids, el => `'${el.id}'`),
- ',',
- )}) AND created BETWEEN '${monthStart}' AND '${monthEnd}'`
- const countCaptchaQuery = `SELECT COUNT() FROM captcha WHERE pid IN (${_join(
- _map(pids, el => `'${el.id}'`),
- ',',
- )}) AND created BETWEEN '${monthStart}' AND '${monthEnd}'`
+ const selector = `
+ WHERE pid IN (${_join(
+ _map(pids, el => `'${el.id}'`),
+ ',',
+ )})
+ AND created BETWEEN '${monthStart}' AND '${monthEnd}'
+ `
+
+ const countEVQuery = `SELECT count() FROM analytics ${selector}`
+ const countCustomEVQuery = `SELECT count() FROM customEV ${selector}`
+ const countCaptchaQuery = `SELECT count() FROM captcha ${selector}`
+ const countErrorsQuery = `SELECT count() FROM errors ${selector}`
const promises = [
clickhouse.query(countEVQuery).toPromise(),
clickhouse.query(countCustomEVQuery).toPromise(),
clickhouse.query(countCaptchaQuery).toPromise(),
+ clickhouse.query(countErrorsQuery).toPromise(),
]
- const [pageviews, customEvents, captcha] = await Promise.all(promises)
+ const [pageviews, customEvents, captcha, errors] =
+ await Promise.all(promises)
count =
pageviews[0]['count()'] +
customEvents[0]['count()'] +
- captcha[0]['count()']
+ captcha[0]['count()'] +
+ errors[0]['count()']
await redis.set(countKey, `${count}`, 'EX', redisProjectCountCacheTimeout)
} else {