Fix bugs introduced by new dependencies

Author: dweber019

package-scripts.js

@@ -132,7 +132,7 @@ module.exports = {
                 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'
             },

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;
     }
 
 }

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;
     }
 
 }

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 {

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', () => {