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!

fixed cache issues

Blue Mouse54b09d78d084
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index c5633a6c2..73e5f55a7 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -55,6 +55,31 @@ import {
deleteProjectClickhouse,
} from '../common/utils'
+const updateProjectRedis = async (id: string, project: Project) => {
+ const key = getRedisProjectKey(id)
+
+ try {
+ await redis.set(
+ key,
+ JSON.stringify(project),
+ 'EX',
+ redisProjectCacheTimeout,
+ )
+ } catch {
+ await redis.del(key)
+ }
+}
+
+export const deleteProjectRedis = async (id: string) => {
+ const key = getRedisProjectKey(id)
+
+ try {
+ await redis.del(key)
+ } catch (e) {
+ console.error(`Error deleting project ${id} from redis: ${e}`)
+ }
+}
+
const PROJECTS_MAXIMUM = ACCOUNT_PLANS[PlanCode.free].maxProjects
const isValidShareDTO = (share: ShareDTO): boolean => {
@@ -73,7 +98,7 @@ export class ProjectController {
private readonly logger: AppLoggerService,
private readonly actionTokensService: ActionTokensService,
private readonly mailerService: MailerService,
- ) {}
+ ) { }
@Get('/')
@ApiQuery({ name: 'take', required: false })
@@ -254,7 +279,6 @@ export class ProjectController {
}
}
-
@Post('/')
@ApiResponse({ status: 201, type: Project })
@UseGuards(RolesGuard)
@@ -370,18 +394,8 @@ export class ProjectController {
await this.projectService.update(id, project)
}
- const key = getRedisProjectKey(id)
-
- try {
- await redis.set(
- key,
- JSON.stringify(project),
- 'EX',
- redisProjectCacheTimeout,
- )
- } catch {
- await redis.del(key)
- }
+ // await updateProjectRedis(id, project)
+ await deleteProjectRedis(id)
return project
}
@@ -437,6 +451,7 @@ export class ProjectController {
try {
await this.projectService.delete(id)
+ await deleteProjectRedis(id)
await clickhouse.query(query1).toPromise()
await clickhouse.query(query2).toPromise()
return 'Project deleted successfully'
@@ -487,7 +502,7 @@ export class ProjectController {
this.projectService.allowedToManage(project, uid, user.roles)
- // Probably the redux cache should be updated as well after this.
+ await deleteProjectRedis(pid)
await this.projectService.deleteShare(shareId)
}
@@ -574,6 +589,8 @@ export class ProjectController {
relations: ['share', 'share.user'],
})
+ // todo: maybe the update project should be used here instead of delete?
+ await deleteProjectRedis(pid)
return processProjectUser(updatedProject)
} catch (e) {
console.error(`[ERROR] Could not share project (pid: ${project.id}, invitee ID: ${invitee.id}): ${e}`)
diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
index 0bea824ee..228a2f15c 100644
--- a/src/user/user.controller.ts
+++ b/src/user/user.controller.ts
@@ -14,6 +14,7 @@ import * as _omit from 'lodash/omit'
import { UserService } from './user.service'
import { ProjectService } from '../project/project.service'
+import { deleteProjectRedis } from '../project/project.controller'
import {
User, UserType, MAX_EMAIL_REQUESTS, PlanCode,
} from './entities/user.entity'
@@ -178,7 +179,7 @@ export class UserController {
this.logger.log({ uid, shareId }, 'DELETE /user/share/:shareId')
const share = await this.projectService.findOneShare(shareId, {
- relations: ['user'],
+ relations: ['user', 'project'],
})
if (_isEmpty(share)) {
@@ -190,6 +191,7 @@ export class UserController {
}
await this.projectService.deleteShare(shareId)
+ await deleteProjectRedis(share.project.id)
return 'shareDeleted'
}
@@ -207,7 +209,7 @@ export class UserController {
this.logger.log({ uid, shareId }, 'GET /user/share/:shareId')
const share = await this.projectService.findOneShare(shareId, {
- relations: ['user'],
+ relations: ['user', 'project'],
})
if (_isEmpty(share)) {
@@ -221,6 +223,7 @@ export class UserController {
share.confirmed = true
await this.projectService.updateShare(shareId, share)
+ await deleteProjectRedis(share.project.id)
return 'shareAccepted'
}