From 3abf61152a541a1345fe6b77f588cb36a83ba58a Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Fri, 23 Feb 2024 01:30:57 +0100
Subject: [PATCH] chore: Remove redundant roleId from user serializer

---
 packages/backend/src/serializers/user.js                      | 1 -
 packages/backend/src/serializers/user.test.js                 | 1 -
 .../backend/test/mocks/rest/api/v1/users/get-current-user.js  | 1 -
 packages/backend/test/mocks/rest/api/v1/users/get-user.js     | 1 -
 packages/backend/test/mocks/rest/api/v1/users/get-users.js    | 4 ++--
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/serializers/user.js b/packages/backend/src/serializers/user.js
index 763a88b0..676ca562 100644
--- a/packages/backend/src/serializers/user.js
+++ b/packages/backend/src/serializers/user.js
@@ -9,7 +9,6 @@ const userSerializer = (user) => {
     createdAt: user.createdAt,
     updatedAt: user.updatedAt,
     fullName: user.fullName,
-    roleId: user.roleId,
   };
 
   if (user.role) {
diff --git a/packages/backend/src/serializers/user.test.js b/packages/backend/src/serializers/user.test.js
index bc6f0f48..07f6c8cd 100644
--- a/packages/backend/src/serializers/user.test.js
+++ b/packages/backend/src/serializers/user.test.js
@@ -33,7 +33,6 @@ describe('userSerializer', () => {
       email: user.email,
       fullName: user.fullName,
       id: user.id,
-      roleId: user.roleId,
       updatedAt: user.updatedAt,
     };
 
diff --git a/packages/backend/test/mocks/rest/api/v1/users/get-current-user.js b/packages/backend/test/mocks/rest/api/v1/users/get-current-user.js
index 7bdec2be..91eb5e8d 100644
--- a/packages/backend/test/mocks/rest/api/v1/users/get-current-user.js
+++ b/packages/backend/test/mocks/rest/api/v1/users/get-current-user.js
@@ -15,7 +15,6 @@ const getCurrentUserMock = (currentUser, role) => {
         name: role.name,
         updatedAt: role.updatedAt.toISOString(),
       },
-      roleId: role.id,
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
       updatedAt: currentUser.updatedAt.toISOString(),
     },
diff --git a/packages/backend/test/mocks/rest/api/v1/users/get-user.js b/packages/backend/test/mocks/rest/api/v1/users/get-user.js
index cacfc473..d3b5a0f8 100644
--- a/packages/backend/test/mocks/rest/api/v1/users/get-user.js
+++ b/packages/backend/test/mocks/rest/api/v1/users/get-user.js
@@ -14,7 +14,6 @@ const getUserMock = (currentUser, role) => {
         name: role.name,
         updatedAt: role.updatedAt.toISOString(),
       },
-      roleId: role.id,
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
       updatedAt: currentUser.updatedAt.toISOString(),
     },
diff --git a/packages/backend/test/mocks/rest/api/v1/users/get-users.js b/packages/backend/test/mocks/rest/api/v1/users/get-users.js
index 73d27474..26336e20 100644
--- a/packages/backend/test/mocks/rest/api/v1/users/get-users.js
+++ b/packages/backend/test/mocks/rest/api/v1/users/get-users.js
@@ -1,6 +1,7 @@
 const getUsersMock = async (users, roles) => {
   const data = users.map((user) => {
     const role = roles.find((r) => r.id === user.roleId);
+
     return {
       createdAt: user.createdAt.toISOString(),
       email: user.email,
@@ -16,8 +17,7 @@ const getUsersMock = async (users, roles) => {
             name: role.name,
             updatedAt: role.updatedAt.toISOString(),
           }
-        : null, // Fallback to null if role not found
-      roleId: user.roleId,
+        : null,
       trialExpiryDate: user.trialExpiryDate.toISOString(),
       updatedAt: user.updatedAt.toISOString(),
     };