Merge pull request #91 from w3tecch/feature/update_dependencies

dweber019 · web-flow · commit a7e280e3e5ac · 2018-05-03T13:49:11.000Z
Feature/update dependencies
diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ All script are defined in the `package-scripts.js` file, but the most important
 
 ### Database Migration
 
-- Run `typeorm migrations:create -n <migration-file-name>` to create a new migration file.
+- Run `typeorm migration:create -n <migration-file-name>` to create a new migration file.
 - Try `typeorm -h` to see more useful cli commands like generating migration out of your models.
 - To migrate your database run `npm start db.migrate`.
 - To revert your latest migration run `npm start db.revert`.
diff --git a/package-scripts.js b/package-scripts.js
@@ -124,15 +124,15 @@ module.exports = {
                 script: series(
                     'nps banner.migrate',
                     'nps config',
-                    runFast('./node_modules/typeorm/cli.js migrations:run')
+                    runFast('./node_modules/typeorm/cli.js migration:run')
                 ),
                 description: 'Migrates the database to newest version available'
             },
             revert: {
                 script: series(
                     'nps banner.revert',
                     'nps config',
-                    runFast('./node_modules/typeorm/cli.js migrations:revert')
+                    runFast('./node_modules/typeorm/cli.js migration:revert')
                 ),
                 description: 'Downgrades the database'
             },
@@ -267,11 +267,11 @@ function copy(source, target) {
 }
 
 function run(path) {
-    return `ts-node --typeCheck ${path}`;
+    return `ts-node ${path}`;
 }
 
 function runFast(path) {
-    return `ts-node ${path}`;
+    return `ts-node --transpileOnly ${path}`;
 }
 
 function tslint(path) {
diff --git a/package.json b/package.json
@@ -49,21 +49,21 @@
     "@types/helmet": "^0.0.37",
     "@types/lodash": "^4.14.80",
     "@types/morgan": "^1.7.35",
-    "@types/reflect-metadata": "0.0.5",
+    "@types/reflect-metadata": "0.1.0",
     "@types/request": "^2.0.8",
     "@types/serve-favicon": "^2.2.29",
     "@types/supertest": "^2.0.4",
     "@types/uuid": "^3.4.3",
     "@types/winston": "^2.3.7",
     "body-parser": "^1.18.2",
     "chalk": "^2.3.0",
-    "class-validator": "^0.7.3",
+    "class-validator": "^0.8.5",
     "commander": "^2.11.0",
     "compression": "^1.7.1",
-    "copyfiles": "^1.2.0",
+    "copyfiles": "^2.0.0",
     "cors": "^2.8.4",
     "dataloader": "^1.3.0",
-    "dotenv": "^4.0.0",
+    "dotenv": "^5.0.1",
     "event-dispatch": "^0.4.1",
     "express": "^4.16.2",
     "express-basic-auth": "^1.1.3",
@@ -72,7 +72,7 @@
     "faker": "^4.1.0",
     "figlet": "^1.2.0",
     "glob": "^7.1.2",
-    "graphql": "^0.11.7",
+    "graphql": "^0.13.2",
     "helmet": "^3.9.0",
     "jsonfile": "^4.0.0",
     "lodash": "^4.17.4",
@@ -88,13 +88,13 @@
     "routing-controllers": "^0.7.6",
     "serve-favicon": "^2.4.5",
     "supertest": "^3.0.0",
-    "swagger-ui-express": "^2.0.10",
-    "ts-node": "^3.3.0",
+    "swagger-ui-express": "^3.0.8",
+    "ts-node": "^6.0.0",
     "tslint": "^5.8.0",
-    "typedi": "^0.5.2",
-    "typeorm": "^0.1.3",
-    "typeorm-typedi-extensions": "^0.1.1",
-    "typescript": "2.6.2",
+    "typedi": "^0.7.2",
+    "typeorm": "^0.2.1",
+    "typeorm-typedi-extensions": "^0.2.1",
+    "typescript": "2.8.3",
     "uuid": "^3.1.0",
     "winston": "^2.4.0"
   },
@@ -114,14 +114,14 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^21.1.5",
-    "@types/nock": "^8.2.1",
+    "@types/jest": "^22.2.3",
+    "@types/nock": "^9.1.3",
     "cross-env": "^5.1.1",
-    "jest": "^21.2.1",
+    "jest": "^22.4.3",
     "mock-express-request": "^0.2.0",
     "mock-express-response": "^0.2.1",
     "nock": "^9.1.4",
-    "sqlite3": "^3.1.13",
-    "ts-jest": "^21.1.4"
+    "sqlite3": "^4.0.0",
+    "ts-jest": "^22.4.4"
   }
 }
diff --git a/src/api/services/PetService.ts b/src/api/services/PetService.ts
@@ -49,9 +49,10 @@ export class PetService {
         return this.petRepository.save(pet);
     }
 
-    public delete(id: string): Promise<void> {
+    public async delete(id: string): Promise<void> {
         this.log.info('Delete a pet');
-        return this.petRepository.removeById(id);
+        await this.petRepository.delete(id);
+        return;
     }
 
 }
diff --git a/src/api/services/UserService.ts b/src/api/services/UserService.ts
@@ -39,9 +39,10 @@ export class UserService {
         return this.userRepository.save(user);
     }
 
-    public delete(id: string): Promise<void> {
+    public async delete(id: string): Promise<void> {
         this.log.info('Delete a user');
-        return this.userRepository.removeById(id);
+        await this.userRepository.delete(id);
+        return;
     }
 
 }
