Merge branch 'release/1.5.3'

Author: hirsch88

build/tasks/build.js

@@ -4,7 +4,6 @@ const gulp = require('gulp');
 const path = require('path');
 const runSequence = require('run-sequence');
 const paths = require('../paths');
-const util = require('../util');
 const $ = require('gulp-load-plugins')({
     lazy: true
 });
@@ -48,7 +47,6 @@ function transpiler(filePath, isTest, files) {
             './typings/**/*.d.ts',
             path.join(filePath, files)
         ])
-        .pipe($.plumber({ errorHandler: $.notify.onError('Error: <%= error.message %>') }))
         .pipe($.sourcemaps.init({ loadMaps: true }))
         .pipe(tsProject())
         .pipe($.sourcemaps.write()) // inline sourcemaps

build/tasks/clean.js

@@ -3,7 +3,6 @@
 const gulp = require('gulp');
 const path = require('path');
 const paths = require('../paths');
-const util = require('../util');
 const $ = require('gulp-load-plugins')({
     lazy: true
 });

build/tasks/lint.js

@@ -1,10 +1,10 @@
 {
   "name": "express-typescript-boilerplate",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "A delightful way to building a RESTful API with NodeJs & TypeScript",
   "main": "src/index.ts",
   "scripts": {
-    "lint": "./node_modules/.bin/gulp lint",
+    "lint": "./node_modules/.bin/tslint -c ./tslint.json 'src/**/*.ts' --format stylish --force",
     "test": "NODE_ENV=test ./node_modules/.bin/jest ./test/unit",
     "test:pretty": "NODE_ENV=test ./node_modules/.bin/jest ./test/unit --verbose",
     "test:coverage": "NODE_ENV=test ./node_modules/.bin/jest ./test/unit --coverage",
@@ -82,7 +82,6 @@
     "gulp": "^3.9.1",
     "gulp-clean": "^0.3.2",
     "gulp-load-plugins": "^1.4.0",
-    "gulp-notify": "^3.0.0",
     "gulp-plumber": "^1.1.0",
     "gulp-sourcemaps": "^2.6.0",
     "gulp-tslint": "^8.0.0",
@@ -122,7 +121,8 @@
       "tsx",
       "js",
       "json"
-    ]
+    ],
+    "testEnvironment": "node"
   },
   "license": "MIT"
 }

build/util.js

@@ -7,7 +7,7 @@ import { injectable } from 'inversify';
  * information about this api
  */
 @injectable()
-@Controller('/v1')
+@Controller('/')
 export class HomeController {
 
     @Get('/')

package.json

@@ -10,7 +10,7 @@ import { Exception } from '../../core/api/Exception';
  */
 export class DatabaseException extends Exception {
     constructor(text: string, error: any) {
-        let value: string = error.stack.split('\n')[0];
+        const value: string = error.stack.split('\n')[0];
         super(400, text, [
             value.substring(7)
         ]);

src/api/controllers/HomeController.ts

@@ -42,7 +42,10 @@ export class UserService {
      * @returns {Promise<User>}
      */
     public async findOne(id: number): Promise<User> {
-        let user = await this.userRepo.findOne(id);
+        const user = await this.userRepo.findOne(id);
+        console.log(user);
+        console.log(user === null);
+        console.log(user === undefined);
         if (user === null) {
             log.warn(`User with the id=${id} was not found!`);
             throw new NotFoundException(id);
@@ -57,7 +60,7 @@ export class UserService {
      * @returns {Promise<User>}
      */
     public async findByUserId(userId: string): Promise<User> {
-        let user = await this.userRepo.findByUserId(userId);
+        const user = await this.userRepo.findByUserId(userId);
         if (user === null) {
             log.warn(`User with the userId=${userId} was not found!`);
             throw new NotFoundException(userId);
@@ -78,7 +81,7 @@ export class UserService {
         await request.validate();
 
         // If the request body was valid we will create the user
-        let user = await this.userRepo.create(data);
+        const user = await this.userRepo.create(data);
         return user;
     }
 
@@ -92,7 +95,7 @@ export class UserService {
      */
     public async update(id: number, newUser: any): Promise<User> {
         const oldUserModel = await this.findOne(id);
-        let oldUser = oldUserModel.toJSON();
+        const oldUser = oldUserModel.toJSON();
         const request = new UserUpdateRequest(oldUser);
 
         request.setFirstName(newUser.firstName);
@@ -103,7 +106,7 @@ export class UserService {
         await request.validate();
 
         // If the request body was valid we will create the user
-        let user = await this.userRepo.update(id, request.toJSON());
+        const user = await this.userRepo.update(id, request.toJSON());
         return user;
     }
 

src/api/exceptions/DatabaseException.ts

@@ -29,7 +29,7 @@ export class RequestBody {
      * Validates the body on the basis of the validator-annotations
      */
     public async validate(): Promise<void> {
-        let errors = await validate(this);
+        const errors = await validate(this);
         if (errors && errors.length > 0) {
             throw new ValidationException('Request body is not valid', errors);
         }
@@ -40,7 +40,7 @@ export class RequestBody {
      * Returns a new body object
      */
     public toJSON(): any {
-        let json = {};
+        const json = {};
         const keys = Object.keys(this);
         keys.forEach((key) => {
             if (this[key] !== undefined) {

src/api/services/UsersService.ts

@@ -23,7 +23,7 @@ export class ModelFactory {
     }
 
     public async create(amount: number = 1): Promise<any> {
-        let results = <any>[];
+        const results = <any>[];
         for (let i = 0; i < amount; i++) {
             const obj = await this.build();
             results.push(obj);