Skip to content

Fix withdraw history service #676

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

Merged
AmirRajabii merged 8 commits into from
May 16, 2026
Merged

Fix withdraw history service #676

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d812b1c
Add interceptors dependency to all related modules
fatemeh-i May 9, 2026
424ea71
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 10, 2026
ea18c05
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 11, 2026
8571011
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 12, 2026
98f6e30
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 13, 2026
5f8716f
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 14, 2026
b81a37c
Merge remote-tracking branch 'origin/dev' into dev
AmirRajabii May 16, 2026
70d5c78
Update WithdrawRepository.kt
AmirRajabii May 16, 2026
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
26 changes: 10 additions & 16 deletions ...er-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/WithdrawRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
wth.uuid as uuid,
split_part(wo.title, '|', 2) as owner_name,
wth.amount as amount,
wm.currency as currency,
wth.currency as currency,
wth.applied_fee as applied_fee,
wth.dest_amount as dest_amount,
wth.dest_symbol as dest_symbol,
Expand All @@ -42,13 +42,12 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
wth.transfer_method as transfer_method,
wth.otp_required as otp_required
from withdraws wth
join wallet wm on wm.id = wth.wallet
join wallet_owner wo on wm.owner = wo.id
join wallet_owner wo on wth.uuid = wo.uuid
where (:owner is null or wo.uuid = :owner)
and (:destTxRef is null or wth.dest_transaction_ref = :destTxRef)
and (:withdrawUuid is null or wth.withdraw_uuid = :withdrawUuid)
and (:destAddress is null or wth.dest_address = :destAddress)
and (:currency is null or wm.currency in (:currency))
and (:currency is null or wth.currency in (:currency))
and (:startTime is null or wth.create_date > :startTime)
and (:endTime is null or wth.create_date <= :endTime)
order by
Expand Down Expand Up @@ -78,7 +77,7 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
wth.uuid as uuid,
split_part(wo.title, '|', 2) as owner_name,
wth.amount as amount,
wm.currency as currency,
wth.currency as currency,
wth.applied_fee as applied_fee,
wth.dest_amount as dest_amount,
wth.dest_symbol as dest_symbol,
Expand All @@ -96,13 +95,12 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
wth.transfer_method as transfer_method,
wth.otp_required as otp_required
from withdraws wth
join wallet wm on wm.id = wth.wallet
join wallet_owner wo on wm.owner = wo.id
join wallet_owner wo on wth.uuid = wo.uuid
where (:owner is null or wo.uuid = :owner)
and (:destTxRef is null or wth.dest_transaction_ref = :destTxRef)
and (:withdrawUuid is null or wth.withdraw_uuid = :withdrawUuid)
and (:destAddress is null or wth.dest_address = :destAddress)
and (:currency is null or wm.currency in (:currency))
and (:currency is null or wth.currency in (:currency))
and wth.status in (:status)
and (:startTime is null or wth.create_date > :startTime)
and (:endTime is null or wth.create_date <= :endTime)
Expand All @@ -129,12 +127,10 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
@Query(
"""
select count(*) from withdraws wth
join wallet wm on wm.id = wth.wallet
join wallet_owner wo on wm.owner = wo.id
where ( :owner is null or wo.uuid = :owner)
where ( :owner is null or wth.uuid = :owner)
and (:destTxRef is null or wth.dest_transaction_ref = :destTxRef)
and (:destAddress is null or wth.dest_address = :destAddress)
and (:currency is null or wm.currency in (:currency))
and (:currency is null or wth.currency in (:currency))
"""
)
fun countByCriteria(
Expand All @@ -147,12 +143,10 @@ interface WithdrawRepository : ReactiveCrudRepository<WithdrawModel, Long> {
@Query(
"""
select count(*) from withdraws wth
join wallet wm on wm.id = wth.wallet
join wallet_owner wo on wm.owner = wo.id
where ( :owner is null or wo.uuid = :owner)
where ( :owner is null or wth.uuid = :owner)
and (:destTxRef is null or wth.dest_transaction_ref = :destTxRef)
and (:destAddress is null or wth.dest_address = :destAddress)
and (:currency is null or wm.currency in (:currency))
and (:currency is null or wth.currency in (:currency))
and wth.status in (:status)
"""
)
Expand Down
Loading