PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: user approval

Browse Source
This commit is contained in:
ilham 2022-01-24 11:01:51 +07:00
parent 965d285ce2
commit 278fdff8f5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/users/entities/user.entity.ts
View File

@ -21,7 +21,7 @@ export class User extends BaseModel {
salt: string;
@Column({ default: true })
isActive: boolean;
is_active: boolean;
@Column({
nullable: true,
@ -29,7 +29,7 @@ export class User extends BaseModel {
status_approval: string;
@Column({ default: false })
isRejected: boolean;
is_rejected: boolean;
@ManyToOne(
() => {

20
src/users/users.service.ts
View File

@ -159,7 +159,7 @@ export class UsersService {
.select([
'user.id',
'user.username',
'user.isActive',
'user.is_active',
'user.createdAt',
'roles.id',
'roles.name',
@ -276,7 +276,7 @@ export class UsersService {
.select([
'user.id',
'user.username',
'user.isActive',
'user.is_active',
'roles.id',
'roles.name',
'user_detail',
@ -302,7 +302,7 @@ export class UsersService {
const baseQuery = this.usersRepository
.createQueryBuilder('user')
.where(
'user.id != :id and user.superior_id = :superior and status_approval = :status and isRejected is false',
'user.id != :id and user.superior_id = :superior and status_approval = :status and is_rejected is false',
{
id: superrior.userId,
superior: superrior.userId,
@ -325,7 +325,7 @@ export class UsersService {
.select([
'user.id',
'user.username',
'user.isActive',
'user.is_active',
'roles.id',
'roles.name',
'user_detail',
@ -404,7 +404,7 @@ export class UsersService {
.select([
'users.id',
'users.username',
'users.isActive',
'users.is_active',
'users.createdAt',
'roles.id',
'roles.name',
@ -567,9 +567,9 @@ export class UsersService {
if (status == 'approved') {
dataUser.status_approval = supervisorUser.roles.name;
} else if (status == 'resend') {
dataUser.isRejected = false;
dataUser.is_rejected = false;
} else {
dataUser.isRejected = true;
dataUser.is_rejected = true;
}
const result = await this.usersRepository.save(dataUser);
@ -594,9 +594,9 @@ export class UsersService {
const userData = new User();
if (type === 'active') {
userData.isActive = true;
userData.is_active = true;
} else {
userData.isActive = false;
userData.is_active = false;
}
await this.connection.transaction(async (manager) => {
@ -630,7 +630,7 @@ export class UsersService {
return this.usersRepository.findOneOrFail({
where: {
username,
isActive: true,
is_active: true,
},
relations: ['roles', 'partner'],
});