- package update

- refactoring server tests
- logs location change
- adding nodemon.json

Author: HackPoint

.env

@@ -2,3 +2,4 @@ MONGODB_URI=mongodb://hackp0int:[email protected]:19675/profiles
 SECRET_TOKEN=YOUR_AUTH0_SECRET
 PORT=8089
 ENV=development
+SERVER_LOGS_FOLDER = ./server/logs

.gitignore

@@ -7,7 +7,7 @@
 
 # dependencies
 /node_modules
-/logs
+/server/logs
 # IDEs and editors
 /.idea
 .project
@@ -43,4 +43,3 @@ Thumbs.db
 
 # git
 package-lock.json
-nodemon.json

nodemon.json

@@ -0,0 +1,9 @@
+{
+  "watch": [
+    "server/**/*.ts"
+  ],
+  "ignore": [
+    "server/**/*.spec.ts"
+  ],
+  "ext": "ts js json"
+}

package.json

@@ -33,17 +33,17 @@
     "cookie-parser": "latest",
     "core-js": "^2.5.3",
     "cors": "^2.8.4",
-    "dotenv": "^5.0.0",
+    "dotenv": "^5.0.1",
     "errorhandler": "latest",
-    "inversify": "^4.10.0",
+    "inversify": "^4.11.1",
     "method-override": "^2.3.10",
     "mocha": "^5.0.1",
     "mocha-typescript": "^1.1.12",
     "morgan": "^1.9.0",
     "path": "^0.12.7",
     "reflect-metadata": "^0.1.12",
     "rxjs": "^5.5.6",
-    "typeorm": "^0.1.12",
+    "typeorm": "^0.1.13",
     "winston": "^2.4.0",
     "zone.js": "^0.8.20"
   },
@@ -68,7 +68,7 @@
     "codelyzer": "~4.1.0",
     "concurrently": "^3.5.1",
     "cookie-parser": "latest",
-    "jasmine-core": "~2.99.1",
+    "jasmine-core": "~3.0.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",

server/infrastructure/api-server.ts

@@ -53,24 +53,7 @@ export class ApiServer extends Server {
 
     // handle CORS
     this.app.use(cors());
-    // this.app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
-    //
-    //   // Website you wish to allow to connect
-    //   res.setHeader('Access-Control-Allow-Origin', '*');
-    //
-    //   // Request methods you wish to allow
-    //   res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, PATCH, DELETE');
-    //
-    //   // Request headers you wish to allow
-    //   res.setHeader('Access-Control-Allow-Headers', 'X-Requested-With,content-type');
-    //
-    //   // Set to true if you need the website to include cookies in the requests sent
-    //   // to the API (e.g. in case you use sessions)
-    //   res.setHeader('Access-Control-Allow-Credentials', 'true');
-    //
-    //   // Pass to next layer of middleware
-    //   next(err);
-    // });
+
     // error handling
     this.app.use(errorHandler());
   }

server/infrastructure/utils/logger.ts

@@ -2,12 +2,12 @@ import { Logger, LoggerInstance, LoggerOptions, transports } from 'winston';
 import * as fs from 'fs';
 import * as dotenv from 'dotenv';
 
-const logsDir = 'logs';
 const env = dotenv.config({path: '.env'});
+const logsDir = process.env.SERVER_LOGS_FOLDER;
 
 console.log(env);
-if (!fs.existsSync(`./${logsDir}`)) {
-  fs.mkdirSync(`./${logsDir}`);
+if (!fs.existsSync(`${logsDir}`)) {
+  fs.mkdirSync(`${logsDir}`);
 }
 
 export const logger: LoggerInstance = new Logger(<LoggerOptions> {
@@ -24,7 +24,7 @@ export const logger: LoggerInstance = new Logger(<LoggerOptions> {
     }),
     new transports.File({
       level: 'info',
-      filename: `./${logsDir}/all-logs.log`,
+      filename: `${logsDir}/all-logs.log`,
       handleExceptions: true,
       json: true,
       maxsize: 5242880,

server/tests/abstract/base.ts

@@ -0,0 +1,17 @@
+import { ApiServer } from '../../infrastructure/api-server';
+import * as chai from 'chai';
+import { Server } from '../../infrastructure/server';
+
+export abstract class BaseTest {
+  protected apiServer: Server = ApiServer.bootstrap();
+
+  public static before() {
+    chai.use(require('chai-http'));
+    const expect = chai.expect;
+    const should = chai.should();
+  }
+
+  public static after() {
+    console.log('Shutting down the server!');
+  }
+}

server/tests/index-route.spec.ts

@@ -1,26 +1,14 @@
 import { suite, test } from 'mocha-typescript';
 import * as chai from 'chai';
-import { Server } from '../infrastructure/server';
-import { ApiServer } from '../infrastructure/api-server';
+import { BaseTest } from './abstract/base';
 
-@suite class UserApiTest {
-  private apiServer: Server = ApiServer.bootstrap();
-
-  public static before() {
-    chai.use(require('chai-http'));
-    const expect = chai.expect;
-    const should = chai.should();
-  }
-  public static after() {
-    console.log('Shutting down the server!');
-  }
+@suite class UserApiTest extends BaseTest {
 
   @test('should receive user token v1')
   public shouldGetTheToken() {
     chai.request(this.apiServer.app)
       .get('/api/v1/ping')
       .end((err, res) => {
-        console.log('run test');
         res.should.have.status(200);
         res.body.should.have.property('token', 1);
       });