Update all templates to the new structrue

Author: hirsch88

src/console/templates/controller.hbs

@@ -1,30 +1,24 @@
 {{#if isResourceTemplate}}
 import { inject, named } from 'inversify';
 import { Controller, Get, Post, Put, Delete, RequestParam, RequestBody, Response } from 'inversify-express-utils';
-import { myExpress } from 'my-express';
-import { Types } from '../../{{deepness}}constants/Types';
-import { Service, Middleware } from '../../{{deepness}}constants/Targets';
-import { ioc } from '../../{{deepness}}core/IoC';
-import { AuthenticateMiddleware } from '../{{deepness}}middlewares/AuthenticateMiddleware';
+import { Types, Targets } from '../../{{deepness}}constants';
+import { app } from '../../{{deepness}}app';
 import { {{name.capitalize}}Service } from '../{{deepness}}services/{{name.capitalize}}Service';
 {{else}}
 import { Controller } from 'inversify-express-utils';
-import { ioc } from '../../{{deepness}}core/IoC';
-import { Types } from '../../{{deepness}}constants/Types';
-import { Middleware } from '../../{{deepness}}constants/Targets';
-import { AuthenticateMiddleware } from '../{{deepness}}middlewares/AuthenticateMiddleware';
-
+import { app } from '../../{{deepness}}app';
+import { Types, Targets } from '../../{{deepness}}constants';
 {{/if}}
 
 // Get middlewares
-const authenticate = ioc.Container.getNamed<AuthenticateMiddleware>(Types.Middleware, Middleware.AuthenticateMiddleware);
+const authenticate = app.Container.getNamed<interfaces.Middleware>(Types.Middleware, Targets.Middleware.AuthenticateMiddleware);
 
 
 @Controller('/{{name.pluralize}}', authenticate.use)
 export class {{name.capitalize}}Controller {
 
     {{#if isResourceTemplate}}
-    constructor( @inject(Types.Service) @named(Service.{{name.capitalize}}Service) private {{name.camelCase}}Service: {{name.capitalize}}Service) { }
+    constructor( @inject(Types.Service) @named(Targets.Service.{{name.capitalize}}Service) private {{name.camelCase}}Service: {{name.capitalize}}Service) { }
 
     @Get('/')
     public async findAll( @Response() res: myExpress.Response): Promise<any> {

src/console/templates/migration.hbs

@@ -1,5 +1,6 @@
 import * as Knex from 'knex';
 
+
 {{#if hasProperties}}
 exports.up = (db: Knex): Promise<any> => {
     return Promise.all([

src/console/templates/model.hbs

@@ -3,8 +3,8 @@ import { Bookshelf } from '../../{{deepness}}config/Database';
 
 export class {{name.capitalize}} extends Bookshelf.Model<{{name.capitalize}}> {
 
-    public static async fetchById(id: number): Promise<{{name.capitalize}}> {
-        return await {{name.capitalize}}.where<{{name.capitalize}}>({ id: id }).fetch();
+    public static async fetchById(value: number): Promise<{{name.capitalize}}> {
+        return await {{name.capitalize}}.where<{{name.capitalize}}>({ id: value }).fetch();
     }
 
     public get tableName(): string { return '{{tableName}}'; }

src/console/templates/repository.hbs

@@ -1,8 +1,7 @@
 {{#if isResourceTemplate}}
 import * as Bookshelf from 'bookshelf';
 import { inject, named } from 'inversify';
-import { Types } from '../../{{deepness}}constants/Types';
-import { Model } from '../../{{deepness}}constants/Targets';
+import { Types, Targets } from '../../{{deepness}}constants';
 import { {{name.capitalize}} } from '../{{deepness}}models/{{name.capitalize}}';
 import { DatabaseException } from '../{{deepness}}exceptions/DatabaseException';
 import { NotFoundException } from '../{{deepness}}exceptions/NotFoundException';
@@ -15,7 +14,7 @@ export class {{name.capitalize}}Repository {
 
     {{#if isResourceTemplate}}
     constructor(
-        @inject(Types.Model) @named(Model.{{name.capitalize}}) public {{name.capitalize}}Model: typeof {{name.capitalize}}
+        @inject(Types.Model) @named(Targets.Model.{{name.capitalize}}) public {{name.capitalize}}Model: typeof {{name.capitalize}}
     ) { }
 
     public async findAll(): Promise<Bookshelf.Collection<{{name.capitalize}}>> {

src/console/templates/service.hbs

@@ -2,12 +2,10 @@
 import * as Bookshelf from 'bookshelf';
 {{/if}}
 import { inject, named } from 'inversify';
-import { Core } from '../../{{deepness}}core/Targets';
-import { Types } from '../../{{deepness}}constants/Types';
+import { Types, Core, Targets } from '../../{{deepness}}constants';
 import { Logger as LoggerType } from '../../{{deepness}}core/Logger';
 {{#if isResourceTemplate}}
 import { Validate, Request } from '../../{{deepness}}core/api/Validate';
-import { Repository } from '../../{{deepness}}constants/Targets';
 import { NotFoundException } from '../{{deepness}}exceptions/NotFoundException';
 import { {{name.capitalize}}Repository } from '../{{deepness}}repositories/{{name.capitalize}}Repository';
 import { {{name.capitalize}} } from '../{{deepness}}models/{{name.capitalize}}';
@@ -22,7 +20,7 @@ export class {{name.capitalize}}Service {
 
     {{#if isResourceTemplate}}
     constructor(
-        @inject(Types.Repository) @named(Repository.{{name.capitalize}}Repository) public {{name.camelCase}}Repo: {{name.capitalize}}Repository,
+        @inject(Types.Repository) @named(Targets.Repository.{{name.capitalize}}Repository) public {{name.camelCase}}Repo: {{name.capitalize}}Repository,
         @inject(Types.Core) @named(Core.Logger) public Logger: typeof LoggerType
     ) {
         this.log = new Logger(__filename);