diff --git a/packages/backend/src/graphql/queries/get-user.test.ts b/packages/backend/src/graphql/queries/get-user.test.ts index 4c427c7b..071fce5b 100644 --- a/packages/backend/src/graphql/queries/get-user.test.ts +++ b/packages/backend/src/graphql/queries/get-user.test.ts @@ -1,10 +1,11 @@ -import request from 'supertest'; +import request, { Test } from 'supertest'; import app from '../../app'; import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id'; import Crypto from 'crypto'; import createRole from '../../../test/fixtures/role'; import createPermission from '../../../test/fixtures/permission'; import createUser from '../../../test/fixtures/user'; +import { IRole, IUser } from '@automatisch/types'; describe('getUser', () => { describe('with unauthorized user', () => { @@ -32,11 +33,11 @@ describe('getUser', () => { }); describe('with authorized user', () => { - let role: any, - currentUser: any, - anotherUser: any, - token: any, - requestObject: any; + let role: IRole, + currentUser: IUser, + anotherUser: IUser, + token: string, + requestObject: Test; beforeEach(async () => { role = await createRole({ @@ -87,12 +88,12 @@ describe('getUser', () => { const expectedResponsePayload = { data: { getUser: { - createdAt: anotherUser.created_at.getTime().toString(), + createdAt: (anotherUser.createdAt as Date).getTime().toString(), email: anotherUser.email, - fullName: anotherUser.full_name, + fullName: anotherUser.fullName, id: anotherUser.id, role: { id: role.id, name: role.name }, - updatedAt: anotherUser.updated_at.getTime().toString(), + updatedAt: (anotherUser.updatedAt as Date).getTime().toString(), }, }, }; diff --git a/packages/backend/test/fixtures/permission.ts b/packages/backend/test/fixtures/permission.ts index 398dd31a..e5232674 100644 --- a/packages/backend/test/fixtures/permission.ts +++ b/packages/backend/test/fixtures/permission.ts @@ -1,3 +1,4 @@ +import { IPermission } from '@automatisch/types'; import createRole from './role'; type PermissionParams = { @@ -6,9 +7,11 @@ type PermissionParams = { subject?: string; }; -const createPermission = async (params: PermissionParams = {}) => { +const createPermission = async ( + params: PermissionParams = {} +): Promise => { const permissionData = { - role_id: params?.roleId || (await createRole()).id, + roleId: params?.roleId || (await createRole()).id, action: params?.action || 'read', subject: params?.subject || 'User', }; diff --git a/packages/backend/test/fixtures/role.ts b/packages/backend/test/fixtures/role.ts index b6124116..dc568c3d 100644 --- a/packages/backend/test/fixtures/role.ts +++ b/packages/backend/test/fixtures/role.ts @@ -1,9 +1,11 @@ +import { IRole } from '@automatisch/types'; + type RoleParams = { name?: string; key?: string; }; -const createRole = async (params: RoleParams = {}) => { +const createRole = async (params: RoleParams = {}): Promise => { params.name = params?.name || 'Viewer'; params.key = params?.key || 'viewer'; diff --git a/packages/backend/test/fixtures/user.ts b/packages/backend/test/fixtures/user.ts index 7bb9bd03..f7aaeab6 100644 --- a/packages/backend/test/fixtures/user.ts +++ b/packages/backend/test/fixtures/user.ts @@ -10,8 +10,8 @@ type UserParams = { const createUser = async (params: UserParams = {}) => { const userData = { - role_id: params?.roleId || (await createRole()).id, - full_name: params?.fullName || faker.person.fullName(), + roleId: params?.roleId || (await createRole()).id, + fullName: params?.fullName || faker.person.fullName(), email: params?.email || faker.internet.email(), password: params?.password || faker.internet.password(), }; diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts index 74f49837..228558e3 100644 --- a/packages/types/index.d.ts +++ b/packages/types/index.d.ts @@ -99,6 +99,8 @@ export interface IUser { steps: IStep[]; role: IRole; permissions: IPermission[]; + createdAt: string | Date; + updatedAt: string | Date; } export interface IRole {