IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

try fix linting

Browse Source
This commit is contained in:
Einhornimmond 2022-02-13 09:22:05 +01:00
parent cdd31ccba9
commit 692433ce51
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -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

26
backend/src/typeorm/repository/User.ts
View File

@ -44,7 +44,12 @@ export class UserRepository extends Repository<User> {
)
.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<User> {
},
)
.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<User> {
email: `%${searchCriteria}%`,
},
)
})
)
.andWhere(
{emailChecked: false}
}),
)
.andWhere({ emailChecked: false })
.take(pageSize)
.skip((currentPage - 1 ) * pageSize)
.skip((currentPage - 1) * pageSize)
.getManyAndCount()
}
}