major update regarding many to many roles per user and their related impacts
This commit is contained in:
@ -2,7 +2,7 @@ import { Response, NextFunction, Application } from "express";
|
||||
import { Request } from "express-jwt";
|
||||
import { ReturnHelper } from "../helpers/express/return";
|
||||
import { OrmHelper } from "../helpers/orm";
|
||||
import { User, UserRefreshToken } from "entity";
|
||||
import { User, UserRefreshToken, UserRole } from "entity";
|
||||
import Joi from "joi";
|
||||
import { ILogObj, Logger } from "tslog";
|
||||
import { Language } from "../langs/lang";
|
||||
@ -10,7 +10,7 @@ import { Paging } from "entity";
|
||||
import CommonHelper from "../helpers/common";
|
||||
import * as fastcsv from 'fast-csv';
|
||||
import dayjs from "dayjs";
|
||||
import { validate } from 'uuid';
|
||||
import exceljs from "exceljs";
|
||||
|
||||
const log: Logger<ILogObj> = new Logger({ name: '[UserController]', type: 'pretty' });
|
||||
|
||||
@ -85,8 +85,8 @@ export class UserController {
|
||||
.where(whereAttr, whereVal);
|
||||
const res_list = userRepository.createQueryBuilder()
|
||||
.where(whereAttr, whereVal)
|
||||
.select('id,email,username,name,id_role,status,created_at,updated_at')
|
||||
.addSelect('(select role.name from user_roles role where role.id=User.id_role )', 'role_name')
|
||||
.leftJoinAndSelect("User.roles", "roles")
|
||||
.leftJoinAndSelect("roles.application", "application")
|
||||
.orderBy(param.order_field, param.order_direction)
|
||||
.offset(offset)
|
||||
.limit(param.limit);
|
||||
@ -98,7 +98,7 @@ export class UserController {
|
||||
|
||||
const current_page = param.page;
|
||||
const total_count_data = await res_count.getCount();
|
||||
const list_data = await res_list.getRawMany();
|
||||
const list_data = await res_list.getMany();
|
||||
const count_data = CommonHelper.countObject(list_data);
|
||||
|
||||
return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
|
||||
@ -159,20 +159,24 @@ export class UserController {
|
||||
col_any_like: ['name', 'username']
|
||||
});
|
||||
|
||||
const filename = "user.csv";
|
||||
const filename = "user.xlsx";
|
||||
|
||||
res.setHeader('Content-Type', 'text/csv');
|
||||
res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
|
||||
res.setHeader('Content-Disposition', 'attachment; filename=' + filename);
|
||||
|
||||
const csvStream = fastcsv.format({
|
||||
headers: true,
|
||||
writeHeaders: true,
|
||||
transform: (row: User): any => ({
|
||||
...row,
|
||||
created_at: dayjs(row.created_at).format('DD-MM-YYYY HH:MM:ss'),
|
||||
})
|
||||
});
|
||||
csvStream.pipe(res);
|
||||
const workbook = new exceljs.stream.xlsx.WorkbookWriter({ stream: res });
|
||||
const sheet = workbook.addWorksheet('Data');
|
||||
|
||||
sheet.columns = [
|
||||
{ header: "ID", key: "id", width: 10 },
|
||||
{ header: "Name", key: "name", width: 20 },
|
||||
{ header: "Email", key: "email", width: 20 },
|
||||
{ header: "Username", key: "username", width: 20 },
|
||||
{ header: "Status", key: "status", width: 10 },
|
||||
{ header: "Created At", key: "created_at", width: 15 },
|
||||
{ header: "Roles", key: "role_name", width: 15 },
|
||||
{ header: "Application", key: "application", width: 15 },
|
||||
];
|
||||
|
||||
const limit = 50;
|
||||
|
||||
@ -182,27 +186,27 @@ export class UserController {
|
||||
const data = await userRepository.createQueryBuilder()
|
||||
.where(whereAttr, whereVal)
|
||||
.select([
|
||||
'id',
|
||||
'name',
|
||||
'email',
|
||||
'username',
|
||||
'status',
|
||||
'created_at'])
|
||||
.addSelect('(select role.name from user_roles role where role.id=User.id_role )', 'role_name')
|
||||
'User.id as id',
|
||||
'User.name as name',
|
||||
'User.email as email',
|
||||
'User.username as username',
|
||||
'User.status as status',
|
||||
'User.created_at as created_at',
|
||||
'roles.name as role_name',
|
||||
'application.id as application'])
|
||||
.leftJoin("User.roles", "roles")
|
||||
.leftJoin("roles.application", "application")
|
||||
.orderBy(param.order_field, param.order_direction)
|
||||
.offset(offset)
|
||||
.limit(limit).getRawMany();
|
||||
|
||||
if (CommonHelper.countObject(data) === 0) {
|
||||
csvStream.end();
|
||||
} else {
|
||||
data.forEach((item: any) => csvStream.write(item));
|
||||
data.forEach((item: any) => sheet.addRow(item).commit());
|
||||
|
||||
if (CommonHelper.countObject(data) == limit) {
|
||||
fetchAndWrite(page + 1);
|
||||
} else {
|
||||
csvStream.end();
|
||||
}
|
||||
if (CommonHelper.countObject(data) == limit) {
|
||||
fetchAndWrite(page + 1);
|
||||
} else {
|
||||
sheet.commit();
|
||||
workbook.commit();
|
||||
}
|
||||
};
|
||||
|
||||
@ -241,7 +245,6 @@ export class UserController {
|
||||
password: Joi.string().pattern(new RegExp('^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$')).min(8).required().label('Password'),
|
||||
retype_password: Joi.ref('password'),
|
||||
name: Joi.string().max(64).required().label('Name'),
|
||||
id_role: Joi.string().uuid().required().label('Role'),
|
||||
status: Joi.string().required().label('Status'),
|
||||
});
|
||||
|
||||
@ -252,7 +255,6 @@ export class UserController {
|
||||
data.username = param.username
|
||||
data.password = param.password
|
||||
data.email = param.email
|
||||
data.id_role = param.id_role
|
||||
data.status = param.status
|
||||
|
||||
data.hashPassword();
|
||||
@ -268,6 +270,149 @@ export class UserController {
|
||||
}
|
||||
}
|
||||
|
||||
static async addRole(req: Request, res: Response, next: NextFunction): Promise<Response> {
|
||||
/*
|
||||
#swagger.tags = ['User']
|
||||
#swagger.security = [{
|
||||
"bearerAuth": []
|
||||
}]
|
||||
|
||||
#swagger.parameters['id'] = {
|
||||
in: 'path',
|
||||
description: 'User ID.',
|
||||
required: true,
|
||||
type: 'string'
|
||||
}
|
||||
|
||||
#swagger.parameters['id_role'] = {
|
||||
in: 'path',
|
||||
description: 'User Role ID.',
|
||||
required: true,
|
||||
type: 'string'
|
||||
}
|
||||
*/
|
||||
|
||||
try {
|
||||
const schema = Joi.object().keys({
|
||||
id: Joi.string().uuid().required().label('ID'),
|
||||
id_role: Joi.string().uuid().required().label('ID'),
|
||||
});
|
||||
|
||||
const param: { id: string, id_role: string } = await schema.validateAsync(req.params);
|
||||
|
||||
const userRepository = OrmHelper.DB.getRepository(User);
|
||||
const repo_role = OrmHelper.DB.getRepository(UserRole);
|
||||
|
||||
const data = await userRepository.findOne({
|
||||
relations: {
|
||||
roles: true,
|
||||
},
|
||||
where: { id: param.id }
|
||||
});
|
||||
|
||||
if (data != null) {
|
||||
const new_role = await repo_role.findOneBy({ id: param.id_role });
|
||||
|
||||
if (data.roles) {
|
||||
for (let r of data.roles) {
|
||||
if (r.id == param.id_role) {
|
||||
//already added
|
||||
return ReturnHelper.errorResponse(res, 409, 401, Language.lang.failed_insert + ", roles already exists ", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!data.roles) {
|
||||
data.roles = [];
|
||||
}
|
||||
|
||||
data.roles.push(new_role);
|
||||
|
||||
await userRepository.save(data);
|
||||
|
||||
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, data);
|
||||
} else {
|
||||
return ReturnHelper.errorResponse(res, 404, 402, Language.lang.failed_not_found, "");
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
log.error(e);
|
||||
const err = e as Error;
|
||||
|
||||
return ReturnHelper.errorResponse(res, 500, 403, Language.lang.failed_update, err.message);
|
||||
}
|
||||
}
|
||||
|
||||
static async deleteRole(req: Request, res: Response, next: NextFunction): Promise<Response> {
|
||||
/*
|
||||
#swagger.tags = ['User']
|
||||
#swagger.security = [{
|
||||
"bearerAuth": []
|
||||
}]
|
||||
|
||||
#swagger.parameters['id'] = {
|
||||
in: 'path',
|
||||
description: 'User ID.',
|
||||
required: true,
|
||||
type: 'string'
|
||||
}
|
||||
|
||||
#swagger.parameters['id_role'] = {
|
||||
in: 'path',
|
||||
description: 'User Role ID.',
|
||||
required: true,
|
||||
type: 'string'
|
||||
}
|
||||
*/
|
||||
|
||||
try {
|
||||
const schema = Joi.object().keys({
|
||||
id: Joi.string().uuid().required().label('ID'),
|
||||
id_role: Joi.string().uuid().required().label('ID'),
|
||||
});
|
||||
|
||||
const param: { id: string, id_role: string } = await schema.validateAsync(req.params);
|
||||
|
||||
const userRepository = OrmHelper.DB.getRepository(User);
|
||||
|
||||
const data = await userRepository.findOne({
|
||||
relations: {
|
||||
roles: true,
|
||||
},
|
||||
where: { id: param.id }
|
||||
});
|
||||
|
||||
if (data != null && data.roles) {
|
||||
let found = false;
|
||||
let new_roles: UserRole[] = [];
|
||||
|
||||
for (let r of data.roles) {
|
||||
if (r.id != param.id_role) {
|
||||
new_roles.push(r);
|
||||
} else if (r.id == param.id_role) {
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
data.roles = new_roles;
|
||||
|
||||
if (found) {
|
||||
await userRepository.save(data);
|
||||
|
||||
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, data);
|
||||
} else {
|
||||
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found + ", role not found", "");
|
||||
}
|
||||
} else {
|
||||
return ReturnHelper.errorResponse(res, 404, 402, Language.lang.failed_not_found, "");
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
log.error(e);
|
||||
const err = e as Error;
|
||||
|
||||
return ReturnHelper.errorResponse(res, 500, 403, Language.lang.failed_delete, err.message);
|
||||
}
|
||||
}
|
||||
|
||||
static async updateProfile(req: Request, res: Response, next: NextFunction): Promise<Response> {
|
||||
/*
|
||||
#swagger.tags = ['User']
|
||||
@ -411,7 +556,6 @@ export class UserController {
|
||||
password: Joi.string().allow('').optional().label('Password'),
|
||||
retype_password: Joi.ref('password'),
|
||||
name: Joi.string().max(64).required().label('Name'),
|
||||
id_role: Joi.string().uuid().required().label('Role'),
|
||||
status: Joi.string().required().label('Status'),
|
||||
});
|
||||
|
||||
@ -427,7 +571,6 @@ export class UserController {
|
||||
data.name = param.name
|
||||
data.username = param.username
|
||||
data.email = param.email
|
||||
data.id_role = param.id_role
|
||||
data.status = param.status
|
||||
|
||||
if (param.password) {
|
||||
@ -525,7 +668,10 @@ export class UserController {
|
||||
|
||||
const userRepository = OrmHelper.DB.getRepository(User);
|
||||
|
||||
const detail = (await userRepository.findOneBy({ id: param.id }));
|
||||
const detail = await userRepository.findOne({
|
||||
relations: ['roles', 'roles.application'],
|
||||
where: { id: param.id }
|
||||
});
|
||||
|
||||
if (detail != null) {
|
||||
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, detail);
|
||||
|
||||
Reference in New Issue
Block a user