diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2b6138dee..fbd3b04fa 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -34,12 +34,20 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) let users: dbUser[] let count: number - if(notActivated) { - [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated(searchText, currentPage, pageSize) + if (notActivated) { + [users, count] = await userRepository.findBySearchCriteriaPagedNotActivated( + searchText, + currentPage, + pageSize, + ) } else { - [users, count] = await userRepository.findBySearchCriteriaPaged(searchText, currentPage, pageSize) + [users, count] = await userRepository.findBySearchCriteriaPaged( + searchText, + currentPage, + pageSize, + ) } - let adminUsers = await Promise.all( + const adminUsers = await Promise.all( users.map(async (user) => { const adminUser = new UserAdmin() adminUser.userId = user.id diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index e4efedaf7..e43c29e22 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -44,7 +44,12 @@ export class UserRepository extends Repository { ) .getMany() } - async findBySearchCriteriaPaged(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> { + + async findBySearchCriteriaPaged( + searchCriteria: string, + currentPage: number, + pageSize: number, + ): Promise<[User[], number]> { return await this.createQueryBuilder('user') .where( 'user.firstName like :name or user.lastName like :lastName or user.email like :email', @@ -55,15 +60,18 @@ export class UserRepository extends Repository { }, ) .take(pageSize) - .skip((currentPage - 1 ) * pageSize) + .skip((currentPage - 1) * pageSize) .getManyAndCount() } - async findBySearchCriteriaPagedNotActivated(searchCriteria: string, currentPage: number, pageSize: number): Promise<[User[], number]> { - + async findBySearchCriteriaPagedNotActivated( + searchCriteria: string, + currentPage: number, + pageSize: number, + ): Promise<[User[], number]> { return await this.createQueryBuilder('user') .where( - new Brackets(qb => { + new Brackets((qb) => { qb.where( 'user.firstName like :name or user.lastName like :lastName or user.email like :email', { @@ -72,13 +80,11 @@ export class UserRepository extends Repository { email: `%${searchCriteria}%`, }, ) - }) - ) - .andWhere( - {emailChecked: false} + }), ) + .andWhere({ emailChecked: false }) .take(pageSize) - .skip((currentPage - 1 ) * pageSize) + .skip((currentPage - 1) * pageSize) .getManyAndCount() } }