mirror of
https://github.com/dadosfera/maestro.git
synced 2026-11-01 11:39:09 +00:00
FIX: changed get roles to search roles
This commit is contained in:
@@ -89,11 +89,11 @@ export class PermissionsService
|
||||
permissionUsage ? usage === permissionUsage : true,
|
||||
)
|
||||
.map(({ seqid, name }) => ({ id: seqid, name: name[language] }));
|
||||
|
||||
groups.push({
|
||||
title,
|
||||
permissions,
|
||||
});
|
||||
if (permissions?.length)
|
||||
groups.push({
|
||||
title,
|
||||
permissions,
|
||||
});
|
||||
}
|
||||
return groups;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ export enum TrueOrFalseEnum {
|
||||
}
|
||||
export class GetRolesByCustomerReq {
|
||||
@ApiPropertyOptional()
|
||||
permissionIds: string[];
|
||||
permissionId: string[];
|
||||
@ApiPropertyOptional({ enum: TrueOrFalseEnum })
|
||||
getUsers: TrueOrFalseEnum;
|
||||
}
|
||||
|
||||
@@ -69,17 +69,14 @@ export class RolesController {
|
||||
@Get()
|
||||
@ApiOkResponse({ type: GetRolesByCustomerRes })
|
||||
@RequireAllPermissions(PERMISSIONS.USERS.permissions.ADMIN)
|
||||
async getRolesByCustomer(
|
||||
async searchRoles(
|
||||
@User() user: RequestUser,
|
||||
@Query() filters: GetRolesByCustomerReq,
|
||||
@Headers('dadosfera-lang') language,
|
||||
) {
|
||||
this.logger.info('getRolesByCustomer', { user });
|
||||
this.logger.info('searchRoles', { user });
|
||||
this.rolesService.setLanguage(language);
|
||||
return await this.rolesService.getRolesByCustomer(
|
||||
filters,
|
||||
user.customer_id,
|
||||
);
|
||||
return await this.rolesService.roleSearch(filters, user.customer_id);
|
||||
}
|
||||
|
||||
@Post()
|
||||
|
||||
@@ -48,8 +48,8 @@ export class RolesService {
|
||||
const [roleTreated] = this.getRolesPermissionsName([role.role]);
|
||||
return { role: roleTreated };
|
||||
}
|
||||
async getRolesByCustomer(filters: GetRolesByCustomerReq, customerId: string) {
|
||||
let { permissionIds } = filters;
|
||||
async roleSearch(filters: GetRolesByCustomerReq, customerId: string) {
|
||||
let { permissionId: permissionIds } = filters;
|
||||
if (permissionIds && !Array.isArray(permissionIds))
|
||||
permissionIds = [permissionIds];
|
||||
const { getUsers } = filters;
|
||||
@@ -62,7 +62,7 @@ export class RolesService {
|
||||
return seqId;
|
||||
}) || [];
|
||||
const roles = await lastValueFrom(
|
||||
this.rolesClientService.RoleFindAllByCustomerId({
|
||||
this.rolesClientService.RoleSearch({
|
||||
customerId,
|
||||
getUsers: isGetUsers,
|
||||
permissionIds: [],
|
||||
|
||||
Reference in New Issue
Block a user