Merge pull request #75 from OpenFuturePlatform/SA-91_Extend_API_of_Ke…

…y_management_service Order wallet unique check
OpenFuturePlatform · May 10, 2023 · d9abd7b · d9abd7b
2 parents c141fa0 + 9a266f3
commit d9abd7b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/...re/state/blockchain/EthereumBlockchain.kt → ...blockchain/ethereum/EthereumBlockchain.kt b/...re/state/blockchain/EthereumBlockchain.kt → ...blockchain/ethereum/EthereumBlockchain.kt
@@ -1,5 +1,6 @@
-package io.openfuture.state.blockchain
+package io.openfuture.state.blockchain.ethereum
 
+import io.openfuture.state.blockchain.Blockchain
 import io.openfuture.state.blockchain.dto.UnifiedBlock
 import io.openfuture.state.blockchain.dto.UnifiedTransaction
 import io.openfuture.state.domain.CurrencyCode

diff --git a/...ture/state/blockchain/GoerliBlockchain.kt → ...e/blockchain/ethereum/GoerliBlockchain.kt b/...ture/state/blockchain/GoerliBlockchain.kt → ...e/blockchain/ethereum/GoerliBlockchain.kt
@@ -1,5 +1,6 @@
-package io.openfuture.state.blockchain
+package io.openfuture.state.blockchain.ethereum
 
+import io.openfuture.state.blockchain.Blockchain
 import io.openfuture.state.blockchain.dto.UnifiedBlock
 import io.openfuture.state.blockchain.dto.UnifiedTransaction
 import io.openfuture.state.domain.CurrencyCode

diff --git a/src/main/kotlin/io/openfuture/state/repository/OrderRepository.kt b/src/main/kotlin/io/openfuture/state/repository/OrderRepository.kt
@@ -10,5 +10,6 @@ import reactor.core.publisher.Mono
 interface OrderRepository : ReactiveMongoRepository<Order, String>{
     suspend fun findByOrderKey(orderKey: String): Mono<Order>
     suspend fun existsByOrderKey(orderKey: String): Mono<Boolean>
+    suspend fun existsByOrderKeyAndApplicationId(orderKey: String, applicationId: String): Mono<Boolean>
     suspend fun findAllByApplicationId(applicationId: String): Flux<Order>
 }
diff --git a/src/main/kotlin/io/openfuture/state/repository/WalletRepository.kt b/src/main/kotlin/io/openfuture/state/repository/WalletRepository.kt
@@ -12,14 +12,14 @@ interface WalletRepository : ReactiveMongoRepository<Wallet, String> {
 
     fun findByIdentity(identity: WalletIdentity): Mono<Wallet>
 
+    fun existsByIdentity(identity: WalletIdentity): Mono<Boolean>
+
     fun findFirstByIdentityAddress(address: String): Mono<Wallet>
 
     fun findAllByUserData_Order_OrderKey(orderKey: String): Flux<Wallet>
 
     fun findFirstByUserData_Order_OrderKey(orderKey: String): Mono<Wallet>
 
-    fun findByIdentityBlockchainAndIdentityAddress(blockchain: String, address: String): Mono<Wallet>
-
     fun deleteByIdentity(identity: WalletIdentity)
 
     fun findAllByApplicationId(applicationId: String): Flux<Wallet>

diff --git a/src/main/kotlin/io/openfuture/state/service/DefaultWalletService.kt b/src/main/kotlin/io/openfuture/state/service/DefaultWalletService.kt
@@ -78,7 +78,7 @@ class DefaultWalletService(
             request.metadata.amount,
             request.metadata.productCurrency
         )
-        val existOrder = orderRepository.existsByOrderKey(request.metadata.orderKey).awaitSingle()
+        val existOrder = orderRepository.existsByOrderKeyAndApplicationId(request.metadata.orderKey, request.applicationId).awaitSingle()
         if (!existOrder) {
             orderRepository.save(order).awaitSingle()
         }
@@ -96,7 +96,9 @@ class DefaultWalletService(
                 userData = userData,
                 walletType = WalletType.FOR_ORDER
             )
-            savedWallets.add(walletRepository.save(wallet).awaitSingle())
+            val existWallet = walletRepository.existsByIdentity(walletIdentity).awaitSingle()
+            if (!existWallet)
+                savedWallets.add(walletRepository.save(wallet).awaitSingle())
         }
         val wallets = savedWallets.map { WalletCreateResponse(it.identity.blockchain, it.identity.address, it.userData.rate) }
         return PlaceOrderResponse(