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

Merge branch 'development' into 'devops-staging'

Browse Source 
fix: user approval

See merge request empatnusabangsa/ppob/ppob-backend!100
This commit is contained in:
ilham dwi pratama 2022-01-24 04:02:29 +00:00
commit 335c1e98a6
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; salt: string;
@Column({ default: true }) @Column({ default: true })
isActive: boolean; is_active: boolean;
@Column({ @Column({
nullable: true, nullable: true,
@ -29,7 +29,7 @@ export class User extends BaseModel {
status_approval: string; status_approval: string;
@Column({ default: false }) @Column({ default: false })
isRejected: boolean; is_rejected: boolean;
@ManyToOne( @ManyToOne(
() => { () => {

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

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