Corrects error in pagination when defaults values are use

Author: douglasrafael

lib/mapper/pagination.js

@@ -4,18 +4,18 @@ function pagination(query, options) {
     result.limit = options.default.pagination.limit
 
     if (query.limit) {
-        result.limit = processQuery(query.limit) || options.default.pagination.limit
+        result.limit = processQuery(query.limit)
     }
 
     if (options.use_page) {
         result.page = options.default.pagination.page
         if (query.page) {
-            result.page = processQuery(query.page) || options.default.pagination.page
+            result.page = processQuery(query.page)
         }
     } else {
         result.skip = options.default.pagination.skip
         if (query.skip) {
-            result.skip = processQuery(query.skip) || options.default.pagination.skip
+            result.skip = processQuery(query.skip)
         }
     }
 
@@ -26,9 +26,7 @@ function processQuery(query) {
     if (query instanceof Array) {
         query = query[0]
     }
-    query = query.replace(/([^\d\s])|(\s{1,})/gi, '')
-    if (parseInt(query)) return (parseInt(query))
-    return undefined
+    return parseInt(query.replace(/([^\d\s])|(\s{1,})/gi, ''))
 }
 
 exports = module.exports = {

test/unit/pagination.spec.js

@@ -164,7 +164,7 @@ describe('QueryString: Pagination', function () {
         })
     })
 
-    context('when use custom options without query with limit and page params', function () {
+    context('when use custom params', function () {
         it('should return a JSON with custom params', function (done) {
             const custom_options = {
                 default: {
@@ -175,12 +175,29 @@ describe('QueryString: Pagination', function () {
                 },
                 use_page: true
             }
-            const result = pagination.pagination({page: 'one'}, custom_options)
+            const result = pagination.pagination({}, custom_options)
             verifyPage(result)
             expect(result.limit).to.eql(15)
             expect(result.page).to.eql(2)
             done()
         })
+
+        it('should return a JSON with custom parameters and those of the query', function (done) {
+            const custom_options = {
+                default: {
+                    pagination: {
+                        limit: 50,
+                        page: 5
+                    }
+                },
+                use_page: true
+            }
+            const result = pagination.pagination({page: '3', limit: '10'}, custom_options)
+            verifyPage(result)
+            expect(result.limit).to.eql(10)
+            expect(result.page).to.eql(3)
+            done()
+        })
     })
 })