Merge branch 'release/1.1.0'

Author: hirsch88

.gitignore

@@ -41,3 +41,4 @@ coverage/
 
 # Generated documentation #
 docs/
+old/

.vscode/cSpell.json

@@ -0,0 +1,17 @@
+// cSpell Settings
+{
+    // Version of the setting file.  Always 0.1
+    "version": "0.1",
+    // language - current active spelling language
+    "language": "en",
+    // words - list of words to be always considered correct
+    "words": [
+        "hsts"
+    ],
+    // flagWords - list of words to be always considered incorrect
+    // This is useful for offensive words and common spelling errors.
+    // For example "hte" should be "the"
+    "flagWords": [
+        "hte"
+    ]
+}

.vscode/settings.json

@@ -4,5 +4,6 @@
         "src/**/*.js": true,
         "test/**/*.js": true
     },
-    "vsicons.presets.angular": false
+    "vsicons.presets.angular": false,
+    "cSpell.enabled": true
 }

Procfile

@@ -0,0 +1 @@
+web: ./node_modules/.bin/gulp build && npm start

README.md

@@ -1,6 +1,6 @@
 # Express Typescript Boilerplate
 
-> Boilerplate for an restful express-apllication written in TypeScript
+> Boilerplate for an restful express-application written in TypeScript
 
 ## Getting Started
 ### Prerequisites
@@ -31,7 +31,7 @@ The port will be displayed to you as `http://0.0.0.0:3000` (or if you prefer IPv
 * Remove not needed libraries with `npm run install:clean`
 
 ### Linting
-* Run code analysis using `npm run lint`. This runs tshint.
+* Run code analysis using `npm run lint`. This runs tslint.
 * There is also a vscode task for this called lint.
 
 ### Tests

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express-typescript-boilerplate",
-  "version": "1.0.0",
-  "description": "Boilerplate for an restful express-apllication written in TypeScript.",
+  "version": "1.1.0",
+  "description": "Boilerplate for an restful express-application written in TypeScript.",
   "main": "src/index.ts",
   "scripts": {
     "install:typings": "./node_modules/.bin/typings install",
@@ -20,9 +20,9 @@
     "db:migrate": "./node_modules/.bin/knex migrate:latest",
     "db:migrate:rollback": "./node_modules/.bin/knex migrate:rollback",
     "db:seed": "./node_modules/.bin/knex seed:run",
-    "db:clean": "ts-node ./src/console/CleanDatabaseCommand.ts",
+    "db:clean": "./node_modules/.bin/ts-node ./src/console/CleanDatabaseCommand.ts",
     "db:refresh": "npm run db:drop && npm run db:migrate",
-    "start": "node ./src/index.js"
+    "start": "node src/index.js"
   },
   "repository": "git+ssh://git@github.com/w3tec/express-typescript-boilerplate.git",
   "engines": {
@@ -60,6 +60,8 @@
     "@types/express": "^4.0.35",
     "@types/faker": "^4.1.0",
     "@types/helmet": "0.0.34",
+    "@types/inversify": "^2.0.33",
+    "@types/inversify-express-utils": "^2.0.0",
     "@types/knex": "0.0.47",
     "@types/lodash": "^4.14.63",
     "@types/morgan": "^1.7.32",
@@ -72,22 +74,22 @@
     "bookshelf-camelcase": "^1.1.4",
     "compression": "^1.6.2",
     "cors": "^2.8.1",
-    "dataloader": "^1.3.0",
     "debug": "^2.6.0",
     "express": "^4.14.0",
     "faker": "^3.1.0",
     "helmet": "^3.4.0",
+    "inversify": "^4.1.0",
+    "inversify-express-utils": "^3.5.1",
     "knex": "^0.12.7",
     "lodash": "^4.17.4",
     "morgan": "^1.7.0",
-    "mysql": "^2.13.0",
+    "pg": "^6.1.5",
     "reflect-metadata": "^0.1.10",
     "request": "^2.81.0",
     "serve-favicon": "^2.4.2",
     "ts-node": "^2.0.0",
-    "winston": "^2.3.1"
-  },
-  "devDependencies": {
+    "typescript": "^2.3.2",
+    "winston": "^2.3.1",
     "@types/jest": "^19.2.2",
     "gulp": "^3.9.1",
     "gulp-clean": "^0.3.2",

src/api/controllers/HomeController.ts

@@ -0,0 +1,19 @@
+import * as express from 'express';
+import { Controller, Get, Response } from 'inversify-express-utils';
+import { injectable } from 'inversify';
+
+@injectable()
+@Controller('/')
+export class HomeController {
+
+    @Get('/')
+    public get(@Response() res: express.Response): any {
+        const pkg = require('../../../package.json');
+        return res.json({
+            name: pkg.name,
+            version: pkg.version,
+            description: pkg.description
+        });
+    }
+
+}

src/api/controllers/UserController.ts

@@ -0,0 +1,35 @@
+import { injectable, inject } from 'inversify';
+import { Controller, Get, RequestParam } from 'inversify-express-utils';
+import TYPES from '../../constants/types';
+import * as core from '../../core';
+import { UserService } from '../services';
+
+const log = new core.Log('api:ctrl.UserController');
+
+/**
+ * UserController
+ *
+ * @export
+ * @class UserController
+ */
+@injectable()
+@Controller('/users')
+export class UserController {
+
+    constructor( @inject(TYPES.UserService) private userService: UserService) { }
+
+    @Get('/')
+    public async findAll(): Promise<any> {
+        log.debug('findAll');
+        const users = await this.userService.findAll();
+        return users.toJSON();
+    }
+
+    @Get('/:id')
+    public async findOne( @RequestParam('id') id: string): Promise<any> {
+        log.debug('findOne ', id);
+        const user = await this.userService.findOne(parseInt(id, 10));
+        return user.toJSON();
+    }
+
+}

src/api/controllers/UsersController.ts

@@ -1 +1,2 @@
-export * from './UsersController';
+export * from './HomeController';
+export * from './UserController';