Merge branch 'feature/v3' of https://github.com/w3tecch/express-typescript-boilerplate into feature/v3

Author: dweber019

.env.test

@@ -0,0 +1,48 @@
+#
+# APPLICATION
+#
+APP_NAME="express-typescript-boilerplate"
+APP_ROUTE="http://localhost:3000"
+APP_ROUTE_PREFIX="/api"
+APP_BANNER=false
+
+#
+# LOGGING
+#
+LOG_LEVEL="none"
+LOG_JSON=false
+LOG_OUTPUT="dev"
+
+#
+# AUTHORIZATION
+#
+AUTH_ROUTE="http://localhost:3333/tokeninfo"
+
+#
+# DATABASE
+#
+DB_TYPE="mysql"
+DB_HOST="localhost"
+DB_PORT=3306
+DB_USERNAME="root"
+DB_PASSWORD=""
+DB_DATABASE="my_database"
+DB_SYNCHRONIZE=false
+DB_LOGGING=false
+
+#
+# Swagger
+#
+SWAGGER_ENABLED=true
+SWAGGER_ROUTE="/swagger"
+SWAGGER_FILE="api/swagger.json"
+SWAGGER_USERNAME="admin"
+SWAGGER_PASSWORD="1234"
+
+#
+# Status Monitor
+#
+MONITOR_ENABLED=true
+MONITOR_ROUTE="/monitor"
+MONITOR_USERNAME="admin"
+MONITOR_PASSWORD="1234"

.travis.yml

@@ -8,5 +8,3 @@ scripts:
   - npm start build
 notifications:
   email: false
-env:
-  - APP_ROUTE="http://localhost:3000"

package-scripts.js

@@ -49,30 +49,30 @@ module.exports = {
             migrate: {
                 script: series(
                     'nps banner.migrate',
-                    'nps migrate.config',
+                    'nps db.config',
                     runFast('./node_modules/.bin/typeorm migrations:run'),
                 ),
             },
             revert: {
                 script: series(
                     'nps banner.revert',
-                    'nps migrate.config',
+                    'nps db.config',
                     runFast('./node_modules/.bin/typeorm migrations:revert'),
                 ),
             },
             seed: {
                 script: series(
                     'nps banner.seed',
-                    'nps migrate.config',
-                    runFast('./src/lib/seeds.ts'),
+                    'nps db.config',
+                    runFast('./src/lib/seeds/'),
                 ),
             },
             config: {
                 script: runFast('./src/lib/ormconfig.ts'),
             },
             drop: {
-                script: runFast('./node_modules/.bin/typeorm schema:drop')
-            }
+                script: runFast('./node_modules/.bin/typeorm schema:drop'),
+            },
         },
         /**
          * These run various kinds of tests. Default is unit.

src/core/env.ts

@@ -1,8 +1,11 @@
 import * as path from 'path';
-import * as pkg from '../../package.json';
 import * as dotenv from 'dotenv';
-dotenv.config();
+import * as pkg from '../../package.json';
 
+/**
+ * Load .env file or for tests the .env.test file.
+ */
+dotenv.config({ path: path.join(process.cwd(), `.env${((process.env.NODE_ENV === 'test') ? '.test' : '')}`) });
 
 /**
  * Environment variables
@@ -22,7 +25,7 @@ export const env = {
             migrations: [path.join(__dirname, '..', 'database/migrations/*.ts')],
             migrationsDir: path.join(__dirname, '..', 'database/migrations'),
             entities: [path.join(__dirname, '..', 'api/**/models/*{.js,.ts}')],
-            subscribers: [ path.join(__dirname, '..', 'api/**/*Subscriber{.js,.ts}')],
+            subscribers: [path.join(__dirname, '..', 'api/**/*Subscriber{.js,.ts}')],
             controllers: [path.join(__dirname, '..', 'api/**/*Controller{.js,.ts}')],
             middlewares: [path.join(__dirname, '..', 'api/**/*Middleware{.js,.ts}')],
             interceptors: [path.join(__dirname, '..', 'api/**/*Interceptor{.js,.ts}')],

src/lib/seeds/FactoryInterface.ts

@@ -9,9 +9,9 @@ export interface FactoryInterface {
     /**
      * Returns an EntityFactoryInterface
      */
-    get<Entity>(entityClass: ObjectType<Entity>, args: any[]): EntityFactoryInterface<Entity>;
+    get<Entity>(entityClass: ObjectType<Entity>, value?: any): EntityFactoryInterface<Entity>;
     /**
      * Define an entity faker
      */
-    define<Entity>(entityClass: ObjectType<Entity>, fakerFunction: (faker: typeof Faker, args: any[]) => Entity): void;
+    define<Entity>(entityClass: ObjectType<Entity>, fakerFunction: (faker: typeof Faker, value?: any) => Entity): void;
 }