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!

fix review comments

Blue Mouseeb4fc0242258
diff --git a/backend/apps/cloud/src/project/project.service.ts b/backend/apps/cloud/src/project/project.service.ts
index d14e8ec44..313164b8c 100644
--- a/backend/apps/cloud/src/project/project.service.ts
+++ b/backend/apps/cloud/src/project/project.service.ts
@@ -1030,6 +1030,14 @@ export class ProjectService {
}
async getMonthlySessionReplayUsage(uid: string): Promise<number> {
+ const monthStart = dayjs.utc().startOf('month')
+ const key = `monthly_replay_usage:${uid}:${monthStart.format('YYYY-MM')}`
+ const cachedUsage = await redis.get(key)
+
+ if (!_isEmpty(cachedUsage)) {
+ return Number(cachedUsage) || 0
+ }
+
const projects = await this.find({
where: {
admin: { id: uid },
@@ -1038,13 +1046,10 @@ export class ProjectService {
})
if (_isEmpty(projects)) {
+ await redis.set(key, '0', 'EX', redisUserUsageinfoCacheTimeout)
return 0
}
- const monthStart = dayjs
- .utc()
- .startOf('month')
- .format('YYYY-MM-DD HH:mm:ss')
const CHUNK_SIZE = 5000
const pids = _map(projects, 'id')
let usage = 0
@@ -1062,7 +1067,7 @@ export class ProjectService {
`,
query_params: {
pids: pidChunk,
- monthStart,
+ monthStart: monthStart.format('YYYY-MM-DD HH:mm:ss'),
},
})
.then((resultSet) => resultSet.json<{ usage: number }>())
@@ -1070,6 +1075,8 @@ export class ProjectService {
usage += Number(data[0]?.usage) || 0
}
+ await redis.set(key, `${usage}`, 'EX', redisUserUsageinfoCacheTimeout)
+
return usage
}
diff --git a/backend/apps/cloud/src/task-manager/task-manager.service.ts b/backend/apps/cloud/src/task-manager/task-manager.service.ts
index b7ce82bea..38d633695 100644
--- a/backend/apps/cloud/src/task-manager/task-manager.service.ts
+++ b/backend/apps/cloud/src/task-manager/task-manager.service.ts
@@ -1452,14 +1452,14 @@ export class TaskManagerService {
@Cron(CronExpression.EVERY_HOUR)
async processWebsiteAddonRenewals() {
- await Promise.all([
- this.userService.processDueWebsiteAddonRenewals(),
- this.userService.processDueSessionReplayAddonRenewals(),
- ]).catch((reason) => {
+ try {
+ await this.userService.processDueWebsiteAddonRenewals()
+ await this.userService.processDueSessionReplayAddonRenewals()
+ } catch (reason) {
this.logger.error(
`[CRON WORKER](processWebsiteAddonRenewals) Error occured: ${reason}`,
)
- })
+ }
}
@Cron(CronExpression.EVERY_2_HOURS)