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

feat: Use timestamp for serializer date objects

Browse Source
This commit is contained in:
Faruk AYDIN
2024-02-26 14:11:56 +01:00
parent 04e06db430
commit 94f171d757
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/serializers/permission.js
View File

@@ -5,8 +5,8 @@ const permissionSerializer = (permission) => {
action: permission.action, action: permission.action,
subject: permission.subject, subject: permission.subject,
conditions: permission.conditions, conditions: permission.conditions,
createdAt: permission.createdAt, createdAt: permission.createdAt.getTime(),
updatedAt: permission.updatedAt, updatedAt: permission.updatedAt.getTime(),
}; };
}; };

4
packages/backend/src/serializers/permission.test.js
View File

@@ -16,8 +16,8 @@ describe('permissionSerializer', () => {
action: permission.action, action: permission.action,
subject: permission.subject, subject: permission.subject,
conditions: permission.conditions, conditions: permission.conditions,
createdAt: permission.createdAt, createdAt: permission.createdAt.getTime(),
updatedAt: permission.updatedAt, updatedAt: permission.updatedAt.getTime(),
}; };
expect(permissionSerializer(permission)).toEqual(expectedPayload); expect(permissionSerializer(permission)).toEqual(expectedPayload);

4
packages/backend/src/serializers/role.js
View File

@@ -6,8 +6,8 @@ const roleSerializer = (role) => {
name: role.name, name: role.name,
key: role.key, key: role.key,
description: role.description, description: role.description,
createdAt: role.createdAt, createdAt: role.createdAt.getTime(),
updatedAt: role.updatedAt, updatedAt: role.updatedAt.getTime(),
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
}; };

4
packages/backend/src/serializers/role.test.js
View File

@@ -29,8 +29,8 @@ describe('roleSerializer', () => {
name: role.name, name: role.name,
key: role.key, key: role.key,
description: role.description, description: role.description,
createdAt: role.createdAt, createdAt: role.createdAt.getTime(),
updatedAt: role.updatedAt, updatedAt: role.updatedAt.getTime(),
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
}; };

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

@@ -6,8 +6,8 @@ const userSerializer = (user) => {
let userData = { let userData = {
id: user.id, id: user.id,
email: user.email, email: user.email,
createdAt: user.createdAt, createdAt: user.createdAt.getTime(),
updatedAt: user.updatedAt, updatedAt: user.updatedAt.getTime(),
fullName: user.fullName, fullName: user.fullName,
}; };

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

@@ -31,11 +31,11 @@ describe('userSerializer', () => {
vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false); vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
const expectedPayload = { const expectedPayload = {
createdAt: user.createdAt, createdAt: user.createdAt.getTime(),
email: user.email, email: user.email,
fullName: user.fullName, fullName: user.fullName,
id: user.id, id: user.id,
updatedAt: user.updatedAt, updatedAt: user.updatedAt.getTime(),
}; };
expect(userSerializer(user)).toEqual(expectedPayload); expect(userSerializer(user)).toEqual(expectedPayload);
@@ -67,7 +67,7 @@ describe('userSerializer', () => {
it('should return user data with trial expiry date', async () => { it('should return user data with trial expiry date', async () => {
vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true); vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
await user.$query().patch({ await user.$query().patchAndFetch({
trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(), trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(),
}); });

8
packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js
View File

@@ -5,16 +5,16 @@ const getRoleMock = async (role, permissions) => {
name: role.name, name: role.name,
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
description: role.description, description: role.description,
createdAt: role.createdAt.toISOString(), createdAt: role.createdAt.getTime(),
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.getTime(),
permissions: permissions.map((permission) => ({ permissions: permissions.map((permission) => ({
id: permission.id, id: permission.id,
action: permission.action, action: permission.action,
conditions: permission.conditions, conditions: permission.conditions,
roleId: permission.roleId, roleId: permission.roleId,
subject: permission.subject, subject: permission.subject,
createdAt: permission.createdAt.toISOString(), createdAt: permission.createdAt.getTime(),
updatedAt: permission.updatedAt.toISOString(), updatedAt: permission.updatedAt.getTime(),
})), })),
}; };

4
packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js
View File

@@ -6,8 +6,8 @@ const getRolesMock = async (roles) => {
name: role.name, name: role.name,
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
description: role.description, description: role.description,
createdAt: role.createdAt.toISOString(), createdAt: role.createdAt.getTime(),
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.getTime(),
}; };
}); });

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

@@ -1,21 +1,21 @@
const getUserMock = (currentUser, role) => { const getUserMock = (currentUser, role) => {
return { return {
data: { data: {
createdAt: currentUser.createdAt.toISOString(), createdAt: currentUser.createdAt.getTime(),
email: currentUser.email, email: currentUser.email,
fullName: currentUser.fullName, fullName: currentUser.fullName,
id: currentUser.id, id: currentUser.id,
role: { role: {
createdAt: role.createdAt.toISOString(), createdAt: role.createdAt.getTime(),
description: null, description: null,
id: role.id, id: role.id,
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
key: role.key, key: role.key,
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.getTime(),
}, },
trialExpiryDate: currentUser.trialExpiryDate.toISOString(), trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
updatedAt: currentUser.updatedAt.toISOString(), updatedAt: currentUser.updatedAt.getTime(),
}, },
meta: { meta: {
count: 1, count: 1,

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

@@ -3,23 +3,23 @@ const getUsersMock = async (users, roles) => {
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.getTime(),
email: user.email, email: user.email,
fullName: user.fullName, fullName: user.fullName,
id: user.id, id: user.id,
role: role role: role
? { ? {
createdAt: role.createdAt.toISOString(), createdAt: role.createdAt.getTime(),
description: role.description, description: role.description,
id: role.id, id: role.id,
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
key: role.key, key: role.key,
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.getTime(),
} }
: null, : null,
trialExpiryDate: user.trialExpiryDate.toISOString(), trialExpiryDate: user.trialExpiryDate.toISOString(),
updatedAt: user.updatedAt.toISOString(), updatedAt: user.updatedAt.getTime(),
}; };
}); });

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

@@ -1,22 +1,22 @@
const getCurrentUserMock = (currentUser, role) => { const getCurrentUserMock = (currentUser, role) => {
return { return {
data: { data: {
createdAt: currentUser.createdAt.toISOString(), createdAt: currentUser.createdAt.getTime(),
email: currentUser.email, email: currentUser.email,
fullName: currentUser.fullName, fullName: currentUser.fullName,
id: currentUser.id, id: currentUser.id,
permissions: [], permissions: [],
role: { role: {
createdAt: role.createdAt.toISOString(), createdAt: role.createdAt.getTime(),
description: null, description: null,
id: role.id, id: role.id,
isAdmin: role.isAdmin, isAdmin: role.isAdmin,
key: role.key, key: role.key,
name: role.name, name: role.name,
updatedAt: role.updatedAt.toISOString(), updatedAt: role.updatedAt.getTime(),
}, },
trialExpiryDate: currentUser.trialExpiryDate.toISOString(), trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
updatedAt: currentUser.updatedAt.toISOString(), updatedAt: currentUser.updatedAt.getTime(),
}, },
meta: { meta: {
count: 1, count: 1,