Clean up

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "tslint.autoFixOnSave": true
 }

config/ormconfig.json

@@ -4,7 +4,7 @@
   "port": 5432,
   "username": "sample",
   "password": "sample",
-  "database": "sample-test",
+  "database": "sample",
   "synchronize": true,
   "logging": true
 }

config/ormconfig.production.json

@@ -2,18 +2,9 @@
   "type": "postgres",
   "host": "localhost",
   "port": 5432,
-  "username": "postgres",
-  "password": "jmsantos17",
+  "username": "sample",
+  "password": "sample",
   "database": "sample",
   "synchronize": true,
-  "logging": false,
-  "entities": [
-     "dist/entities/*.js"
-  ],
-  "migrations": [
-     "src/migration/**/*.ts"
-  ],
-  "subscribers": [
-     "src/subscriber/**/*.ts"
-  ]
+  "logging": false
 }

package.json

@@ -42,7 +42,6 @@
     "@types/mocha": "^2.2.44",
     "@types/node": "^8.0.56",
     "chai": "^4.1.2",
-    "chakram": "^1.5.0",
     "cross-env": "^5.1.3",
     "gulp": "^3.9.1",
     "gulp-delete-lines": "0.0.7",

src/app.ts

@@ -1,8 +1,7 @@
 import 'reflect-metadata';
 import { Container } from 'typedi';
-import { bootstrapContainers } from './lib/bootstrap-containers';
-import { bootstrapDB } from './lib/bootstrap-db';
-import { BootstrapServer } from './lib/bootstrap-server';
+
+import { bootstrapContainers, bootstrapDB, BootstrapServer } from './utils';
 
 bootstrapContainers();
 

src/controllers/user/deleteUser.controller.ts

@@ -1,5 +1,6 @@
 import { JsonController, Param, Post } from 'routing-controllers';
 import { OrmRepository } from 'typeorm-typedi-extensions';
+
 import { UserRepository } from '../../repositories';
 
 @JsonController('/users/:id')

src/controllers/user/getUser.controller.ts

@@ -1,5 +1,6 @@
-import { Get, JsonController, QueryParam, Req, QueryParams } from 'routing-controllers';
+import { Get, JsonController, QueryParam, QueryParams } from 'routing-controllers';
 import { OrmRepository } from 'typeorm-typedi-extensions';
+
 import { UserRepository } from '../../repositories';
 
 @JsonController('/users')
