Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Remove empty associations from serializers #1692

Merged
merged 2 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,29 @@ import { describe, it, expect, beforeEach } from 'vitest';
import request from 'supertest';
import app from '../../../../app.js';
import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
import { createPermission } from '../../../../../test/factories/permission';
import { createRole } from '../../../../../test/factories/role';
import { createUser } from '../../../../../test/factories/user';
import getCurrentUserMock from '../../../../../test/mocks/rest/api/v1/users/get-current-user';

describe('GET /api/v1/users/me', () => {
let role, currentUser, token;
let role, permissionOne, permissionTwo, currentUser, token;

beforeEach(async () => {
currentUser = await createUser();
role = await currentUser.$relatedQuery('role');
role = await createRole();

permissionOne = await createPermission({
roleId: role.id,
});

permissionTwo = await createPermission({
roleId: role.id,
});

currentUser = await createUser({
roleId: role.id,
});

token = createAuthTokenByUserId(currentUser.id);
});

Expand All @@ -20,7 +34,11 @@ describe('GET /api/v1/users/me', () => {
.set('Authorization', token)
.expect(200);

const expectedPayload = getCurrentUserMock(currentUser, role);
const expectedPayload = getCurrentUserMock(currentUser, role, [
permissionOne,
permissionTwo,
]);

expect(response.body).toEqual(expectedPayload);
});
});
2 changes: 1 addition & 1 deletion packages/backend/src/serializers/role.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const roleSerializer = (role) => {
isAdmin: role.isAdmin,
};

if (role.permissions) {
if (role.permissions?.length > 0) {
roleData.permissions = role.permissions.map((permission) =>
permissionSerializer(permission)
);
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/serializers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const userSerializer = (user) => {
userData.role = roleSerializer(user.role);
}

if (user.permissions) {
if (user.permissions?.length > 0) {
userData.permissions = user.permissions.map((permission) =>
permissionSerializer(permission)
);
Expand Down
12 changes: 10 additions & 2 deletions packages/backend/test/mocks/rest/api/v1/users/get-current-user.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
const getCurrentUserMock = (currentUser, role) => {
const getCurrentUserMock = (currentUser, role, permissions) => {
return {
data: {
createdAt: currentUser.createdAt.getTime(),
email: currentUser.email,
fullName: currentUser.fullName,
id: currentUser.id,
permissions: [],
permissions: permissions.map((permission) => ({
id: permission.id,
roleId: permission.roleId,
action: permission.action,
subject: permission.subject,
conditions: permission.conditions,
createdAt: permission.createdAt.getTime(),
updatedAt: permission.updatedAt.getTime(),
})),
role: {
createdAt: role.createdAt.getTime(),
description: null,
Expand Down
Loading