Merge remote-tracking branch 'upstream/master' into part_four

Author: davidmatas

Makefile

@@ -1,5 +1,7 @@
 .PHONY = default deps build test start-mooc-backend clean start-database start-backoffice-frontend
 
+# Shell to use for running scripts
+SHELL := $(shell which bash)
 IMAGE_NAME := codelytv/typescript-ddd-skeleton
 SERVICE_NAME := app
 MOOC_APP_NAME := mooc

package-lock.json

@@ -48,6 +48,7 @@
     "copy": "^0.3.2",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
+    "express-promise-router": "^4.0.1",
     "express-validator": "^6.6.1",
     "glob": "^7.1.6",
     "helmet": "^4.1.1",

package.json

@@ -2,6 +2,7 @@ import bodyParser from 'body-parser';
 import express from 'express';
 import helmet from 'helmet';
 import compress from 'compression';
+import Router from 'express-promise-router';
 import { registerRoutes } from './routes';
 import { registerSubscribers } from './subscribers';
 
@@ -17,7 +18,9 @@ app.use(helmet.hidePoweredBy());
 app.use(helmet.frameguard({ action: 'deny' }));
 app.use(compress());
 
-registerRoutes(app);
+const router = Router();
+app.use(router);
+registerRoutes(router);
 registerSubscribers();
 
 export default app;

src/apps/mooc_backend/app.ts

@@ -1,10 +1,10 @@
-import { Express } from 'express';
+import { Router, Request, Response } from 'express';
 import container from '../config/dependency-injection';
 
-export const register = (app: Express) => {
+export const register = (router: Router) => {
   const coursePutController = container.get('Apps.mooc.controllers.CoursePutController');
-  app.put('/courses/:id', coursePutController.run.bind(coursePutController));
+  router.put('/courses/:id', (req: Request, res: Response) => coursePutController.run(req, res));
 
   const coursesCounterGetController = container.get('Apps.mooc.controllers.CoursesCounterGetController');
-  app.get('/courses-counter', coursesCounterGetController.run.bind(coursesCounterGetController));
+  router.get('/courses-counter', (req: Request, res: Response) => coursesCounterGetController.run(req, res));
 };

src/apps/mooc_backend/routes/courses.route.ts

@@ -1,12 +1,12 @@
-import { Express } from 'express';
+import { Router } from 'express';
 import glob from 'glob';
 
-export function registerRoutes(app: Express) {
+export function registerRoutes(router: Router) {
   const routes = glob.sync(__dirname + '/**/*.route.*');
-  routes.map(route => register(route, app));
+  routes.map(route => register(route, router));
 }
 
-function register(routePath: string, app: Express) {
-    const route = require(routePath);
-    route.register(app);
+function register(routePath: string, router: Router) {
+  const route = require(routePath);
+  route.register(router);
 }

src/apps/mooc_backend/routes/index.ts

@@ -1,8 +1,8 @@
-import { Express } from 'express';
+import { Router, Request, Response } from 'express';
 import container from '../config/dependency-injection';
 import StatusController from '../controllers/StatusGetController';
 
-export const register = (app: Express) => {
+export const register = (router: Router) => {
   const controller: StatusController = container.get('Apps.mooc.controllers.StatusGetController');
-  app.get('/status', controller.run.bind(controller));
+  router.get('/status', (req: Request, res: Response) => controller.run(req, res));
 };