Add roles to route getUsersByIds (#53)

Author: jhoncool

src/controllers/users/get-users-by-ids.ts

@@ -4,7 +4,7 @@ import {ApiTag} from '../../components/api-docs';
 import {makeReqParser, z, zc} from '../../components/zod';
 import {CONTENT_TYPE_JSON} from '../../constants/content-type';
 import {getUsersByIds} from '../../services/users/get-users-by-Ids';
-import {userModelArray} from '../reponse-models/users/user-model-array';
+import {userWithRolesModelArray} from '../reponse-models/users/user-with-roles-model-array';
 
 const requestSchema = {
     body: z.object({
@@ -16,7 +16,7 @@ const parseReq = makeReqParser(requestSchema);
 
 const responseSchema = z
     .object({
-        users: userModelArray.schema,
+        users: userWithRolesModelArray.schema,
     })
     .describe('Users by ids');
 
@@ -25,8 +25,9 @@ export type GetUsersByIdsModel = z.infer<typeof responseSchema>;
 const format = async (
     data: Awaited<ReturnType<typeof getUsersByIds>>,
 ): Promise<GetUsersByIdsModel> => {
+    const users = data.users.map((user) => ({...user, roles: user.roles.map(({role}) => role)}));
     return {
-        users: await userModelArray.format(data.users),
+        users: await userWithRolesModelArray.format(users),
     };
 };
 

src/tests/int/env/opensource/suites/users/get-users-by-ids.test.ts

@@ -13,7 +13,7 @@ type CreatedUsers = {
     user3: ReturnType<typeof pickCreatedUserFields>;
 };
 
-const pickCreatedUserFields = (user: UserModel) => ({
+const pickCreatedUserFields = (user: UserModel, roles: UserRole[]) => ({
     ...pick(user, [
         UserModelColumn.Login,
         UserModelColumn.Email,
@@ -23,6 +23,7 @@ const pickCreatedUserFields = (user: UserModel) => ({
         UserModelColumn.IdpType,
     ]),
     userId: encodeId(user.userId),
+    roles: expect.toIncludeSameMembers(roles),
 });
 
 describe('Get users by ids', () => {
@@ -36,18 +37,20 @@ describe('Get users by ids', () => {
             email: '[email protected]',
             roles: [UserRole.Visitor],
         });
-        createdUsers['user1'] = pickCreatedUserFields(user1);
+        createdUsers['user1'] = pickCreatedUserFields(user1, [UserRole.Visitor]);
 
         const user2 = await createTestUsers({
             login: 'user2',
             firstName: 'User2',
+            roles: [UserRole.Viewer],
         });
-        createdUsers['user2'] = pickCreatedUserFields(user2);
+        createdUsers['user2'] = pickCreatedUserFields(user2, [UserRole.Viewer]);
 
         const user3 = await createTestUsers({
             login: 'user3',
+            roles: [UserRole.Viewer],
         });
-        createdUsers['user3'] = pickCreatedUserFields(user3);
+        createdUsers['user3'] = pickCreatedUserFields(user3, [UserRole.Viewer]);
 
         userTokens = await generateTokens({userId: user1.userId});
     });