fix caching

hpi-schul-cloud · Oct 22, 2024 · dd954e4 · dd954e4
1 parent 2207567
commit dd954e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/apps/server/src/modules/school/api/test/school-users.api.spec.ts b/apps/server/src/modules/school/api/test/school-users.api.spec.ts
@@ -29,7 +29,7 @@ describe('School Controller (API)', () => {
 
 	beforeEach(async () => {
 		await cleanupCollections(em);
-		await em.clearCache('roles-cache');
+		await em.clearCache('roles-cache-teacher');
 	});
 
 	afterAll(async () => {

diff --git a/apps/server/src/shared/repo/role/role.repo.ts b/apps/server/src/shared/repo/role/role.repo.ts
@@ -16,35 +16,27 @@ export class RoleRepo extends BaseRepo<Role> {
 		const promise: Promise<Role> = this._em.findOneOrFail(
 			Role,
 			{ name },
-			{ cache: ['roles-cache', this.cacheExpiration] }
+			{ cache: [`roles-cache-${name}`, this.cacheExpiration] }
 		);
 		return promise;
 	}
 
 	async findById(id: EntityId): Promise<Role> {
-		const promise: Promise<Role> = this._em.findOneOrFail(
-			Role,
-			{ id },
-			{ cache: ['roles-cache', this.cacheExpiration] }
-		);
+		const promise: Promise<Role> = this._em.findOneOrFail(Role, { id }, { cache: this.cacheExpiration });
 		return promise;
 	}
 
 	async findByNames(names: RoleName[]): Promise<Role[]> {
 		const promise: Promise<Role[]> = this._em.find(
 			Role,
 			{ name: { $in: names } },
-			{ cache: ['roles-cache', this.cacheExpiration] }
+			{ cache: [`roles-cache-${names.join('-')}`, this.cacheExpiration] }
 		);
 		return promise;
 	}
 
 	async findByIds(ids: string[]): Promise<Role[]> {
-		const promise: Promise<Role[]> = this._em.find(
-			Role,
-			{ id: { $in: ids } },
-			{ cache: ['roles-cache', this.cacheExpiration] }
-		);
+		const promise: Promise<Role[]> = this._em.find(Role, { id: { $in: ids } }, { cache: this.cacheExpiration });
 		return promise;
 	}
 }