Skip to content

Commit ecd20ec

Browse files
committed
Adds improvements to the pagination "processQuery" function
1 parent e635f28 commit ecd20ec

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

lib/mapper/pagination.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
function pagination(query, options) {
22
const result = {}
3-
43
result.limit = options.default.pagination.limit
54

65
if (query.limit) {
7-
result.limit = processQuery(query.limit)
6+
result.limit = processQuery(query.limit) || options.default.pagination.limit
87
}
98

109
if (options.use_page) {
1110
result.page = options.default.pagination.page
1211
if (query.page) {
13-
result.page = processQuery(query.page)
12+
result.page = processQuery(query.page) || options.default.pagination.page
1413
}
1514
} else {
1615
result.skip = options.default.pagination.skip
1716
if (query.skip) {
18-
result.skip = processQuery(query.skip)
17+
result.skip = processQuery(query.skip) || options.default.pagination.skip
1918
}
2019
}
2120

test/integration/index.custom.config.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe('queryFilter()', function () {
8383
})
8484
})
8585

86-
context('when use pagination with page and query page is not a number', function () {
86+
context('when use pagination with page and query page and limit is not a number', function () {
8787
it('should return pagination param with default limit', function () {
8888

8989
const expect_pagination = {
@@ -94,7 +94,7 @@ describe('queryFilter()', function () {
9494
const options = JSON.parse(JSON.stringify(custom_options))
9595
options.default.pagination = expect_pagination
9696

97-
const query = '?limit=teen'
97+
const query = '?page=current&limit=teen'
9898

9999
return request(app)
100100
.get(query)

0 commit comments

Comments
 (0)