Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: filter dao transactions by address hash #1411

Merged
merged 1 commit into from
Aug 28, 2023
Merged

fix: filter dao transactions by address hash #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/api/v1/contract_transactions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def show
address = Address.find_address!(params[:address_hash])
raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)

ckb_transactions = ckb_transactions.includes(:contained_dao_addresses).
where(address_dao_transactions: { address_id: address.id })
ckb_transactions = ckb_transactions.joins(:account_books).
where(account_books: { address_id: address.id })
end

ckb_transactions = ckb_transactions.page(@page).per(@page_size).fast_page
Expand Down
4 changes: 2 additions & 2 deletions test/controllers/api/v1/contract_transactions_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
address = create(:address)
fake_dao_deposit_transaction(15, address)

contract_ckb_transactions = address.ckb_dao_transactions.includes(:contained_dao_addresses).
where(address_dao_transactions: { address_id: address.id }).
contract_ckb_transactions = address.ckb_dao_transactions.joins(:account_books).
where(account_books: { address_id: address.id }).
order("ckb_transactions.block_timestamp desc nulls last, ckb_transactions.id desc").page(page).per(page_size).fast_page

valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME),
Expand Down