Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

userController&test #55

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"test:e2e": "jest --config ./test/jest-e2e.json"
},
"dependencies": {
"@nestjs/common": "^6.0.0",
"@nestjs/core": "^6.0.0",
"@nestjs/common": "^6.2.4",
"@nestjs/core": "^6.2.4",
"@nestjs/platform-express": "^6.0.0",
"@nestjs/typeorm": "^6.1.1",
"class-validator": "^0.9.1",
Expand All @@ -33,12 +33,13 @@
"web3": "^1.0.0-beta.55"
},
"devDependencies": {
"@nestjs/testing": "^6.1.1",
"@nestjs/testing": "^6.2.4",
"@types/express": "^4.16.0",
"@types/jest": "^23.3.13",
"@types/node": "^10.12.18",
"@types/supertest": "^2.0.7",
"jest": "^23.6.0",
"jest-create-mock-instance": "^1.1.0",
"nodemon": "^1.18.9",
"prettier": "^1.15.3",
"supertest": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions server/src/app/user/user.service.impl.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {TestingModule, Test} from '@nestjs/testing';
import {User} from '../../domain/user/user.entity';
import {UserDto} from '../../domain/user/dto/user.dto';
import {UserRepository} from '../../port/persistence/repository/user.repository.impl';
import {BadRequestException} from "@nestjs/common";

describe('UserServiceImpl', () => {
const address = 'testAddress';
Expand Down Expand Up @@ -44,11 +45,13 @@ describe('UserServiceImpl', () => {

expect(await service.get(id)).toBe(user);
});
it('should return undefined', async () => {
it('should throw BadRequestException', async () => {
when(mockRepository.findById(null)).thenReturn(undefined);
service = new UserServiceImpl(instance(mockRepository));

expect(await service.get(null)).toBeUndefined();
await expect(service.get(null))
.rejects
.toThrowError(BadRequestException);
});
});
describe('#create()', () => {
Expand Down
6 changes: 5 additions & 1 deletion server/src/app/user/user.service.impl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Inject, Injectable} from '@nestjs/common';
import {BadRequestException, Inject, Injectable} from '@nestjs/common';
import {UserService} from './user.service';
import {UserDto} from '../../domain/user/dto/user.dto';
import {User} from '../../domain/user/user.entity';
Expand All @@ -11,6 +11,10 @@ export class UserServiceImpl implements UserService {
constructor(@Inject('IUserRepository') private userRepository: IUserRepository) {}

async get(id: number): Promise<User> {
let user = await this.userRepository.findById(id);
if (user == undefined) {
throw new BadRequestException('no user with the id')
}
return await this.userRepository.findById(id);
}
async create(userDto: UserDto): Promise<User> {
Expand Down
4 changes: 3 additions & 1 deletion server/src/port/module/user.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Module } from '@nestjs/common';
import {UserServiceImpl} from '../../app/user/user.service.impl';
import {UserRepository} from '../persistence/repository/user.repository.impl';
import {UserController} from "../../web/user/user.controller";

@Module({
controllers: [UserController],
providers: [
UserServiceImpl,
{provide: 'UserService', useClass: UserServiceImpl},
{provide: 'IUserRepository', useClass: UserRepository},
],
})
Expand Down
150 changes: 150 additions & 0 deletions server/src/web/user/user.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
import { Test, TestingModule } from '@nestjs/testing';
import { UserController } from './user.controller';
import {instance, mock, when} from 'ts-mockito';
import {UserService} from '../../app/user/user.service';
import {UserServiceImpl} from '../../app/user/user.service.impl';
import {User} from '../../domain/user/user.entity';
import {UserDto} from '../../domain/user/dto/user.dto';
import {BadRequestException} from "@nestjs/common";

describe('User Controller', () => {
const mockUserService = mock(UserServiceImpl);
const address = 'testAddress';
const name = 'name';
let user: User;
let controller: UserController;

beforeEach(() => {
user = new User(address, name);
});

describe('dependency resolve', () => {
it('should be defined', async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [
UserController,
],
providers: [
{
provide: 'UserService',
useValue: instance(mockUserService),
},
],
}).compile();

controller = module.get<UserController>(UserController);
expect(controller).toBeDefined();
});
});
describe('#get()', () => {
const id = 1;

it('should return user', async () => {
when(mockUserService.get(id)).thenReturn(new Promise((resolve) => {
resolve(user);
}));
controller = new UserController(instance(mockUserService));

expect(await controller.get(id)).toBe(user);

});
it('should return undefined', async () => {
when(mockUserService.get(id)).thenThrow(new BadRequestException('no user with the id'));
controller = new UserController(instance(mockUserService));

await expect(controller.get(id))
.rejects
.toThrowError(BadRequestException);
});
});
describe('#create()', () => {
let userDto: UserDto;

it('should return user', async () => {
userDto = new UserDto(address, name);
when(mockUserService.create(userDto)).thenReturn(new Promise((resolve => {
resolve(user);
})));
controller = new UserController(instance(mockUserService));

expect(await controller.create(userDto)).toBe(user);

});
it('should return undefined', async () => {
userDto = new UserDto();
when(mockUserService.create(userDto)).thenThrow(new Error('some errors'));
controller = new UserController(instance(mockUserService));

await expect(controller.create(userDto))
.rejects
.toThrowError('some errors');
});
});
describe('#delete()', () => {
const id = 1;

it('should return undefined', async () => {
when(mockUserService.delete(id)).thenReturn(new Promise((resolve => resolve(undefined))));
controller = new UserController(instance(mockUserService));

expect(await controller.delete(id)).toBe(undefined);
});
});
describe('#increaseLevel()', () => {
const id = 1;
const amount = 10;

it('should return user', async () => {
when(mockUserService.increaseLevel(id, amount)).thenReturn(new Promise((resolve => resolve(user))));
controller = new UserController(instance(mockUserService));

expect(await controller.increaseLevel(id, amount)).toBe(user);
});
it('should throw error', async () => {
when(mockUserService.increaseLevel(id, amount)).thenThrow(new Error('some errors'));
controller = new UserController(instance(mockUserService));

await expect(controller.increaseLevel(id, amount))
.rejects
.toThrowError('some errors');
});
});
describe('#increasePoint()', () => {
const id = 1;
const amount = 10;

it('should return user', async () => {
when(mockUserService.increasePoint(id, amount)).thenReturn(new Promise((resolve => resolve(user))));
controller = new UserController(instance(mockUserService));

expect(await controller.increasePoint(id, amount)).toBe(user);
});
it('should thorow error', async () => {
when(mockUserService.increasePoint(id, amount)).thenThrow(new Error('some errors'));
controller = new UserController(instance(mockUserService));

await expect(controller.increasePoint(id, amount))
.rejects
.toThrowError('some errors');
});
});
describe('#decreasePoint()', () => {
const id = 1;
const amount = 10;

it('should return user', async () => {
when(mockUserService.decreasePoint(id, amount)).thenReturn(new Promise((resolve => resolve(user))));
controller = new UserController(instance(mockUserService));

expect(await controller.decreasePoint(id, amount)).toBe(user);
});
it('should thorow error', async () => {
when(mockUserService.decreasePoint(id, amount)).thenThrow(new Error('some errors'));
controller = new UserController(instance(mockUserService));

await expect(controller.decreasePoint(id, amount))
.rejects
.toThrowError('some errors');
});
});
});
40 changes: 40 additions & 0 deletions server/src/web/user/user.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import {BadRequestException, Body, Controller, Delete, Get, Inject, Injectable, Param, Post, Req} from '@nestjs/common';
import {User} from '../../domain/user/user.entity';
import {UserDto} from '../../domain/user/dto/user.dto';
import {DeleteResult} from 'typeorm';
import {UserService} from '../../app/user/user.service';

@Injectable()
@Controller('users')
export class UserController {
constructor(@Inject('UserService') private service: UserService) {}

@Get(':id')
async get(@Param('id') id: number): Promise<User> {
return await this.service.get(id);
}

@Post()
async create(@Body() userDto: UserDto): Promise<User> {
return await this.service.create(userDto);
}

@Delete(':id')
async delete(@Param('id') id: number): Promise<DeleteResult> {
return await this.service.delete(id);
}

@Post(':id')
async increaseLevel(@Param('id') id: number, @Param('amount') amount: number): Promise<User> {
return await this.service.increaseLevel(id, amount);
}

@Post(':id')
async decreasePoint(@Param('id') id: number, @Param('amount') amount: number): Promise<User> {
return await this.service.decreasePoint(id, amount);
}
@Post(':id')
async increasePoint(@Param('id') id: number, @Param('amount') amount: number): Promise<User> {
return await this.service.increasePoint(id, amount);
}
}