[CHORE] starting before event functions

Author: ryanholte

lib/db/baseModel.js

@@ -74,7 +74,7 @@
 
 
 module.exports = {
-  find(id) {
+  find(id, doFetch = true) {
     let obj = {}
 
     if (typeof id === 'object') {
@@ -92,11 +92,15 @@ module.exports = {
       };
     }
 
-    return this.forge()
+    const query = this.forge()
       .query({
         where: obj,
-      })
-      .fetch(fetchOptions);
+      });
+
+    if (doFetch) {
+      return query.fetch(fetchOptions);
+    }
+    return query;
   },
 
   findBy() {
@@ -169,7 +173,15 @@ module.exports = {
   },
 
   update(id, record) {
-    return this.forge({id: id})
-      .save(record, {patch: true, require: false});
+    // return this.forge({id: id})
+    //   .save(record, {patch: true, require: false});
+
+    return this
+      .forge()
+      .query(function (qb) {
+        qb.where({id});
+        qb.update(record, ['*']);
+      });
+
   },
 };

lib/db/modelFactory.js

@@ -35,7 +35,7 @@ class ModelFactory {
         this.on('updating', (model, attrs, options) => {
           model.set('updated_at', Math.floor(Date.now() / 1000));
         });
-        this.on('saving', (model, attrs, options) => {
+        this.on('creating', (model, attrs, options) => {
           model.set('created_at', Math.floor(Date.now() / 1000));
         });
 
@@ -51,6 +51,10 @@ class ModelFactory {
           if (self.modelEvents.saved) {
             this.on('saved', self.modelEvents.saved);
           }
+
+          this.on('fetching', (model, columns, options, a, b, c) => {
+            console.log('fetching event!');
+          })
         }
       }
     };

lib/route/methods/get.js

@@ -1,7 +1,17 @@
 const Response = require('../response');
 
 function Get(options) {
-  const {path, name, Model, validate, beforeCreate, pre = [], auth, strippedColumns} = options;
+  const {
+    path,
+    name,
+    Model,
+    validate,
+    beforeCreate,
+    beforeRead,
+    pre = [],
+    auth,
+    strippedColumns,
+  } = options;
   return {
     method: 'GET',
     path: `${path}/{id}`,
@@ -10,10 +20,13 @@ function Get(options) {
       auth,
       handler: async function (request) {
         const id = request.params.id;
-
-        console.log('id', id);
         try {
-          const model = await Model.find(id);
+          const query = await Model.find(id, false);
+          if (beforeRead) {
+            const valid = await beforeRead('get', request, query);
+          }
+
+          const model = await query.fetch();
           return Response.success(name, model, strippedColumns);
         } catch (ex) {
           console.log('get error', ex);

lib/route/methods/post.js

@@ -22,7 +22,7 @@ function Post(options) {
     method,
     path: `${path}`,
     config: {
-      auth: 'jwt',
+      auth,
       pre: preHandlers,
       handler: async function (request) {
         const record = request.payload[Tenses.getSingular(name)];

lib/route/methods/put.js

@@ -4,7 +4,17 @@ const Response = require('../response');
 const method = 'put';
 
 function Put(options) {
-  const {path, name, Model, validate, beforeCreate, pre = [], auth, strippedColumns} = options;
+  const {
+    path,
+    name,
+    Model,
+    validate,
+    beforeCreate,
+    beforeUpdate,
+    pre = [],
+    auth,
+    strippedColumns
+  } = options;
   const validateSutff = {
     method: async function (request) {
       try {
@@ -33,8 +43,19 @@ function Put(options) {
         const id = request.params.id;
 
         try {
-          const updatedRecord = await Model.update(id, record);
-          return Response.success(name, updatedRecord, strippedColumns);
+
+          const query = Model.update(id, record);
+          if (beforeUpdate) {
+            beforeUpdate('put', 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) {
           return Response.badRequest(ex);
         }

lib/route/route.js

@@ -60,7 +60,6 @@ class Plugin {
     const routeDefaults = {
       path: this.config.route,
       name: this.config.name,
-      strippedColumns: getStripedColumns(this.stripColumns),
       Model: Model,
       validate: this.validate,
     };
@@ -69,6 +68,7 @@ class Plugin {
       pre: getPre(this.pre.post, this.pre.default),
       auth: getAuth(this.auth.post, this.auth.default),
       beforeCreate: this.modelHooks.beforeCreate,
+      beforeRead: this.modelHooks.beforeRead,
     });
     const getOptions = Object.assign({}, routeDefaults, {
       pre: getPre(this.pre.get, this.pre.default),