From 67706c5fc3a36da3d7653fc408a19b2ae8afabcb Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Wed, 20 Jul 2022 16:58:53 -0300 Subject: [PATCH] FIX: returning hierarchies the right way --- src/modules/users/users.controller.ts | 2 +- src/modules/users/users.service.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts index f34a82b..d3d541c 100644 --- a/src/modules/users/users.controller.ts +++ b/src/modules/users/users.controller.ts @@ -84,7 +84,7 @@ export class UsersController { async getAllHierarchies( @User() user: RequestUser, @Headers('dadosfera-lang') language, - ) { + ): Promise { this.logger.info('getAllHierarchies', { user }); this.userService.setLanguage(language); return await this.userService.getAllHierarchies(); diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index e19ba54..6b05532 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -148,11 +148,12 @@ export class UsersService implements OnModuleInit { return lastValueFrom(this.usersClientService.UserRemove(id)); } - getAllHierarchies(): Hierarchy[] { - return Object.keys(HIERARCHIES).map((key) => ({ + getAllHierarchies(): { hierarchies: Hierarchy[] } { + const hierarchies = Object.keys(HIERARCHIES).map((key) => ({ id: key, name: HIERARCHIES[key]?.name[this.language] || key, })); + return { hierarchies }; } adjustUsersPayload(users: UserByCustomer[]) {