@@ -11,8 +12,7 @@ export class GetUserController {
 
   @Get()
   async execute(
-    @QueryParams() query: any,
-    @Req() request: any
+    @QueryParams() query: any
   ) {
     const users = await this.userRepository.getUsers(query.options);
     return users;

src/controllers/user/postUser.controller.ts

@@ -1,6 +1,7 @@
-import { JsonController, Post, Body } from 'routing-controllers';
+import { Body, JsonController, Post } from 'routing-controllers';
 import { Service } from 'typedi';
 import { OrmRepository } from 'typeorm-typedi-extensions';
+
 import { User } from '../../entities';
 import { UserRepository } from '../../repositories';
 

src/entities/accessToken.entity.ts

@@ -1,4 +1,5 @@
 import { Column, Entity, ManyToOne, PrimaryColumn, PrimaryGeneratedColumn } from 'typeorm';
+
 import { User } from '../entities';
 
 @Entity()

src/entities/role.entity.ts

@@ -1,4 +1,5 @@
 import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+
 import { RoleMapping } from '../entities';
 
 @Entity()

src/entities/roleMapping.entity.ts

@@ -1,4 +1,5 @@
 import { Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+
 import { Role, User } from '../entities';
 
 @Entity()

src/entities/user.entity.ts

@@ -1,4 +1,5 @@
 import { Column, Entity, OneToMany, PrimaryGeneratedColumn  } from 'typeorm';
+
 import { AccessToken, RoleMapping } from '../entities';
 
 @Entity()

src/repositories/user.repository.ts

@@ -1,6 +1,7 @@
 import { Service } from 'typedi';
-import { EntityRepository, Repository, FindManyOptions } from 'typeorm';
+import { EntityRepository, FindManyOptions, Repository } from 'typeorm';
 import { OrmRepository } from 'typeorm-typedi-extensions';
+
 import { User } from '../entities';
 
 @EntityRepository(User)

src/server.ts

@@ -1,9 +1,7 @@
 import 'reflect-metadata';
-
 import { Container } from 'typedi';
-import { bootstrapContainers } from './lib/bootstrap-containers';
-import { bootstrapDB } from './lib/bootstrap-db';
-import { BootstrapServer } from './lib/bootstrap-server';
+
+import { bootstrapContainers, bootstrapDB, BootstrapServer } from './utils';
 
 bootstrapContainers();
 

src/tests/after.test.ts

@@ -1,5 +1,5 @@
-import { Container } from "typedi";
-import { Connection } from "typeorm";
+import { Container } from 'typedi';
+import { Connection } from 'typeorm';
 
 after(async () => {
   const dbConnection = Container.get(Connection);

src/tests/before.test.ts

@@ -1,9 +1,7 @@
-import { Container } from "typedi/Container";
-import { BootstrapServer } from "../lib/bootstrap-server";
+import { Container } from 'typedi/Container';
+import { Connection } from 'typeorm';
 
-import { bootstrapDB } from "../lib/bootstrap-db";
-import { Connection } from "typeorm";
-import { bootstrapContainers } from "../lib/bootstrap-containers";
+import { bootstrapContainers, bootstrapDB, BootstrapServer } from '../utils';
 
 before(async () => {
   bootstrapContainers();

src/tests/user/deleteUser.controller.test.ts

@@ -1,13 +1,11 @@
 import 'reflect-metadata';
 import supertest = require('supertest');
-import { expect } from 'chai'
-
-import { Container } from 'typedi/Container';
-import { BootstrapServer } from '../../lib/bootstrap-server';
+import { expect } from 'chai';
+import { Container } from 'typedi';
 import { Connection } from 'typeorm';
+
 import { User } from '../../entities';
-import { bootstrapContainers } from '../../lib/bootstrap-containers';
-import { bootstrapDB } from '../../lib/bootstrap-db';
+import { BootstrapServer } from '../../utils';
 
 const app = Container.get(BootstrapServer).bootApp();
 const server = supertest(app);
@@ -31,7 +29,7 @@ describe('#deleteUserController', () => {
     const response = await server
       .post('/users/' + createdUser.id)
       .expect(200);
-    const options = { where: { id: createdUser.id } }
+    const options = { where: { id: createdUser.id } };
     const findResponse = await server
       .get('/users/')
       .query({ options })

src/tests/user/getUser.controller.test.ts

@@ -1,13 +1,11 @@
 import 'reflect-metadata';
 import supertest = require('supertest');
-import { expect } from 'chai'
-
-import { Container } from 'typedi/Container';
-import { BootstrapServer } from '../../lib/bootstrap-server';
+import { expect } from 'chai';
+import { Container } from 'typedi';
 import { Connection } from 'typeorm';
+
 import { User } from '../../entities';
-import { bootstrapContainers } from '../../lib/bootstrap-containers';
-import { bootstrapDB } from '../../lib/bootstrap-db';
+import { BootstrapServer } from '../../utils';
 
 const app = Container.get(BootstrapServer).bootApp();
 const server = supertest(app);

src/tests/user/postUser.controller.test.ts

@@ -1,12 +1,10 @@
 import 'reflect-metadata';
 import supertest = require('supertest');
-import { expect } from 'chai'
-
-import { Container } from 'typedi/Container';
-import { BootstrapServer } from '../../lib/bootstrap-server';
+import { expect } from 'chai';
+import { Container } from 'typedi';
 import { Connection } from 'typeorm';
-import { bootstrapContainers } from '../../lib/bootstrap-containers';
-import { bootstrapDB } from '../../lib/bootstrap-db';
+
+import { BootstrapServer } from '../../utils';
 
 const app = Container.get(BootstrapServer).bootApp();
 const server = supertest(app);

src/utils/index.ts

@@ -0,0 +1,3 @@
+export * from './bootstrap-containers';
+export * from './bootstrap-db';
+export * from './bootstrap-server';

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2016",
     "module": "commonjs",
     "sourceMap": true,
     "outDir": "./dist",
@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "lib": [
-      "es2015"
+      "es6"
     ]
   },
   "exclude": [