Skip to content

Commit

Permalink
update deps, fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeautry committed Aug 25, 2019
1 parent 96c59bd commit d148951
Show file tree
Hide file tree
Showing 7 changed files with 1,405 additions and 417 deletions.
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 200
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
"dependencies": {
"body-parser": "^1.15.2",
"express": "^4.14.0",
"method-override": "^2.3.6",
"tsoa": "^1.0.0"
"method-override": "^3.0.0",
"tsoa": "^2.4.11"
},
"devDependencies": {
"@types/body-parser": "0.0.30",
"@types/body-parser": "1.17.1",
"@types/express": "^4.0.30",
"@types/method-override": "0.0.27",
"@types/node": "^6.0.33",
"@types/method-override": "0.0.31",
"@types/node": "^12.7.2",
"ncp": "^2.0.0",
"rimraf": "^2.5.2",
"tslint": "^3.11.0",
"typescript": "2.0.0"
"rimraf": "^3.0.0",
"tslint": "^5.19.0",
"typescript": "3.5.3"
},
"repository": {
"type": "git",
Expand Down
54 changes: 27 additions & 27 deletions src/controllers/accountsController.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import {TestAccount} from '../models/account';
import {Route, Get} from 'tsoa';
import {User} from '../models/user';
import { Get, Route } from 'tsoa';
import { TestAccount } from '../models/account';
import { User } from '../models/user';

@Route('Accounts')
export class AccountsController {
/** Get the current account */
@Get('Current')
public async current(): Promise<TestAccount> {
return {
id: 600,
name: 'test'
};
}
/** Get the current account */
@Get('Current')
public async current(): Promise<TestAccount> {
return {
id: 600,
name: 'test',
};
}

/** Get a list of users for the account */
@Get('Users')
public async getUsers(): Promise<User[]> {
return [
{
createdAt: new Date(),
email: '[email protected]',
id: 1
},
{
createdAt: new Date(),
email: '[email protected]',
id: 2,
}
];
}
/** Get a list of users for the account */
@Get('Users')
public async getUsers(): Promise<User[]> {
return [
{
createdAt: new Date(),
email: '[email protected]',
id: 1,
},
{
createdAt: new Date(),
email: '[email protected]',
id: 2,
},
];
}
}
103 changes: 51 additions & 52 deletions src/controllers/usersController.ts
Original file line number Diff line number Diff line change
@@ -1,60 +1,59 @@
import {Route, Get, Post, Delete, Patch, Example, Body} from 'tsoa';
import {User, UserCreateRequest, UserUpdateRequest} from '../models/user';
import { Body, Delete, Example, Get, Patch, Post, Route } from 'tsoa';
import { User, UserCreateRequest, UserUpdateRequest } from '../models/user';

@Route('Users')
export class UsersController {
/** Get the current user */
@Get('Current')
@Example<User>({
createdAt: new Date(),
email: '[email protected]',
id: 1,
})
public async Current(): Promise<User> {
return {
createdAt: new Date(),
email: 'test',
id: 666,
};
}

/** Get the current user */
@Get('Current')
@Example<User>({
createdAt: new Date(),
email: '[email protected]',
id: 1,
})
public async Current(): Promise<User> {
return {
createdAt: new Date(),
email: 'test',
id: 666
};
}
/** Get user by ID */
@Get('{userId}')
public async Get(userId: number): Promise<User> {
return {
createdAt: new Date(),
email: 'test2',
id: userId,
};
}

/** Get user by ID */
@Get('{userId}')
public async Get(userId: number): Promise<User> {
return {
createdAt: new Date(),
email: 'test2',
id: userId
};
}
/**
* Create a user
* @param request This is a user creation request description
*/
@Post()
public async Create(@Body() request: UserCreateRequest): Promise<User> {
return {
createdAt: new Date(),
email: request.email,
id: 666,
};
}

/**
* Create a user
* @param request This is a user creation request description
*/
@Post()
public async Create(@Body() request: UserCreateRequest): Promise<User> {
return {
createdAt: new Date(),
email: request.email,
id: 666
};
}
/** Delete a user by ID */
@Delete('{userId}')
public async Delete(userId: number): Promise<void> {
return Promise.resolve();
}

/** Delete a user by ID */
@Delete('{userId}')
public async Delete(userId: number): Promise<void> {
return Promise.resolve();
}

/** Update a user */
@Patch()
public async Update(@Body() request: UserUpdateRequest): Promise<User> {
return {
createdAt: request.createdAt,
email: request.email,
id: 1337
};
}
/** Update a user */
@Patch()
public async Update(@Body() request: UserUpdateRequest): Promise<User> {
return {
createdAt: request.createdAt,
email: request.email,
id: 1337,
};
}
}
Loading

0 comments on commit d148951

Please sign in to comment.