diff --git a/packages/backend/src/serializers/permission.js b/packages/backend/src/serializers/permission.js index b68868c9..07b82020 100644 --- a/packages/backend/src/serializers/permission.js +++ b/packages/backend/src/serializers/permission.js @@ -5,8 +5,8 @@ const permissionSerializer = (permission) => { action: permission.action, subject: permission.subject, conditions: permission.conditions, - createdAt: permission.createdAt, - updatedAt: permission.updatedAt, + createdAt: permission.createdAt.getTime(), + updatedAt: permission.updatedAt.getTime(), }; }; diff --git a/packages/backend/src/serializers/permission.test.js b/packages/backend/src/serializers/permission.test.js index 19636842..9fff7f61 100644 --- a/packages/backend/src/serializers/permission.test.js +++ b/packages/backend/src/serializers/permission.test.js @@ -16,8 +16,8 @@ describe('permissionSerializer', () => { action: permission.action, subject: permission.subject, conditions: permission.conditions, - createdAt: permission.createdAt, - updatedAt: permission.updatedAt, + createdAt: permission.createdAt.getTime(), + updatedAt: permission.updatedAt.getTime(), }; expect(permissionSerializer(permission)).toEqual(expectedPayload); diff --git a/packages/backend/src/serializers/role.js b/packages/backend/src/serializers/role.js index cc3be89c..9cbf0246 100644 --- a/packages/backend/src/serializers/role.js +++ b/packages/backend/src/serializers/role.js @@ -6,8 +6,8 @@ const roleSerializer = (role) => { name: role.name, key: role.key, description: role.description, - createdAt: role.createdAt, - updatedAt: role.updatedAt, + createdAt: role.createdAt.getTime(), + updatedAt: role.updatedAt.getTime(), isAdmin: role.isAdmin, }; diff --git a/packages/backend/src/serializers/role.test.js b/packages/backend/src/serializers/role.test.js index 85f239ec..b2929019 100644 --- a/packages/backend/src/serializers/role.test.js +++ b/packages/backend/src/serializers/role.test.js @@ -29,8 +29,8 @@ describe('roleSerializer', () => { name: role.name, key: role.key, description: role.description, - createdAt: role.createdAt, - updatedAt: role.updatedAt, + createdAt: role.createdAt.getTime(), + updatedAt: role.updatedAt.getTime(), isAdmin: role.isAdmin, }; diff --git a/packages/backend/src/serializers/user.js b/packages/backend/src/serializers/user.js index 676ca562..4fed507f 100644 --- a/packages/backend/src/serializers/user.js +++ b/packages/backend/src/serializers/user.js @@ -6,8 +6,8 @@ const userSerializer = (user) => { let userData = { id: user.id, email: user.email, - createdAt: user.createdAt, - updatedAt: user.updatedAt, + createdAt: user.createdAt.getTime(), + updatedAt: user.updatedAt.getTime(), fullName: user.fullName, }; diff --git a/packages/backend/src/serializers/user.test.js b/packages/backend/src/serializers/user.test.js index 8369bb60..7a80cb9a 100644 --- a/packages/backend/src/serializers/user.test.js +++ b/packages/backend/src/serializers/user.test.js @@ -31,11 +31,11 @@ describe('userSerializer', () => { vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false); const expectedPayload = { - createdAt: user.createdAt, + createdAt: user.createdAt.getTime(), email: user.email, fullName: user.fullName, id: user.id, - updatedAt: user.updatedAt, + updatedAt: user.updatedAt.getTime(), }; expect(userSerializer(user)).toEqual(expectedPayload); @@ -67,7 +67,7 @@ describe('userSerializer', () => { it('should return user data with trial expiry date', async () => { vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true); - await user.$query().patch({ + await user.$query().patchAndFetch({ trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(), }); diff --git a/packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js b/packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js index ae1505de..05942763 100644 --- a/packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js +++ b/packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js @@ -5,16 +5,16 @@ const getRoleMock = async (role, permissions) => { name: role.name, isAdmin: role.isAdmin, description: role.description, - createdAt: role.createdAt.toISOString(), - updatedAt: role.updatedAt.toISOString(), + createdAt: role.createdAt.getTime(), + updatedAt: role.updatedAt.getTime(), permissions: permissions.map((permission) => ({ id: permission.id, action: permission.action, conditions: permission.conditions, roleId: permission.roleId, subject: permission.subject, - createdAt: permission.createdAt.toISOString(), - updatedAt: permission.updatedAt.toISOString(), + createdAt: permission.createdAt.getTime(), + updatedAt: permission.updatedAt.getTime(), })), }; diff --git a/packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js b/packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js index f92a24e2..fdb7a05b 100644 --- a/packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js +++ b/packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js @@ -6,8 +6,8 @@ const getRolesMock = async (roles) => { name: role.name, isAdmin: role.isAdmin, description: role.description, - createdAt: role.createdAt.toISOString(), - updatedAt: role.updatedAt.toISOString(), + createdAt: role.createdAt.getTime(), + updatedAt: role.updatedAt.getTime(), }; }); diff --git a/packages/backend/test/mocks/rest/api/v1/admin/users/get-user.js b/packages/backend/test/mocks/rest/api/v1/admin/users/get-user.js index d3b5a0f8..d917f16f 100644 --- a/packages/backend/test/mocks/rest/api/v1/admin/users/get-user.js +++ b/packages/backend/test/mocks/rest/api/v1/admin/users/get-user.js @@ -1,21 +1,21 @@ const getUserMock = (currentUser, role) => { return { data: { - createdAt: currentUser.createdAt.toISOString(), + createdAt: currentUser.createdAt.getTime(), email: currentUser.email, fullName: currentUser.fullName, id: currentUser.id, role: { - createdAt: role.createdAt.toISOString(), + createdAt: role.createdAt.getTime(), description: null, id: role.id, isAdmin: role.isAdmin, key: role.key, name: role.name, - updatedAt: role.updatedAt.toISOString(), + updatedAt: role.updatedAt.getTime(), }, trialExpiryDate: currentUser.trialExpiryDate.toISOString(), - updatedAt: currentUser.updatedAt.toISOString(), + updatedAt: currentUser.updatedAt.getTime(), }, meta: { count: 1, diff --git a/packages/backend/test/mocks/rest/api/v1/admin/users/get-users.js b/packages/backend/test/mocks/rest/api/v1/admin/users/get-users.js index 26336e20..0ae51773 100644 --- a/packages/backend/test/mocks/rest/api/v1/admin/users/get-users.js +++ b/packages/backend/test/mocks/rest/api/v1/admin/users/get-users.js @@ -3,23 +3,23 @@ const getUsersMock = async (users, roles) => { const role = roles.find((r) => r.id === user.roleId); return { - createdAt: user.createdAt.toISOString(), + createdAt: user.createdAt.getTime(), email: user.email, fullName: user.fullName, id: user.id, role: role ? { - createdAt: role.createdAt.toISOString(), + createdAt: role.createdAt.getTime(), description: role.description, id: role.id, isAdmin: role.isAdmin, key: role.key, name: role.name, - updatedAt: role.updatedAt.toISOString(), + updatedAt: role.updatedAt.getTime(), } : null, trialExpiryDate: user.trialExpiryDate.toISOString(), - updatedAt: user.updatedAt.toISOString(), + updatedAt: user.updatedAt.getTime(), }; }); 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 91eb5e8d..f498e0d1 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 @@ -1,22 +1,22 @@ const getCurrentUserMock = (currentUser, role) => { return { data: { - createdAt: currentUser.createdAt.toISOString(), + createdAt: currentUser.createdAt.getTime(), email: currentUser.email, fullName: currentUser.fullName, id: currentUser.id, permissions: [], role: { - createdAt: role.createdAt.toISOString(), + createdAt: role.createdAt.getTime(), description: null, id: role.id, isAdmin: role.isAdmin, key: role.key, name: role.name, - updatedAt: role.updatedAt.toISOString(), + updatedAt: role.updatedAt.getTime(), }, trialExpiryDate: currentUser.trialExpiryDate.toISOString(), - updatedAt: currentUser.updatedAt.toISOString(), + updatedAt: currentUser.updatedAt.getTime(), }, meta: { count: 1,