BC-8354 - adjust roles cache to use different tokens for different op…

…erations (#5322)

in the roles repo, findByNames and findByName used the same cache result (when only a single roleName was selected). This resulted in an error, when an array result was expected but the cache contained a single result, or when a single result was expected but cache contained an array with a single element.

apps/server/src/modules/school/api/test/school-users.api.spec.ts

@@ -29,7 +29,8 @@ describe('School Controller (API)', () => {
 
 	beforeEach(async () => {
 		await cleanupCollections(em);
-		await em.clearCache('roles-cache-teacher');
+		await em.clearCache('roles-cache-byname-teacher');
+		await em.clearCache('roles-cache-bynames-teacher');
 	});
 
 	afterAll(async () => {

apps/server/src/shared/repo/role/role.repo.integration.spec.ts

@@ -148,4 +148,18 @@ describe('role repo', () => {
 			expect(result).toContainEqual(roleB);
 		});
 	});
+
+	describe('roles cache', () => {
+		it('should successfully use different caches in sequence', async () => {
+			const roleA = roleFactory.build();
+			const roleB = roleFactory.build();
+
+			await em.persistAndFlush([roleA, roleB]);
+
+			const firstResult = await repo.findByName(roleA.name);
+			expect(firstResult).toEqual(roleA);
+			const secondResult = await repo.findByNames([roleA.name]);
+			expect(secondResult).toEqual([roleA]);
+		});
+	});
 });

apps/server/src/shared/repo/role/role.repo.ts

@@ -16,7 +16,7 @@ export class RoleRepo extends BaseRepo<Role> {
 		const promise: Promise<Role> = this._em.findOneOrFail(
 			Role,
 			{ name },
-			{ cache: [`roles-cache-${name}`, this.cacheExpiration] }
+			{ cache: [`roles-cache-byname-${name}`, this.cacheExpiration] }
 		);
 		return promise;
 	}
@@ -30,7 +30,7 @@ export class RoleRepo extends BaseRepo<Role> {
 		const promise: Promise<Role[]> = this._em.find(
 			Role,
 			{ name: { $in: names } },
-			{ cache: [`roles-cache-${names.join('-')}`, this.cacheExpiration] }
+			{ cache: [`roles-cache-bynames-${names.join('-')}`, this.cacheExpiration] }
 		);
 		return promise;
 	}