changed transaction history to return details of sender/receiver in one record

wallet/wallet-app/src/main/kotlin/co/nilin/opex/wallet/app/controller/TransactionController.kt

@@ -2,6 +2,7 @@ package co.nilin.opex.wallet.app.controller
 
 import co.nilin.opex.wallet.app.dto.TransactionRequest
 import co.nilin.opex.wallet.core.model.TransactionHistory
+import co.nilin.opex.wallet.core.model.TransactionWithDetailHistory
 import co.nilin.opex.wallet.core.spi.TransactionManager
 import org.springframework.web.bind.annotation.*
 import java.time.Instant
@@ -31,7 +32,7 @@ class TransactionController(private val manager: TransactionManager) {
     suspend fun getTransactionsForUser(
         @PathVariable("uuid") uuid: String,
         @RequestBody request: TransactionRequest
-    ): List<TransactionHistory> {
+    ): List<TransactionWithDetailHistory> {
         return manager.findTransactions(
             uuid,
             request.coin,

wallet/wallet-app/src/test/kotlin/co/nilin/opex/wallet/app/controller/TransactionControllerIT.kt

@@ -2,7 +2,7 @@ package co.nilin.opex.wallet.app.controller
 
 import co.nilin.opex.wallet.app.KafkaEnabledTest
 import co.nilin.opex.wallet.app.dto.TransactionRequest
-import co.nilin.opex.wallet.core.model.TransactionHistory
+import co.nilin.opex.wallet.core.model.TransactionWithDetailHistory
 import co.nilin.opex.wallet.core.spi.TransactionManager
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test
@@ -30,8 +30,8 @@ class TransactionControllerIT : KafkaEnabledTest() {
     fun whenGetTransactionsForUser_thenReturnsHistory() {
         val uuid = "uuid"
         val t = System.currentTimeMillis()
-        val history = TransactionHistory(
-            1L, "c", "w", BigDecimal.ONE, "desc", "ref", System.currentTimeMillis(), "cat", mapOf(Pair("key1", "val1")), true
+        val history = TransactionWithDetailHistory(
+            1L, "sw", "dw", "su", "du", "c", BigDecimal.ONE, "desc", "ref", System.currentTimeMillis(), "cat", mapOf(Pair("key1", "val1"))
         )
         runBlocking {
             Mockito.`when`(
@@ -43,7 +43,7 @@ class TransactionControllerIT : KafkaEnabledTest() {
                 .bodyValue(TransactionRequest("c", null, t, t, 1, 1, true))
                 .exchange()
                 .expectStatus().isOk
-                .expectBodyList(TransactionHistory::class.java)
+                .expectBodyList(TransactionWithDetailHistory::class.java)
                 .contains(history)
         }
 

wallet/wallet-app/src/test/kotlin/co/nilin/opex/wallet/app/controller/TransferControllerIT.kt

@@ -4,7 +4,7 @@ import co.nilin.opex.wallet.app.KafkaEnabledTest
 import co.nilin.opex.wallet.app.dto.TransactionRequest
 import co.nilin.opex.wallet.core.inout.TransferResult
 import co.nilin.opex.wallet.core.model.Amount
-import co.nilin.opex.wallet.core.model.TransactionHistory
+import co.nilin.opex.wallet.core.model.TransactionWithDetailHistory
 import co.nilin.opex.wallet.core.spi.CurrencyService
 import co.nilin.opex.wallet.core.spi.WalletManager
 import co.nilin.opex.wallet.core.spi.WalletOwnerManager
@@ -49,11 +49,11 @@ class TransferControllerIT : KafkaEnabledTest() {
         runBlocking {
             val t = System.currentTimeMillis()
             val sender = walletOwnerManager.createWalletOwner(UUID.randomUUID().toString(), "sender", "")
-            val receiver = UUID.randomUUID().toString()
+            val receiver = sender.uuid
             val srcCurrency = currencyService.getCurrency("ETH")!!
             walletManager.createWallet(sender, Amount(srcCurrency, BigDecimal.valueOf(100)), srcCurrency, "main")
 
-            val transfer = webClient.post().uri("/v2/transfer/1_ETH/from/${sender.uuid}_main/to/${receiver}_main").accept(MediaType.APPLICATION_JSON)
+            val transfer = webClient.post().uri("/v2/transfer/1_ETH/from/${sender.uuid}_main/to/${receiver}_exchange").accept(MediaType.APPLICATION_JSON)
                 .bodyValue(TransferController.TransferBody("desc", "ref", "NORMAL", mapOf(Pair("key", "value"))))
                 .exchange()
                 .expectStatus().isOk
@@ -62,20 +62,24 @@ class TransferControllerIT : KafkaEnabledTest() {
             Assertions.assertEquals(BigDecimal.ONE, transfer.amount.amount)
             Assertions.assertEquals("ETH", transfer.amount.currency.symbol)
             val receiverWallet = walletManager.findWalletByOwnerAndCurrencyAndType(
-                walletOwnerManager.findWalletOwner(receiver)!!, "main", srcCurrency
+                walletOwnerManager.findWalletOwner(receiver)!!, "exchange", srcCurrency
             )
             Assertions.assertEquals(BigDecimal.ONE, receiverWallet!!.balance.amount)
             val txList = webClient.post().uri("/transaction/$receiver").accept(MediaType.APPLICATION_JSON)
                 .bodyValue(TransactionRequest("ETH", null, t, System.currentTimeMillis(), 1, 0, true))
                 .exchange()
                 .expectStatus().isOk
-                .expectBodyList(TransactionHistory::class.java)
+                .expectBodyList(TransactionWithDetailHistory::class.java)
                 .returnResult().responseBody
             Assertions.assertEquals(1, txList!!.size)
             with(txList[0]) {
                 Assertions.assertEquals("NORMAL", this.category)
                 Assertions.assertEquals(mapOf(Pair("key", "value")), this.additionalData)
                 Assertions.assertEquals("ETH", this.currency)
+                Assertions.assertEquals("main", this.srcWallet)
+                Assertions.assertEquals("exchange", this.destWallet)
+                Assertions.assertEquals(sender.uuid, this.senderUuid)
+                Assertions.assertEquals(receiverUuid, this.receiverUuid)
             }
         }
     }

wallet/wallet-app/src/test/kotlin/co/nilin/opex/wallet/app/service/TransactionManagerImplIT.kt

@@ -76,17 +76,17 @@ class TransactionManagerImplIT : KafkaEnabledTest() {
 
             assertEquals(2, thSender.size)
             assertTrue(thSender.first().date.compareTo(thSender.last().date) < 0)
-            assertTrue(thSender.all { th -> th.withdraw })
-            assertTrue(thSender.all { th -> th.wallet == senderWalletType })
+            assertTrue(thSender.all { th -> th.senderUuid == sender.uuid })
+            assertTrue(thSender.all { th -> th.srcWallet == senderWalletType })
 
             val thReceiver = transactionManager.findTransactions(
                 receiver.uuid, currency.symbol, "NORMAL", LocalDateTime.now().minusHours(1), LocalDateTime.now(), false, 3, 1
             )
 
             assertEquals(3, thReceiver.size)
             assertTrue(thReceiver.first().date.compareTo(thReceiver.last().date) > 0)
-            assertTrue(thReceiver.none { th -> th.withdraw })
-            assertTrue(thReceiver.all { th -> th.wallet == receiverWalletType })
+            assertTrue(thReceiver.all { th -> th.receiverUuid == receiver.uuid })
+            assertTrue(thReceiver.all { th -> th.destWallet == receiverWalletType })
 
             val thReceiverAll = transactionManager.findTransactions(
                 receiver.uuid, null, null, LocalDateTime.now().minusHours(1), LocalDateTime.now(), true, 100, 0

wallet/wallet-app/src/test/kotlin/co/nilin/opex/wallet/app/service/TransferManagerImplIT.kt

@@ -8,7 +8,8 @@ import co.nilin.opex.wallet.core.spi.*
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
@@ -263,27 +264,25 @@ class TransferManagerImplIT : KafkaEnabledTest() {
 
             val thwMatch = thw.find { th -> th.id.toString().equals(result.tx) }
             assertNotNull(thwMatch)
-            assertTrue(thwMatch!!.withdraw)
-            assertEquals("NORMAL", thwMatch.category)
+            assertEquals("NORMAL", thwMatch!!.category)
 
             val thdMatch = thd.find { th -> th.id.toString().equals(result.tx) }
             assertNotNull(thdMatch)
-            assertFalse(thdMatch!!.withdraw)
-            assertEquals("NORMAL", thdMatch.category)
+            assertEquals("NORMAL", thdMatch!!.category)
 
             val thSender = transactionManager.findTransactions(
                 sender.uuid, currency.symbol, "NORMAL", LocalDateTime.now().minusHours(1), LocalDateTime.now(), true, 100, 0
             )
             val thSenderMatch = thSender.find { i -> i.id.toString().equals(result.tx) }
-            assertTrue(thSenderMatch!!.withdraw)
+            assertEquals(sender.uuid, thSenderMatch!!.senderUuid)
             assertEquals("NORMAL", thSenderMatch.category)
 
 
             val thReceiver = transactionManager.findTransactions(
                 receiver.uuid, currency.symbol, "NORMAL", LocalDateTime.now().minusHours(1), LocalDateTime.now(), true, 100, 0
             )
             val thReceiverMatch = thReceiver.find { i -> i.id.toString().equals(result.tx) }
-            assertFalse(thReceiverMatch!!.withdraw)
+            assertEquals(receiver.uuid, thReceiverMatch!!.receiverUuid)
             assertEquals("NORMAL", thReceiverMatch.category)
 
         }

wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/model/TransactionHistory.kt

@@ -11,6 +11,5 @@ data class TransactionHistory(
     val ref: String?,
     val date: Long,
     val category: String?,
-    val additionalData: Map<String, Any>?,
-    val withdraw: Boolean
+    val additionalData: Map<String, Any>?
 )

wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/model/TransactionWithDetailHistory.kt

@@ -0,0 +1,18 @@
+package co.nilin.opex.wallet.core.model
+
+import java.math.BigDecimal
+
+data class TransactionWithDetailHistory(
+    val id: Long,
+    val srcWallet: String,
+    val destWallet: String,
+    val senderUuid: String,
+    val receiverUuid: String,
+    val currency: String,
+    val amount: BigDecimal,
+    val description: String?,
+    val ref: String?,
+    val date: Long,
+    val category: String,
+    val additionalData: Map<String, Any>?,
+)

wallet/wallet-core/src/main/kotlin/co/nilin/opex/wallet/core/spi/TransactionManager.kt

@@ -2,6 +2,7 @@ package co.nilin.opex.wallet.core.spi
 
 import co.nilin.opex.wallet.core.model.Transaction
 import co.nilin.opex.wallet.core.model.TransactionHistory
+import co.nilin.opex.wallet.core.model.TransactionWithDetailHistory
 import java.time.LocalDateTime
 
 interface TransactionManager {
@@ -26,5 +27,5 @@ interface TransactionManager {
             offset: Int
     ): List<TransactionHistory>
 
-    suspend fun findTransactions(uuid: String, coin: String?, category: String?, startTime: LocalDateTime, endTime: LocalDateTime, asc: Boolean, limit: Int, offset: Int): List<TransactionHistory>
+    suspend fun findTransactions(uuid: String, coin: String?, category: String?, startTime: LocalDateTime, endTime: LocalDateTime, asc: Boolean, limit: Int, offset: Int): List<TransactionWithDetailHistory>
 }

wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dao/TransactionRepository.kt

@@ -2,6 +2,7 @@ package co.nilin.opex.wallet.ports.postgres.dao
 
 import co.nilin.opex.wallet.ports.postgres.dto.DepositWithdrawTransaction
 import co.nilin.opex.wallet.ports.postgres.dto.TransactionStat
+import co.nilin.opex.wallet.ports.postgres.dto.TransactionWithDetail
 import co.nilin.opex.wallet.ports.postgres.model.TransactionModel
 import org.springframework.data.r2dbc.repository.Query
 import org.springframework.data.repository.query.Param
@@ -84,7 +85,7 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
     @Query(
         """
         select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-        , t.transfer_category as category, t.transfer_detail_json as detail,  t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
+        , t.transfer_category as category, t.transfer_detail_json as detail
         from wallet as w
         inner join wallet_owner as wo on (w.owner = wo.id)
         inner join transaction as t on (w.id = t.dest_wallet)
@@ -105,7 +106,7 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
     @Query(
         """
         select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-        , t.transfer_category as category, t.transfer_detail_json as detail,  t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
+        , t.transfer_category as category, t.transfer_detail_json as detail
         from wallet as w
         inner join wallet_owner as wo on (w.owner = wo.id)
         inner join transaction as t on (w.id = t.source_wallet)
@@ -125,7 +126,7 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
     @Query(
         """
         select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-               , t.transfer_category as category, t.transfer_detail_json as detail,  t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
+               , t.transfer_category as category, t.transfer_detail_json as detail
         from wallet as w
         inner join wallet_owner as wo on (w.owner = wo.id)
         inner join transaction as t on (w.id = t.dest_wallet)
@@ -148,7 +149,7 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
     @Query(
         """
         select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-        , t.transfer_category as category, t.transfer_detail_json as detail, t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
+        , t.transfer_category as category, t.transfer_detail_json as detail
         from wallet as w
         inner join wallet_owner as wo on (w.owner = wo.id)
         inner join transaction as t on (w.id = t.source_wallet)
@@ -169,16 +170,18 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
 
     @Query(
         """
-        select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-        , t.transfer_category as category, t.transfer_detail_json as detail,  t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
-        from wallet as w
-        inner join wallet_owner as wo on (w.owner = wo.id)
-        inner join transaction as t on w.id in (t.source_wallet, t.dest_wallet)
-        where wo.uuid = :uuid
+        select distinct t.id, sw.wallet_type as src_wallet, dw.wallet_type as dest_wallet, swo.uuid as sender_uuid, dwo.uuid as receiver_uuid, sw.currency, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
+        , t.transfer_category as category, t.transfer_detail_json as detail
+        from transaction as t
+        inner join wallet as sw on sw.id  = t.source_wallet
+        inner join wallet_owner as swo on (sw.owner = swo.id)
+        inner join wallet as dw on dw.id  = t.dest_wallet
+        inner join wallet_owner as dwo on (dw.owner = dwo.id)
+        where :uuid in (swo.uuid, dwo.uuid)
         and t.transaction_date > :startTime 
         and t.transaction_date <= :endTime
         and (:category is null or t.transfer_category = :category) 
-        and (:currency is null or w.currency = :currency) 
+        and (:currency is null or sw.currency = :currency) 
         order by date asc
         limit :limit
         offset :offset 
@@ -192,20 +195,22 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
         @Param("endTime") endTime: LocalDateTime,
         @Param("limit") limit: Int,
         @Param("offset") offset: Int,
-    ): Flux<DepositWithdrawTransaction>
+    ): Flux<TransactionWithDetail>
 
     @Query(
         """
-        select distinct t.id, w.currency, w.wallet_type as wallet, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
-        , t.transfer_category as category, t.transfer_detail_json as detail,  t.source_wallet as sender, t.dest_wallet as receiver, w.id as owner
-        from wallet as w
-        inner join wallet_owner as wo on (w.owner = wo.id)
-        inner join transaction as t on w.id in (t.source_wallet, t.dest_wallet)
-        where wo.uuid = :uuid
+        select distinct t.id, sw.wallet_type as src_wallet, dw.wallet_type as dest_wallet, swo.uuid as sender_uuid, dwo.uuid as receiver_uuid, sw.currency, t.dest_amount as amount, t.description, t.transfer_ref as ref, t.transaction_date as date
+        , t.transfer_category as category, t.transfer_detail_json as detail
+        from transaction as t
+        inner join wallet as sw on sw.id  = t.source_wallet
+        inner join wallet_owner as swo on (sw.owner = swo.id)
+        inner join wallet as dw on dw.id  = t.dest_wallet
+        inner join wallet_owner as dwo on (dw.owner = dwo.id)
+        where :uuid in (swo.uuid, dwo.uuid)
         and t.transaction_date > :startTime 
         and t.transaction_date <= :endTime
         and (:category is null or t.transfer_category = :category) 
-        and (:currency is null or w.currency = :currency) 
+        and (:currency is null or sw.currency = :currency) 
         order by date desc
         limit :limit
         offset :offset     
@@ -219,6 +224,6 @@ interface TransactionRepository : ReactiveCrudRepository<TransactionModel, Long>
         @Param("endTime") endTime: LocalDateTime,
         @Param("limit") limit: Int,
         @Param("offset") offset: Int,
-    ): Flux<DepositWithdrawTransaction>
+    ): Flux<TransactionWithDetail>
 
 }

wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/DepositWithdrawTransaction.kt

@@ -12,8 +12,5 @@ data class DepositWithdrawTransaction(
     val ref: String?,
     val date: LocalDateTime,
     val category: String,
-    val detail: String?,
-    val sender: Long?,
-    val receiver: Long?,
-    val owner: Long?
+    val detail: String?
 )

wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/dto/TransactionWithDetail.kt

@@ -0,0 +1,19 @@
+package co.nilin.opex.wallet.ports.postgres.dto
+
+import java.math.BigDecimal
+import java.time.LocalDateTime
+
+data class TransactionWithDetail(
+    val id: Long,
+    val srcWallet: String,
+    val destWallet: String,
+    val senderUuid: String,
+    val receiverUuid: String,
+    val currency: String,
+    val amount: BigDecimal,
+    val description: String?,
+    val ref: String?,
+    val date: LocalDateTime,
+    val category: String,
+    val detail: String?,
+)

wallet/wallet-ports/wallet-persister-postgres/src/main/kotlin/co/nilin/opex/wallet/ports/postgres/impl/CurrencyServiceImpl.kt

@@ -14,7 +14,6 @@ import kotlinx.coroutines.reactor.awaitSingleOrNull
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
 import java.math.BigDecimal
 import java.time.LocalDateTime
 import java.util.stream.Collectors