Merge branch 'release-4.4.5'

Author: eduardoboucas

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.4.5] (2019-01-24)
+
+### Fixed
+
+- [#530](https://github.com/dadi/api/issues/530): run `afterGet` hooks after field hooks
+
 ## [4.4.4] (2018-12-20)
 
 ### Changed

dadi/lib/model/collections/get.js

@@ -77,19 +77,37 @@ function get ({
       query,
       options
     })
-  }).then(response => {
-    if (isRestIDQuery && response.results.length === 0) {
+  }).then(({metadata, results}) => {
+    if (isRestIDQuery && results.length === 0) {
       let error = new Error('Document not found')
 
       error.statusCode = 404
 
       return Promise.reject(error)
     }
 
-    if (this.settings.hooks && this.settings.hooks.afterGet) {
+    let formatter = rawOutput
+      ? Promise.resolve(results)
+      : this.formatForOutput(
+          results,
+        {
+          client,
+          composeOverride: options.compose,
+          language,
+          urlFields: options.fields
+        }
+        )
+
+    return formatter.then(results => {
+      return {results, metadata}
+    })
+  }).then(response => {
+    const {hooks} = this.settings
+
+    if (hooks && hooks.afterGet) {
       return new Promise((resolve, reject) => {
         async.reduce(
-          this.settings.hooks.afterGet,
+          hooks.afterGet,
           response,
           (current, hookConfig, callback) => {
             let hook = new Hook(hookConfig, 'afterGet')
@@ -113,22 +131,6 @@ function get ({
     }
 
     return response
-  }).then(({metadata, results}) => {
-    let formatter = rawOutput
-      ? Promise.resolve(results)
-      : this.formatForOutput(
-          results,
-        {
-          client,
-          composeOverride: options.compose,
-          language,
-          urlFields: options.fields
-        }
-        )
-
-    return formatter.then(results => {
-      return {results, metadata}
-    })
   })
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dadi/api",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "main": "main.js",
   "scripts": {
     "create-client": "cd ../../.. && node ./node_modules/@dadi/api/utils/create-client.js",
@@ -21,7 +21,7 @@
     ]
   },
   "dependencies": {
-    "@dadi/api-validator": "^1.1.2",
+    "@dadi/api-validator": "^1.2.0",
     "@dadi/boot": "^1.1.3",
     "@dadi/cache": "^3.0.0",
     "@dadi/et": "^2.0.0",

test/acceptance/validation.js

@@ -87,7 +87,8 @@ describe('Validation', function () {
               res.body.should.be.json
               res.body.success.should.be.false
               res.body.errors[0].field.should.equal('fieldMinLength')
-              res.body.errors[0].message.should.equal('is too short')
+              res.body.errors[0].code.should.equal('ERROR_MIN_LENGTH')
+              res.body.errors[0].message.should.be.instanceOf(String)
 
               done()
             })
@@ -124,7 +125,8 @@ describe('Validation', function () {
               res.body.should.be.json
               res.body.success.should.be.false
               res.body.errors[0].field.should.equal('fieldMaxLength')
-              res.body.errors[0].message.should.equal('is too long')
+              res.body.errors[0].code.should.equal('ERROR_MAX_LENGTH')
+              res.body.errors[0].message.should.be.instanceOf(String)
 
               done()
             })
@@ -161,7 +163,8 @@ describe('Validation', function () {
               res.body.should.be.json
               res.body.success.should.be.false
               res.body.errors[0].field.should.equal('fieldRegex')
-              res.body.errors[0].message.should.equal('should match the pattern ^q+$')
+              res.body.errors[0].code.should.equal('ERROR_REGEX')
+              res.body.errors[0].message.should.be.instanceOf(String)
 
               done()
             })