v1.4.2: fix merge batch data for next offset pagination

Author: 10xSebastian

lib/dhs/concerns/record/request.rb

@@ -387,6 +387,7 @@ def prepare_options_for_include_request!(options, sub_includes, references)
       end
 
       def merge_batch_data_with_parent!(batch_data, parent_data, pagination = nil)
+        return if batch_data.raw_items.blank?
         parent_data.concat(input: parent_data._raw, items: batch_data.raw_items, record: self)
         return if pagination.present? && pagination.is_a?(DHS::Pagination::Link)
         [limit_key(:body), total_key, pagination_key(:body)].each do |pagination_attribute|

lib/dhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHS
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

spec/pagination/next_offset_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe DHS::Record do
-  context 'pagination' do
+  context 'next offset pagination' do
     def stub_api_request(next_offset:, items: [], offset: nil)
       stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
         .to_return(body: { items: items, next_offset: next_offset }.to_json)
@@ -28,4 +28,56 @@ class Transaction < DHS::Record
       expect(transactions.to_a).to eq (0...300).to_a
     end
   end
+
+  context 'next offset pagination with items configuration' do
+    def stub_api_request(next_offset:, items: [], offset: nil)
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
+        .to_return(body: { assets: items, next_offset: next_offset }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, next_offset: 99)
+      stub_api_request(items: (100...200).to_a, offset: 99, next_offset: 199)
+      stub_api_request(items: (200...300).to_a, offset: 199, next_offset: 0)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration items_key: :assets, pagination_strategy: :next_offset, pagination_key: { body: :next_offset, parameter: :offset }
+
+        endpoint 'http://depay.fi/v2/transactions'
+      end
+    end
+
+    it 'fetches and merges all the assets/items' do
+      transactions = Transaction.all.fetch
+      expect(transactions.to_a).to eq (0...300).to_a
+    end
+  end
+
+  context 'next offset pagination with items configuration and nil response' do
+    def stub_api_request(next_offset:, items: [], offset: nil)
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
+        .to_return(body: { assets: items, next_offset: next_offset }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, next_offset: 99)
+      stub_api_request(items: (100...200).to_a, offset: 99, next_offset: 199)
+      stub_api_request(items: nil, offset: 199, next_offset: 0)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration items_key: :assets, pagination_strategy: :next_offset, pagination_key: { body: :next_offset, parameter: :offset }
+
+        endpoint 'http://depay.fi/v2/transactions'
+      end
+    end
+
+    it 'fetches and merges all the assets/items' do
+      transactions = Transaction.all.fetch
+      expect(transactions.to_a).to eq (0...200).to_a
+    end
+  end
 end