Corrects error in ordering when defaults values are used

Author: douglasrafael

lib/mapper/ordination.js

@@ -27,7 +27,9 @@ function processQuery(query) {
 
 
 function validate_sort(_values, _default) {
-    return Object.assign(_values, _default)
+    return {
+        ..._default, ..._values
+    }
 }
 
 exports = module.exports = {

test/unit/ordination.spec.js

@@ -2,42 +2,42 @@ const expect = require('chai').expect
 const ordination = require('../../lib/mapper/ordination')
 
 describe('QueryString: Ordination', function () {
-    
+
     context('when ordination query is a simple string', function () {
         it('should return a JSON with order params', function (done) {
-            verify(ordination.sort({ sort: '-name,age,created_at' }, default_options))
+            verify(ordination.sort({sort: '-name,age,created_at'}, default_options))
             done()
         })
     })
 
     context('when ordination query is an array of strings', function () {
         it('should return a JSON with order params', function (done) {
-            verify(ordination.sort({ sort: ['-name,age', 'created_at'] }, default_options))
+            verify(ordination.sort({sort: ['-name,age', 'created_at']}, default_options))
             done()
         })
     })
 
     context('when there are blank spaces between ordination query', function () {
         it('should return a JSON with order params, ignoring the blank space', function (done) {
-            verify(ordination.sort({ sort: '-na  m e,  age, cr  eat   ed_at' }, default_options))
+            verify(ordination.sort({sort: '-na  m e,  age, cr  eat   ed_at'}, default_options))
             done()
         })
     })
 
     context('when there are null fields in ordination query', function () {
         it('should return a JSON with order params, ignoring the null fields', function (done) {
-            verify(ordination.sort({ sort: ',,,,,-name,,,,age,,,created_at,,,,,,,' }, default_options))
+            verify(ordination.sort({sort: ',,,,,-name,,,,age,,,created_at,,,,,,,'}, default_options))
             done()
         })
     })
 
     context('when there are special characters in ordination query', function () {
         it('should return a JSON with order params, ignoring the special characteres', function (done) {
-            verify(ordination.sort({ sort: '-$%n@am#$e??,!!ag%e,c***r$@$eated_at' }, default_options))
+            verify(ordination.sort({sort: '-$%n@am#$e??,!!ag%e,c***r$@$eated_at'}, default_options))
             done()
         })
 
-    })  
+    })
 
     context('when use the default options without query', function () {
         it('should return a JSON with default ordination params', function (done) {
@@ -48,16 +48,23 @@ describe('QueryString: Ordination', function () {
         })
     })
 
-    context('when use custom params without query', function () {
+    context('when use custom params', function () {
         it('should return a JSON with custom params', function () {
-            const custom_options = { default: { sort: { created_at: 'asc' }}}
+            const custom_options = {default: {sort: {created_at: 'asc'}}}
             const result = ordination.sort({}, custom_options)
             expect(result).is.not.null
             expect(result).to.have.property('created_at')
             expect(result.created_at).to.eql('asc')
         })
-    })
 
+        it('should return a JSON with custom parameters and those of the query', function () {
+            const custom_options = {default: {sort: {created_at: 'asc'}}}
+            const result = ordination.sort({sort: '-created_at,-age,name'}, custom_options)
+            expect(result.created_at).to.eql('desc')
+            expect(result.age).to.eql('desc')
+            expect(result.name).to.eql('asc')
+        })
+    })
 })
 
 function verify(result) {
@@ -68,4 +75,4 @@ function verify(result) {
     expect(result.age).to.eql('asc')
     expect(result.created_at).to.eql('asc')
 
-}
+}