Merge pull request #1 from NodeFactoryIo/mpetrun5/update

Update

Author: Matija Petrunić

.env.sample

@@ -10,6 +10,7 @@ TYPEORM_MIGRATIONS_DIR=src/migrations
 TYPEORM_ENTITIES=src/entities/*.ts
 TYPEORM_ENTITIES_DIR=src/entities
 TYPEORM_SUBSCRIBERS_DIR=src/subscribers
+TYPEORM_SUBSCRIBERS=src/subscribers/*.ts
 TYPEORM_SEEDING_FACTORIES=src/services/db/factories/**/*{.ts,.js}
 TYPEORM_SEEDING_SEEDS=src/services/db/seeders/**/*{.ts,.js}
 TYPEORM_LOGGING=true

README.md

@@ -23,7 +23,8 @@ Following software is required to be installed to use this repo:
 - `yarn install` - will run and configure everything for you
 
 #### Database
-- use `yarn db:migration:new -n <class name>` to generate new migration file (same goes for entity and subscriber)
+- use `yarn db:migration:new <class name>` to generate new empty migration file (same goes for entity and subscriber)
+- use `docker-compose exec backend yarn db:migration:generate <class name>` to generate new auto generated migration
 - `yarn db:migrate` - runs all pending migrations against database
 - `yarn db:revert` - reverts last migration, run multiple times to revert everything
 - `yarn db:seed` - seeds database with fake data (`src/services/db/seeders`)

package.json

@@ -10,6 +10,7 @@
   "scripts": {
     "start:dev": "npx task dev",
     "db:migration:new": "yarn run typeorm-ts migration:create -n ",
+    "db:migration:generate": "yarn run typeorm-ts migration:create -n ",
     "db:entity:new": "yarn run typeorm-ts entity:create -n ",
     "db:subscriber:new": "yarn run typeorm-ts subscriber:create -n ",
     "db:migrate": "npx task npm typeorm-ts migration:run",
@@ -32,7 +33,7 @@
     "typeorm-ts": "ts-node ./node_modules/typeorm/cli.js",
     "seeder": "ts-node ./node_modules/typeorm-seeding/dist/cli.js",
     "start:server": "node --inspect=0.0.0.0:56745 -r ts-node/register -r dotenv/config src/index.ts",
-    "nodemon": "./node_modules/nodemon/bin/nodemon.js"
+    "NODE_ENV=development nodemon": "./node_modules/nodemon/bin/nodemon.js"
   },
   "dependencies": {
     "fastify": "^2.13.0",

src/App.ts

@@ -51,8 +51,9 @@ export class App {
     });
   }
 
-  public async stop(): Promise<void> {
+  public async stop(signal: string): Promise<void> {
     await this.instance.close();
+    process.kill(process.pid, signal);
   }
 
   private registerPlugins(): void {
@@ -88,4 +89,4 @@ declare module "fastify" {
     config: Config;
     db: Connection;
   }
-}
+}

src/index.ts

@@ -3,8 +3,10 @@ import nodeCleanup from "node-cleanup";
 
 const app = new App();
 
-nodeCleanup(function () {
-  app.stop();
+nodeCleanup(function (exitCode, signal) {
+  app.stop(signal as string);
+  nodeCleanup.uninstall();
+  return false;
 });
 
-app.start();
+app.start();