Fix CoincentoWallet.getEthereumAddress()

Author: ASitnikov

server/src/main/java/com/exactpro/blockchain/coincento/CoincentoWallet.java

@@ -108,9 +108,6 @@ public Mono<Void> transfer(
     }
 
     private @NonNull Mono<String> getEthereumAddress(@NonNull String bic) {
-        return bankETHAddressRepository.findByBic(bic)
-            .singleOrEmpty()
-            .switchIfEmpty(Mono.error(new Exception(String.format("BIC %s doesn't have associated Ethereum address", bic))))
-            .map(BankETHAddress::getBic);
+        return bankETHAddressRepository.getByBic(bic).map(BankETHAddress::getEthAddress);
     }
 }

server/src/main/java/com/exactpro/blockchain/repository/BankETHAddressRepository.java

@@ -1,10 +1,24 @@
 package com.exactpro.blockchain.repository;
 
 import com.exactpro.blockchain.entity.BankETHAddress;
+import com.exactpro.blockchain.entity.Client;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.lang.NonNull;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.NoSuchElementException;
 
 public interface BankETHAddressRepository extends ReactiveCrudRepository<BankETHAddress, String> {
     @NonNull Flux<BankETHAddress> findByBic(String bic);
+
+    default @NonNull Mono<BankETHAddress> getByBic(String bic) {
+        return
+            findByBic(bic)
+            .single()
+            .onErrorMap(
+                NoSuchElementException.class,
+                error -> new Exception(String.format("No Ethereum address is associated with bank %s", bic), error)
+            );
+    }
 }