groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1641 from automatisch/remove-role-id-from-user-serializer

Browse Source 
chore: Remove redundant roleId from user serializer
This commit is contained in:
Ömer Faruk Aydın
2024-02-23 11:28:20 +01:00
committed by GitHub
parent c36b652d5b 3abf61152a
commit 9a7cdf42e1
5 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/backend/src/serializers/user.js
View File

@@ -9,7 +9,6 @@ const userSerializer = (user) => {
createdAt: user.createdAt, createdAt: user.createdAt,
updatedAt: user.updatedAt, updatedAt: user.updatedAt,
fullName: user.fullName, fullName: user.fullName,
roleId: user.roleId,
}; };
if (user.role) { if (user.role) {

1
packages/backend/src/serializers/user.test.js
View File

@@ -33,7 +33,6 @@ describe('userSerializer', () => {
email: user.email, email: user.email,
fullName: user.fullName, fullName: user.fullName,
id: user.id, id: user.id,
roleId: user.roleId,
updatedAt: user.updatedAt, updatedAt: user.updatedAt,
}; };

1
packages/backend/test/mocks/rest/api/v1/users/get-current-user.js
View File

@@ -15,7 +15,6 @@ const getCurrentUserMock = (currentUser, role) => {
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.toISOString(),
}, },
roleId: role.id,
trialExpiryDate: currentUser.trialExpiryDate.toISOString(), trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
updatedAt: currentUser.updatedAt.toISOString(), updatedAt: currentUser.updatedAt.toISOString(),
}, },

1
packages/backend/test/mocks/rest/api/v1/users/get-user.js
View File

@@ -14,7 +14,6 @@ const getUserMock = (currentUser, role) => {
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.toISOString(),
}, },
roleId: role.id,
trialExpiryDate: currentUser.trialExpiryDate.toISOString(), trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
updatedAt: currentUser.updatedAt.toISOString(), updatedAt: currentUser.updatedAt.toISOString(),
}, },

4
packages/backend/test/mocks/rest/api/v1/users/get-users.js
View File

@@ -1,6 +1,7 @@
const getUsersMock = async (users, roles) => { const getUsersMock = async (users, roles) => {
const data = users.map((user) => { const data = users.map((user) => {
const role = roles.find((r) => r.id === user.roleId); const role = roles.find((r) => r.id === user.roleId);
return { return {
createdAt: user.createdAt.toISOString(), createdAt: user.createdAt.toISOString(),
email: user.email, email: user.email,
@@ -16,8 +17,7 @@ const getUsersMock = async (users, roles) => {
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.toISOString(),
} }
: null, // Fallback to null if role not found : null,
roleId: user.roleId,
trialExpiryDate: user.trialExpiryDate.toISOString(), trialExpiryDate: user.trialExpiryDate.toISOString(),
updatedAt: user.updatedAt.toISOString(), updatedAt: user.updatedAt.toISOString(),
}; };