Add BankETHAddress table and related entities

Author: RaevskiySV

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

@@ -1,6 +1,8 @@
 package com.exactpro.blockchain.coincento;
 
+import com.exactpro.blockchain.entity.BankETHAddress;
 import com.exactpro.blockchain.entity.Currency;
+import com.exactpro.blockchain.repository.BankETHAddressRepository;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,7 +26,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Map;
 import java.util.Objects;
 
 @Component
@@ -37,12 +38,17 @@ public class CoincentoWallet {
 
     private final @NonNull Credentials credentials;
 
+    private final BankETHAddressRepository bankETHAddressRepository;
+
     @Value("${ethereum.coincento}")
     private String coincentoAddress;
 
-    public CoincentoWallet(@NonNull Web3j web3j, @NonNull Credentials credentials) {
+    public CoincentoWallet(@NonNull Web3j web3j,
+                           @NonNull Credentials credentials,
+                           BankETHAddressRepository bankETHAddressRepository) {
         this.web3j = Objects.requireNonNull(web3j);
         this.credentials = Objects.requireNonNull(credentials);
+        this.bankETHAddressRepository = bankETHAddressRepository;
     }
 
     public Mono<Void> transfer(
@@ -101,16 +107,10 @@ public Mono<Void> transfer(
             .map(EthGetTransactionCount::getTransactionCount);
     }
 
-    private static final Map<String, String> BIC_TO_ADDRESS = Map.of(
-        "TESTUKLLXXX", "0xf17f52151EbEF6C7334FAD080c5704D77216b732",
-        "TESTGETBXXX", "0xda6c0ca76e69b32c71301356043fb56d702dfb3d"
-    );
-
     private @NonNull Mono<String> getEthereumAddress(@NonNull String bic) {
-        String address = BIC_TO_ADDRESS.get(bic);
-        if (address == null) {
-            return Mono.error(new Exception(String.format("BIC %s doesn't have associated Ethereum address", bic)));
-        }
-        return Mono.just(address);
+        return bankETHAddressRepository.findByBic(bic)
+            .singleOrEmpty()
+            .switchIfEmpty(Mono.error(new Exception(String.format("BIC %s doesn't have associated Ethereum address", bic))))
+            .map(BankETHAddress::getBic);
     }
 }

server/src/main/java/com/exactpro/blockchain/entity/BankETHAddress.java

@@ -0,0 +1,30 @@
+package com.exactpro.blockchain.entity;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("BankETHAddress")
+public class BankETHAddress {
+    @Id
+    private String bic;
+
+    @Column("ethAddress")
+    private String ethAddress;
+
+    public String getBic() {
+        return bic;
+    }
+
+    public void setBic(String bic) {
+        this.bic = bic;
+    }
+
+    public String getEthAddress() {
+        return ethAddress;
+    }
+
+    public void setEthAddress(String ethAddress) {
+        this.ethAddress = ethAddress;
+    }
+}

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

@@ -0,0 +1,10 @@
+package com.exactpro.blockchain.repository;
+
+import com.exactpro.blockchain.entity.BankETHAddress;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import org.springframework.lang.NonNull;
+import reactor.core.publisher.Flux;
+
+public interface BankETHAddressRepository extends ReactiveCrudRepository<BankETHAddress, String> {
+    @NonNull Flux<BankETHAddress> findByBic(String bic);
+}

server/src/main/resources/db/migration/V1__Initial_schema.sql

@@ -48,4 +48,9 @@ CREATE TABLE ConversionRate (
     rate NUMERIC(10, 6) NOT NULL,
     FOREIGN KEY (baseCurrency) REFERENCES CurrencyCode(code),
     FOREIGN KEY (targetCurrency) REFERENCES CurrencyCode(code)
-);
+);
+
+CREATE TABLE BankETHAddress (
+    bic VARCHAR(255) NOT NULL PRIMARY KEY,
+    ethAddress VARCHAR(255) NOT NULL UNIQUE
+);

server/src/main/resources/db/migration/V2__Initial_data.sql

@@ -46,4 +46,8 @@ INSERT INTO ConversionRate (baseCurrency, targetCurrency, rate) VALUES
 ('USD', 'USDC', 1.00),
 ('USDC', 'USD', 1.00),
 ('EUR', 'USDC', 1.14),
-('USDC', 'EUR', 0.88);
+('USDC', 'EUR', 0.88);
+
+INSERT INTO BankETHAddress (bic, ethAddress) VALUES
+('TESTUKLLXXX', '0xf17f52151EbEF6C7334FAD080c5704D77216b732'),
+('TESTGETBXXX', '0xda6c0ca76e69b32c71301356043fb56d702dfb3d');