UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-05-09 07:09:42 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: role

Browse Source
This commit is contained in:
abdou6666 2025-01-02 17:59:30 +01:00
parent 19cef32736
commit a8a71b0fff
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/user/controllers/role.controller.spec.ts
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Hexastack. All rights reserved. * Copyright © 2025 Hexastack. All rights reserved.
* *
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -30,7 +30,7 @@ import { PermissionRepository } from '../repositories/permission.repository';
import { RoleRepository } from '../repositories/role.repository'; import { RoleRepository } from '../repositories/role.repository';
import { UserRepository } from '../repositories/user.repository'; import { UserRepository } from '../repositories/user.repository';
import { PermissionModel } from '../schemas/permission.schema'; import { PermissionModel } from '../schemas/permission.schema';
import { Role, RoleModel } from '../schemas/role.schema'; import { Role, RoleFull, RoleModel } from '../schemas/role.schema';
import { UserModel } from '../schemas/user.schema'; import { UserModel } from '../schemas/user.schema';
import { PermissionService } from '../services/permission.service'; import { PermissionService } from '../services/permission.service';
import { RoleService } from '../services/role.service'; import { RoleService } from '../services/role.service';
@ -83,8 +83,8 @@ describe('RoleController', () => {
roleService = module.get<RoleService>(RoleService); roleService = module.get<RoleService>(RoleService);
permissionService = module.get<PermissionService>(PermissionService); permissionService = module.get<PermissionService>(PermissionService);
userService = module.get<UserService>(UserService); userService = module.get<UserService>(UserService);
roleAdmin = await roleService.findOne({ name: 'admin' }); roleAdmin = (await roleService.findOne({ name: 'admin' })) as Role;
rolePublic = await roleService.findOne({ name: 'public' }); rolePublic = (await roleService.findOne({ name: 'public' })) as Role;
}); });
afterAll(async () => { afterAll(async () => {
@ -126,7 +126,7 @@ describe('RoleController', () => {
acc.push(roleWithPermissionsAndUsers); acc.push(roleWithPermissionsAndUsers);
return acc; return acc;
}, []); }, [] as RoleFull[]);
expect(roleService.findAndPopulate).toHaveBeenCalledWith({}, pageQuery); expect(roleService.findAndPopulate).toHaveBeenCalledWith({}, pageQuery);
expect(result).toEqualPayload(rolesWithPermissionsAndUsers); expect(result).toEqualPayload(rolesWithPermissionsAndUsers);
@ -136,10 +136,10 @@ describe('RoleController', () => {
describe('findOne', () => { describe('findOne', () => {
it('should find one role', async () => { it('should find one role', async () => {
jest.spyOn(roleService, 'findOne'); jest.spyOn(roleService, 'findOne');
const result = await roleController.findOne(roleAdmin.id, []); const result = (await roleController.findOne(roleAdmin.id, [])) as Role;
expect(roleService.findOne).toHaveBeenCalledWith(roleAdmin.id); expect(roleService.findOne).toHaveBeenCalledWith(roleAdmin.id);
expect(result).toEqualPayload( expect(result).toEqualPayload(
roleFixtures.find((role) => role.name === 'admin'), roleFixtures.find((role) => role.name === 'admin') as Role,
); );
}); });

12
api/src/user/repositories/role.repository.spec.ts
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Hexastack. All rights reserved. * Copyright © 2025 Hexastack. All rights reserved.
* *
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -22,7 +22,7 @@ import { PermissionRepository } from '../repositories/permission.repository';
import { RoleRepository } from '../repositories/role.repository'; import { RoleRepository } from '../repositories/role.repository';
import { UserRepository } from '../repositories/user.repository'; import { UserRepository } from '../repositories/user.repository';
import { PermissionModel } from '../schemas/permission.schema'; import { PermissionModel } from '../schemas/permission.schema';
import { Role, RoleModel } from '../schemas/role.schema'; import { Role, RoleFull, RoleModel } from '../schemas/role.schema';
import { User, UserModel } from '../schemas/user.schema'; import { User, UserModel } from '../schemas/user.schema';
import { roleFixtures } from './../../utils/test/fixtures/role'; import { roleFixtures } from './../../utils/test/fixtures/role';
@ -54,13 +54,13 @@ describe('RoleRepository', () => {
permissionRepository = permissionRepository =
module.get<PermissionRepository>(PermissionRepository); module.get<PermissionRepository>(PermissionRepository);
roleModel = module.get<Model<Role>>(getModelToken('Role')); roleModel = module.get<Model<Role>>(getModelToken('Role'));
role = await roleRepository.findOne({ name: 'admin' }); role = (await roleRepository.findOne({ name: 'admin' })) as Role;
users = (await userRepository.findAll()).filter((user) => users = (await userRepository.findAll()).filter((user) =>
user.roles.includes(role.id), user.roles.includes(role.id),
); );
roleToDelete = await roleRepository.findOne({ roleToDelete = (await roleRepository.findOne({
name: 'manager', name: 'manager',
}); })) as Role;
}); });
afterAll(async () => { afterAll(async () => {
@ -104,7 +104,7 @@ describe('RoleRepository', () => {
}; };
acc.push(roleWithPermissionsAndUsers); acc.push(roleWithPermissionsAndUsers);
return acc; return acc;
}, []); }, [] as RoleFull[]);
expect(roleModel.find).toHaveBeenCalledWith({}, undefined); expect(roleModel.find).toHaveBeenCalledWith({}, undefined);
expect(result).toEqualPayload(rolesWithPermissionsAndUsers); expect(result).toEqualPayload(rolesWithPermissionsAndUsers);

8
api/src/user/services/role.service.spec.ts
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2024 Hexastack. All rights reserved. * Copyright © 2025 Hexastack. All rights reserved.
* *
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -21,7 +21,7 @@ import { PermissionRepository } from '../repositories/permission.repository';
import { RoleRepository } from '../repositories/role.repository'; import { RoleRepository } from '../repositories/role.repository';
import { UserRepository } from '../repositories/user.repository'; import { UserRepository } from '../repositories/user.repository';
import { Permission, PermissionModel } from '../schemas/permission.schema'; import { Permission, PermissionModel } from '../schemas/permission.schema';
import { Role, RoleModel } from '../schemas/role.schema'; import { Role, RoleFull, RoleModel } from '../schemas/role.schema';
import { User, UserModel } from '../schemas/user.schema'; import { User, UserModel } from '../schemas/user.schema';
import { roleFixtures } from './../../utils/test/fixtures/role'; import { roleFixtures } from './../../utils/test/fixtures/role';
@ -55,7 +55,7 @@ describe('RoleService', () => {
userRepository = module.get<UserRepository>(UserRepository); userRepository = module.get<UserRepository>(UserRepository);
permissionRepository = permissionRepository =
module.get<PermissionRepository>(PermissionRepository); module.get<PermissionRepository>(PermissionRepository);
role = await roleRepository.findOne({ name: 'admin' }); role = (await roleRepository.findOne({ name: 'admin' })) as Role;
users = (await userRepository.findAll()).filter((user) => users = (await userRepository.findAll()).filter((user) =>
user.roles.includes(role.id), user.roles.includes(role.id),
); );
@ -105,7 +105,7 @@ describe('RoleService', () => {
}; };
acc.push(roleWithPermissionsAndUsers); acc.push(roleWithPermissionsAndUsers);
return acc; return acc;
}, []); }, [] as RoleFull[]);
expect(roleRepository.findPageAndPopulate).toHaveBeenCalledWith( expect(roleRepository.findPageAndPopulate).toHaveBeenCalledWith(
{}, {},