diff --git a/src/auth/AuthService.ts b/src/auth/AuthService.ts
@@ -1,6 +1,6 @@
 import * as express from 'express';
 import * as request from 'request';
-import { Require, Service } from 'typedi';
+import { Service } from 'typedi';
 
 import { Logger, LoggerInterface } from '../decorators/Logger';
 import { env } from '../env';
@@ -12,10 +12,9 @@ export class AuthService {
     private httpRequest: typeof request;
 
     constructor(
-        @Require('request') r: any,
         @Logger(__filename) private log: LoggerInterface
     ) {
-        this.httpRequest = r;
+        this.httpRequest = request;
     }
 
     public parseTokenFromRequest(req: express.Request): string | undefined {
diff --git a/src/database/migrations/1511105183653-CreateUserTable.ts b/src/database/migrations/1511105183653-CreateUserTable.ts
@@ -3,33 +3,36 @@ import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 export class CreateUserTable1511105183653 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        const table = new Table('user', [
-            {
-                name: 'id',
-                type: 'varchar',
-                length: 255,
-                isPrimary: true,
-                isNullable: false,
-            }, {
-                name: 'first_name',
-                type: 'varchar',
-                length: 255,
-                isPrimary: false,
-                isNullable: false,
-            }, {
-                name: 'last_name',
-                type: 'varchar',
-                length: 255,
-                isPrimary: false,
-                isNullable: false,
-            }, {
-                name: 'email',
-                type: 'varchar',
-                length: 255,
-                isPrimary: false,
-                isNullable: false,
-            },
-        ]);
+        const table = new Table({
+            name: 'user',
+            columns: [
+                {
+                    name: 'id',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: true,
+                    isNullable: false,
+                }, {
+                    name: 'first_name',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
+                }, {
+                    name: 'last_name',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
+                }, {
+                    name: 'email',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
+                },
+            ],
+        });
         await queryRunner.createTable(table);
     }
 
diff --git a/src/database/migrations/1512663524808-CreatePetTable.ts b/src/database/migrations/1512663524808-CreatePetTable.ts
@@ -3,33 +3,36 @@ import { MigrationInterface, QueryRunner, Table } from 'typeorm';
 export class CreatePetTable1512663524808 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
-        const table = new Table('pet', [
-            {
-                name: 'id',
-                type: 'varchar',
-                length: 255,
-                isPrimary: true,
-                isNullable: false,
-            }, {
-                name: 'name',
-                type: 'varchar',
-                length: 255,
-                isPrimary: false,
-                isNullable: false,
-            }, {
-                name: 'age',
-                type: 'int',
-                length: 11,
-                isPrimary: false,
-                isNullable: false,
-            }, {
-                name: 'user_id',
-                type: 'varchar',
-                length: 255,
-                isPrimary: false,
-                isNullable: true,
-            },
-        ]);
+        const table = new Table({
+            name: 'pet',
+            columns: [
+                {
+                    name: 'id',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: true,
+                    isNullable: false,
+                }, {
+                    name: 'name',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
+                }, {
+                    name: 'age',
+                    type: 'int',
+                    length: '11',
+                    isPrimary: false,
+                    isNullable: false,
+                }, {
+                    name: 'user_id',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: true,
+                },
+            ],
+        });
         await queryRunner.createTable(table);
     }
 
diff --git a/src/database/migrations/1512663990063-AddUserRelationToPetTable.ts b/src/database/migrations/1512663990063-AddUserRelationToPetTable.ts
@@ -2,13 +2,13 @@ import { MigrationInterface, QueryRunner, TableForeignKey } from 'typeorm';
 
 export class AddUserRelationToPetTable1512663990063 implements MigrationInterface {
 
-    private tableForeignKey = new TableForeignKey(
-        'fk_user_pet',
-        ['user_id'],
-        ['id'],
-        'user',
-        ''
-    );
+    private tableForeignKey = new TableForeignKey({
+        name: 'fk_user_pet',
+        columnNames: ['user_id'],
+        referencedColumnNames: ['id'],
+        referencedTableName: 'user',
+        onDelete: 'CASCADE',
+    });
 
     public async up(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.createForeignKey('pet', this.tableForeignKey);
diff --git a/test/unit/auth/AuthService.test.ts b/test/unit/auth/AuthService.test.ts
@@ -13,7 +13,7 @@ describe('AuthService', () => {
     let log: LogMock;
     beforeEach(() => {
         log = new LogMock();
-        authService = new AuthService(request, log);
+        authService = new AuthService(log);
     });
 
     describe('parseTokenFromRequest', () => {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,10 @@ export class PetService {`
`49`	`49`	`return this.petRepository.save(pet);`
`50`	`50`	`}`
`51`	`51`
`52`		`- public delete(id: string): Promise<void> {`
	`52`	`+ public async delete(id: string): Promise<void> {`
`53`	`53`	`this.log.info('Delete a pet');`
`54`		`- return this.petRepository.removeById(id);`
	`54`	`+ await this.petRepository.delete(id);`
	`55`	`+ return;`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,10 @@ export class UserService {`
`39`	`39`	`return this.userRepository.save(user);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public delete(id: string): Promise<void> {`
	`42`	`+ public async delete(id: string): Promise<void> {`
`43`	`43`	`this.log.info('Delete a user');`
`44`		`- return this.userRepository.removeById(id);`
	`44`	`+ await this.userRepository.delete(id);`
	`45`	`+ return;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`}`