Code refactoring

Author: msevera

app.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const bodyParser = require('body-parser');
 const config = require('config');
+const URIGenerator = require('./routing/uriGenerator');
 
 class App {
   constructor(router) {
@@ -12,19 +13,29 @@ class App {
     this.express.use(bodyParser.json());
     this.expressRouter = express.Router();
     this._registerRoute = this._registerRoute.bind(this);
-    this._buildControllerInstance = this._buildControllerInstance.bind(this);
+    this._createRouteBoundAction = this._createRouteBoundAction.bind(this);
   }
 
   _registerRoute(uri, httpMethod, boundAction) {
     this.expressRouter.route(uri)[httpMethod](boundAction);
   }
 
+  _createRouteBoundAction(controllerClass, method) {
+    const result = [
+      (req, res) => {
+        this._buildControllerInstance(controllerClass, req, res)[method]();
+      }];
+
+    return result;
+  }
+
   _buildControllerInstance(ControllerClass, req, res) {
     return new ControllerClass(
         {
           params: req.params,
           query: req.query,
           body: req.body,
+          uriGenerator: new URIGenerator(),
           send: (statusCode, resource) => {
             res.status(statusCode).send(resource);
           },
@@ -33,7 +44,7 @@ class App {
   }
 
   run() {
-    this.router.registerRoutes(this._registerRoute, this._buildControllerInstance);
+    this.router.registerRoutes(this._registerRoute, this._createRouteBoundAction);
     this.express.use('/api/v1', this.expressRouter);
     this.express.use((req, res) => {
       res.status(404).send({ url: `${req.originalUrl} not found` });

controllers/booksListController.js

@@ -6,7 +6,7 @@ class BooksListController extends ControllerBase {
     try {
       const { id } = this.params;
       const bookModel = new BookModel({ _id: id });
-      const resource = await bookModel.getResource();
+      const resource = await bookModel.getResource(this.uriGenerator);
       this.ok(resource);
     } catch (err) {
       this.error(err);
@@ -18,7 +18,7 @@ class BooksListController extends ControllerBase {
       const { id } = this.params;
       const { rating } = this.body;
       const bookModel = new BookModel({ _id: id, rating });
-      const resource = await bookModel.getResource();
+      const resource = await bookModel.getResource(this.uriGenerator);
       this.ok(resource);
     } catch (err) {
       this.error(err);

controllers/booksListController.test.js

@@ -1,6 +1,7 @@
 const BookListController = require('./booksListController');
 const Router = require('../routing/router');
 const BooksListRoutesBuilder = require('../routing/routesBuilders/booksListRoutesBuilder');
+const URIGenerator = require('../routing/uriGenerator');
 
 beforeEach(() => {
   const router = new Router([
@@ -11,24 +12,28 @@ beforeEach(() => {
 
 describe('testing BooksListController controller', () => {
   test('GetBook action success', async (done) => {
+    const id = 0;
     const sendFunc = (status, resource) => {
       expect(status).toBe(200);
-      expect(resource.id).toBe(0);
+      expect(resource.id).toBe(id);
       done();
     };
-    const controller = new BookListController({ params: { id: 0 }, send: sendFunc });
+    const controller = new BookListController(
+        { params: { id }, send: sendFunc, uriGenerator: new URIGenerator() },
+    );
     await controller.getBook();
   });
 
   test('RateBook action success', async (done) => {
+    const id = 0;
     const sendFunc = (status, resource) => {
       expect(status).toBe(200);
-      expect(resource.id).toBe(0);
+      expect(resource.id).toBe(id);
       expect(resource.rating).toBe(5);
       done();
     };
     const controller = new BookListController(
-        { params: { id: 0 }, body: { rating: 5 }, send: sendFunc },
+        { params: { id }, body: { rating: 5 }, send: sendFunc, uriGenerator: new URIGenerator() },
     );
     await controller.rateBook();
   });
@@ -38,7 +43,7 @@ describe('testing BooksListController controller', () => {
       expect(status).toBe(204);
       done();
     };
-    const controller = new BookListController({ send: sendFunc });
+    const controller = new BookListController({ send: sendFunc, uriGenerator: new URIGenerator() });
     await controller.removeBook();
   });
 });

controllers/controllerBase.js

@@ -1,8 +1,6 @@
-const URIGenerator = require('../routing/uriGenerator');
-
 class ControllerBase {
-  constructor({ params, query, body, send }) {
-    this.uriGenerator = URIGenerator;
+  constructor({ params, query, body, send, uriGenerator }) {
+    this.uriGenerator = uriGenerator;
     this.params = params;
     this.query = query;
     this.body = body;

models/bookModel.js

@@ -1,18 +1,16 @@
 const Model = require('./model');
-const URIGenerator = require('../routing/uriGenerator');
 
 class BookModel extends Model {
-  constructor(data, uriGenerator) {
-    super(uriGenerator);
-    this.uriGenerator = URIGenerator;
+  constructor(data) {
+    super();
     this.id = data._id;
     this.name = data.name;
     this.author = data.author;
     this.language = data.language;
     this.rating = data.rating;
   }
 
-  async getResource() {
+  async getResource(uriGenerator) {
     const resource = super.getResource({
       id: this.id,
       name: this.name,
@@ -21,20 +19,20 @@ class BookModel extends Model {
       rating: this.rating,
     });
 
-    await this.addLinks(resource);
+    await this.addLinks(resource, uriGenerator);
     return resource;
   }
 
-  async addLinks(resource) {
-    const removeURI = await this.uriGenerator.getURI(
+  async addLinks(resource, uriGenerator) {
+    const removeURI = await uriGenerator.getURI(
         'BooksListController_removeBook',
         { id: this.id },
     );
     if (removeURI) {
       resource.addLink(removeURI.id, removeURI);
     }
 
-    const rateURI = await this.uriGenerator.getURI(
+    const rateURI = await uriGenerator.getURI(
         'BooksListController_rateBook',
         { id: this.id },
     );

models/model.js

@@ -1,11 +1,6 @@
 const halson = require('halson');
 
 class Model {
-  constructor(uriGenerator, controllers) {
-    this.uriGenerator = uriGenerator;
-    this.controllers = controllers;
-  }
-
   getResource(data) {
     return halson(data);
   }

routing/router.js

@@ -5,27 +5,17 @@ class Router {
     this.routeBuilders = routeBuilders;
   }
 
-  registerRoutes(registerRouteCallback, buildControllerInstanceCallback) {
+  registerRoutes(registerRouteCallback, createRouteBoundAction) {
     this.routeBuilders.forEach((builder) => {
       const routes = builder.getRoutes();
       routes.forEach((routeData) => {
         RoutesCollection.addRouteData(routeData.controllerClass, routeData.action,
             { uri: routeData.uri, httpMethod: routeData.httpMethod });
-        const boundAction = this._bindRouteTo(routeData.controllerClass, routeData.action,
-            buildControllerInstanceCallback);
+        const boundAction = createRouteBoundAction(routeData.controllerClass, routeData.action);
         registerRouteCallback(routeData.uri, routeData.httpMethod, boundAction);
       });
     });
   }
-
-  _bindRouteTo(controllerClass, method, buildControllerInstanceCallback) {
-    const result = [
-      (req, res) => {
-        buildControllerInstanceCallback(controllerClass, req, res)[method]();
-      }];
-
-    return result;
-  }
 }
 
 module.exports = Router;

routing/uriGenerator.js

@@ -2,13 +2,9 @@ const queryString = require('query-string');
 const RoutesCollection = require('./routesCollection');
 
 class URIGenerator {
-  constructor() {
-    this.routes = RoutesCollection;
-  }
-
   getURI(controllerAction, params, id) {
     const caArray = controllerAction.split('_');
-    const routeData = this.routes[caArray[0]][caArray[1]];
+    const routeData = RoutesCollection[caArray[0]][caArray[1]];
     return new Promise((resolve) => {
       const uri = params ? this._bindParams(routeData.uri, params) : routeData.uri;
       resolve({ id: id || routeData.action, method: routeData.method, uri });
@@ -46,4 +42,4 @@ class URIGenerator {
   }
 }
 
-module.exports = new URIGenerator();
+module.exports = URIGenerator;