[CHORE] adds route hooks

Author: ryanholte

lib/db/baseModel.js

@@ -168,8 +168,12 @@ module.exports = {
   },
 
   delete(id) {
-    return this.forge({id})
-      .destroy();
+    return this
+      .forge()
+      .query(function (qb) {
+        qb.where({id});
+        qb.delete(['*']);
+      });
   },
 
   update(id, record) {

lib/route/methods/delete.js

@@ -2,7 +2,7 @@ const Response = require('../response');
 const method = 'delete';
 
 function Delete(options) {
-  const {path, name, Model, validate, beforeCreate, pre = [], auth, strippedColumns} = options;
+  const {path, name, Model, validate, beforeDelete, pre = [], auth, strippedColumns} = options;
 
   return {
     method,
@@ -13,7 +13,17 @@ function Delete(options) {
       handler: async function (request) {
         const id = request.params.id;
         try {
-          const model = await Model.delete(id);
+
+          const query = Model.delete(id);
+          if (beforeDelete) {
+            beforeDelete('delete', request, query._knex);
+          }
+          const responseArr = await query.query();
+          let model = null;
+          if (responseArr.length) {
+            model = Model.forge(responseArr.pop());
+          }
+
           return Response.success(name, model, strippedColumns);
         } catch (ex) {
           console.log('get error', ex);

lib/route/methods/get.js

@@ -26,7 +26,15 @@ function Get(options) {
             const valid = await beforeRead('get', request, query);
           }
 
-          const model = await query.fetch();
+          let fetchOptions = undefined;
+          const relations = query.customRelations;
+          if (relations) {
+            fetchOptions = {
+              withRelated: relations
+            };
+          }
+
+          const model = await query.fetch(fetchOptions);
           return Response.success(name, model, strippedColumns);
         } catch (ex) {
           console.log('get error', ex);

lib/route/response.js

@@ -10,12 +10,12 @@ class Response {
 
     if (model && model.relations) {
       model.relations = _.reduce(model.relations, (seed, childModel, key) => {
-        seed[key] = childModel.stripColumns();
+        seed[key] = (childModel && childModel.stripColumns && childModel.stripColumns()) || childModel;
         return seed;
       }, {});
     }
 
-    obj[routeName] = (model && model.stripColumns()) || model;
+    obj[routeName] = (model && model.stripColumns && model.stripColumns()) || model;
     return obj;
   }
 

lib/route/route.js

@@ -9,6 +9,9 @@ const ModelFactory = require('../db/modelFactory');
 const getPre = (setting, valueDefault) => {
   const hapiDefault = [];
   if (setting !== undefined) {
+    if (setting === false) {
+      return hapiDefault;
+    }
     return setting;
   }
 
@@ -53,6 +56,7 @@ class Plugin {
     this.modelEvents = route.events;
     this.modelHooks = route.hooks && route.hooks() || {};
     this.pre = route.pre && route.pre() || {};
+    this.omitRoutes = route.omitRoutes && route.omitRoutes() || [];
     this.auth = route.auth && route.auth() || {};
     this.stripColumns = route.stripColumns && route.stripColumns() || [];
     const Model = this.getModel();
@@ -88,18 +92,35 @@ class Plugin {
     const deleteOptions = Object.assign({}, routeDefaults, {
       pre: getPre(this.pre.delete, this.pre.default),
       auth: getAuth(this.auth.delete, this.auth.default),
-      beforeDelte: this.modelHooks.beforeDelete
+      beforeDelete: this.modelHooks.beforeDelete
     });
 
 
     this.plugin = {
       name: this.config.name,
       register: async (server, options) => {
-        await server.route(require('./methods/post')(postOptions));
-        await server.route(require('./methods/get')(getOptions));
-        await server.route(require('./methods/put')(putOptions));
-        await server.route(require('./methods/query')(queryOptions));
-        await server.route(require('./methods/delete')(deleteOptions));
+        if (this.omitRoutes === 'all') {
+          return;
+        }
+
+        if (!this.omitRoutes.includes('post')) {
+          await server.route(require('./methods/post')(postOptions));
+        }
+        if (!this.omitRoutes.includes('get')) {
+          await server.route(require('./methods/get')(getOptions));
+        }
+
+        if (!this.omitRoutes.includes('put')) {
+          await server.route(require('./methods/put')(putOptions));
+        }
+
+        if (!this.omitRoutes.includes('query')) {
+          await server.route(require('./methods/query')(queryOptions));
+        }
+
+        if (!this.omitRoutes.includes('delete')) {
+          await server.route(require('./methods/delete')(deleteOptions));
+        }
       },
     };
   }