Skip to content

Commit 3d37ac5

Browse files
authored
Fix all paginated (#37)
* Fix all paginated * Update version
1 parent 9c2d65e commit 3d37ac5

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### v0.16.1.pre
2+
3+
* bug-fixes
4+
* Fix method to retrieve resources without pagination
5+
16
### v0.16.0.pre
27

38
* features

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
beyond_api (0.16.0.pre)
4+
beyond_api (0.16.1.pre)
55
faraday (~> 0.15)
66

77
GEM

lib/beyond_api/utils.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,17 @@ def sanitize_key(key)
4545
end
4646

4747
def handle_all_request(url, resource, params = {})
48+
4849
if params[:paginated] == false
49-
result = all_paginated(url, { page: 0, size: 1000 })
50+
result = all_paginated(url, params.merge(page: 0, size: 1000))
5051

5152
(1..result[:page][:total_pages] - 1).each do |page|
52-
result[:embedded][resource].concat(all_paginated(url, { page: page, size: 1000 })[:embedded][resource])
53+
result[:embedded][resource].concat(all_paginated(url, params.merge(page: page, size: 1000))[:embedded][resource])
5354
end
5455

55-
result.is_a?(Hash) ? result.delete(:page) : result.delete_field(:page)
56+
result[:page][:size] = result[:page][:total_elements]
57+
result[:page][:total_pages] = 1
58+
result[:page][:number] = 0
5659

5760
result
5861
else

lib/beyond_api/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module BeyondApi
2-
VERSION = "0.16.0.pre".freeze
2+
VERSION = "0.16.1.pre".freeze
33
end

0 commit comments

Comments
 (0)