From 7f43320541df052fd7999e88aabfad241e478751 Mon Sep 17 00:00:00 2001 From: Amir Rajabi Date: Wed, 16 Jul 2025 14:56:12 +0330 Subject: [PATCH] hot fix --- .../opex/market/ports/postgres/dao/TradeRepository.kt | 7 ++----- .../co/nilin/opex/wallet/app/service/TransferService.kt | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/dao/TradeRepository.kt b/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/dao/TradeRepository.kt index 929da7bbb..4922c195d 100644 --- a/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/dao/TradeRepository.kt +++ b/market/market-ports/market-persister-postgres/src/main/kotlin/co/nilin/opex/market/ports/postgres/dao/TradeRepository.kt @@ -547,13 +547,10 @@ select t.symbol, when :uuid = t.maker_uuid then t.maker_commission_asset else t.taker_commission_asset end as commission_asset, t.trade_date as time, - case - when :uuid = t.maker_uuid and o.side = 'ask' then true - else false - end as is_buyer, + o.side = 'BID' as is_buyer, t.maker_uuid = :uuid as is_maker, true as is_best_match, - case when o.side = 'bid' and t.maker_uuid = :uuid then true else false end as is_maker_buyer + case when o.side = 'BID' and t.maker_uuid = :uuid then true else false end as is_maker_buyer from trades t inner join orders o on (t.maker_uuid = :uuid and o.ouid = t.maker_ouid) or diff --git a/wallet/wallet-app/src/main/kotlin/co/nilin/opex/wallet/app/service/TransferService.kt b/wallet/wallet-app/src/main/kotlin/co/nilin/opex/wallet/app/service/TransferService.kt index 75c2ec2e5..3749bbb7b 100644 --- a/wallet/wallet-app/src/main/kotlin/co/nilin/opex/wallet/app/service/TransferService.kt +++ b/wallet/wallet-app/src/main/kotlin/co/nilin/opex/wallet/app/service/TransferService.kt @@ -102,7 +102,7 @@ class TransferService( validateMaximumAmount(sourceSymbol, sourceAmount, destSymbol, scaledDestAmount) precisionService.validatePrecision(scaledDestAmount, destSymbol) - checkIfSystemHasEnoughBalance(destSymbol, receiverWalletType, destAmount) + checkIfSystemHasEnoughBalance(destSymbol, receiverWalletType, scaledDestAmount) val reserveNumber = UUID.randomUUID().toString() val resp = reservedTransferManager.reserve( @@ -115,7 +115,7 @@ class TransferService( receiverUuid = receiverUuid, senderWalletType = senderWalletType, receiverWalletType = receiverWalletType, - reservedDestAmount = destAmount, + reservedDestAmount = scaledDestAmount, rate = rate.rate ) )