Skip to content

Commit

Permalink
userController e2e test
Browse files Browse the repository at this point in the history
  • Loading branch information
ttkmw committed Jun 16, 2019
1 parent 00c2946 commit a4bae7d
Show file tree
Hide file tree
Showing 8 changed files with 327 additions and 12 deletions.
12 changes: 12 additions & 0 deletions server/docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '3.3'

services:
db:
image: postgres
restart: always
environment:
POSTGRES_USER: test
POSTGRES_DB: hatchout
POSTGRES_PASSWORD: test
ports:
- 5432:5432
1 change: 1 addition & 0 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"@types/jest": "^23.3.13",
"@types/node": "^10.12.18",
"@types/supertest": "^2.0.7",
"assert": "^2.0.0",
"husky": "^2.3.0",
"jest": "^23.6.0",
"jest-plugin-context": "^2.9.0",
Expand Down
2 changes: 1 addition & 1 deletion server/src/app/user/user.service.impl.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {UserServiceImpl} from './user.service.impl';
import {anything, instance, mock, when} from 'ts-mockito';
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';
import {UserDto} from './dto/user.dto';

describe('UserServiceImpl', () => {
const address = 'testAddress';
Expand Down
2 changes: 1 addition & 1 deletion server/src/app/user/user.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {User} from '../../domain/user/user.entity';
import {UserDto} from '../../domain/user/dto/user.dto';
import {DeleteResult} from 'typeorm';
import {UserDto} from './dto/user.dto';

export interface UserService {
get(id: number): Promise<User>;
Expand Down
6 changes: 3 additions & 3 deletions server/src/config/database/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ export default {
type: 'postgres',
host: 'localhost',
port: 5432,
username: 'de-labtory',
password: 'de-labtory',
username: 'test',
password: 'test',
database: 'hatchout',
logging: true,
logging: false,
synchronize: true,
entities: ['src/domain/**/*.entity{.ts,.js}'],
};
5 changes: 5 additions & 0 deletions server/src/domain/user/user.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@ import {MIN_POINT} from './point';

@Entity()
export class User {

@PrimaryGeneratedColumn()
readonly id: number;

@Column({unique: true})
address: string;

@Column({ length: 10, unique: true})
name: string;

@Column('int')
@Min(MIN_POINT)
point: number;

@Column('int')
@Max(MAX_LEVEL)
level: number;
Expand Down
14 changes: 7 additions & 7 deletions server/src/web/user/user.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Get,
Inject,
Injectable,
Param,
Param, ParseIntPipe,
Post, Put,
Query,
} from '@nestjs/common';
Expand All @@ -32,15 +32,15 @@ export class UserController {
return await this.service.delete(id);
}
@Put(':id/increase-level')
async increaseLevel(@Param('id') id: number, @Query() query): Promise<User> {
return await this.service.increaseLevel(id, query.amount);
async increaseLevel(@Param('id') id: number, @Query('amount', new ParseIntPipe()) amount): Promise<User> {
return await this.service.increaseLevel(id, amount);
}
@Put(':id/increase-point')
async increasePoint(@Param('id') id: number, @Query() query): Promise<User> {
return await this.service.increasePoint(id, query.amount);
async increasePoint(@Param('id') id: number, @Query('amount', new ParseIntPipe()) amount): Promise<User> {
return await this.service.increasePoint(id, amount);
}
@Put(':id/decrease-point')
async decreasePoint(@Param('id') id: number, @Query() query): Promise<User> {
return await this.service.decreasePoint(id, query.amount);
async decreasePoint(@Param('id') id: number, @Query('amount', new ParseIntPipe()) amount): Promise<User> {
return await this.service.decreasePoint(id, amount);
}
}
Loading

0 comments on commit a4bae7d

Please sign in to comment.