Fix incorrect pagination headers in /api/v2/admin/accounts (#25477)
				
					
				
			This commit is contained in:
		
							parent
							
								
									a27a33ebde
								
							
						
					
					
						commit
						498e3231b6
					
				
					 2 changed files with 16 additions and 0 deletions
				
			
		| 
						 | 
					@ -18,6 +18,14 @@ class Api::V2::Admin::AccountsController < Api::V1::Admin::AccountsController
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  private
 | 
					  private
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def next_path
 | 
				
			||||||
 | 
					    api_v2_admin_accounts_url(pagination_params(max_id: pagination_max_id)) if records_continue?
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def prev_path
 | 
				
			||||||
 | 
					    api_v2_admin_accounts_url(pagination_params(min_id: pagination_since_id)) unless @accounts.empty?
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def filtered_accounts
 | 
					  def filtered_accounts
 | 
				
			||||||
    AccountFilter.new(translated_filter_params).results
 | 
					    AccountFilter.new(translated_filter_params).results
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -55,5 +55,13 @@ RSpec.describe Api::V2::Admin::AccountsController do
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    context 'with limit param' do
 | 
				
			||||||
 | 
					      let(:params) { { limit: 1 } }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      it 'sets the correct pagination headers' do
 | 
				
			||||||
 | 
					        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq api_v2_admin_accounts_url(limit: 1, max_id: admin_account.id)
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue