Save DltMessage to Message table in CoincentoWallet

Author: RaevskiySV

server/src/main/java/com/exactpro/blockchain/api/client/ClientHandler.java

@@ -98,7 +98,7 @@ public Mono<ServerResponse> transfer(ServerRequest request) {
                         return Mono.empty();
                     }
                     return wallet.transfer(
-                        transfer.getCreditorBic(), transfer.getEndToEndId(), currency, transfer.getAmount()
+                        transfer.getTransferId(), transfer.getCreditorBic(), transfer.getEndToEndId(), currency, transfer.getAmount()
                     );
                 }))
                 .onErrorResume(ex ->
@@ -211,7 +211,7 @@ Mono<Void> handle(
         try {
             pacs008MessageJson = objectMapper.writeValueAsString(pacs008Message);
         } catch (JsonProcessingException e) {
-            return Mono.error(new RuntimeException("Failed to encode Pacs008Message to JSON", e));
+            return Mono.error(new RuntimeException("Failed to convert Pacs008Message to JSON", e));
         }
 
         Message message = new Message("pacs.008", transfer.getTransferId(), pacs008MessageJson);

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

@@ -1,8 +1,10 @@
 package com.exactpro.blockchain.coincento;
 
-import com.exactpro.blockchain.entity.BankETHAddress;
-import com.exactpro.blockchain.entity.Currency;
+import com.exactpro.blockchain.entity.*;
 import com.exactpro.blockchain.repository.BankETHAddressRepository;
+import com.exactpro.blockchain.repository.MessageRepository;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,21 +41,30 @@ public class CoincentoWallet {
     private final @NonNull Credentials credentials;
 
     private final BankETHAddressRepository bankETHAddressRepository;
+    private final ObjectMapper objectMapper;
+
+    private final MessageRepository messageRepository;
 
     @Value("${ethereum.coincento}")
     private String coincentoAddress;
 
     public CoincentoWallet(@NonNull Web3j web3j,
                            @NonNull Credentials credentials,
-                           BankETHAddressRepository bankETHAddressRepository) {
+                           BankETHAddressRepository bankETHAddressRepository,
+                           ObjectMapper objectMapper,
+                           MessageRepository messageRepository) {
         this.web3j = Objects.requireNonNull(web3j);
         this.credentials = Objects.requireNonNull(credentials);
         this.bankETHAddressRepository = bankETHAddressRepository;
+        this.objectMapper = objectMapper;
+        this.messageRepository = messageRepository;
     }
 
-    public Mono<Void> transfer(
-        @NonNull String creditorBic, @NonNull String endToEndId, @NonNull Currency currency, @NonNull BigDecimal amount
-    ) {
+    public Mono<Void> transfer(@NonNull Integer transferId,
+                               @NonNull String creditorBic,
+                               @NonNull String endToEndId,
+                               @NonNull Currency currency,
+                               @NonNull BigDecimal amount) {
         return
             Mono.zip(getEthereumAddress(creditorBic), getNonce())
             .flatMap(data -> {
@@ -92,7 +103,8 @@ public Mono<Void> transfer(
                         if (it.hasError()) {
                             return Mono.error(new Exception(it.getError().getMessage()));
                         }
-                        return Mono.just(it);
+                        return createAndSaveMessage(transferId, endToEndId, currency, amount, toAddress)
+                            .flatMap(message -> Mono.just(it));
                     })
                     .doOnSuccess(it -> logger.info("Sent transfer transaction {}", it.getTransactionHash()))
                     .then();
@@ -110,4 +122,29 @@ public Mono<Void> transfer(
     private @NonNull Mono<String> getEthereumAddress(@NonNull String bic) {
         return bankETHAddressRepository.getByBic(bic).map(BankETHAddress::getEthAddress);
     }
+
+    private @NonNull Mono<Message> createAndSaveMessage(Integer transferId,
+                                                        String endToEndId,
+                                                        Currency currency,
+                                                        BigDecimal amount,
+                                                        String toAddress) {
+        DltMessage dltMessage = DltMessage.builder()
+            .endToEndId(endToEndId)
+            .currencyId(currency.getAddress())
+            .amount(amount.multiply(XXX))
+            .debtorAddress(credentials.getAddress())
+            .creditorAddress(toAddress)
+            .build();
+
+        String dltJson;
+        try {
+            dltJson = objectMapper.writeValueAsString(dltMessage);
+        } catch (JsonProcessingException e) {
+            return Mono.error(new RuntimeException("Failed to convert DltMessage to JSON", e));
+        }
+
+        Message message = new Message("erc-1155.safeTransfer", transferId, dltJson);
+
+        return messageRepository.save(message);
+    }
 }

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

@@ -3,8 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.math.BigDecimal;
-import java.time.Instant;
-import java.time.LocalDate;
 
 public class DltMessage {
     @JsonProperty("endToEndId")
@@ -21,4 +19,60 @@ public class DltMessage {
 
     @JsonProperty("creditorAddress")
     private String creditorAddress;
+
+    public DltMessage() {
+    }
+
+    public DltMessage(Builder builder) {
+        this.endToEndId = builder.endToEndId;
+        this.currencyId = builder.currencyId;
+        this.amount = builder.amount;
+        this.debtorAddress = builder.debtorAddress;
+        this.creditorAddress = builder.creditorAddress;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private String endToEndId;
+
+        private String currencyId;
+
+        private BigDecimal amount;
+
+        private String debtorAddress;
+
+        private String creditorAddress;
+
+        public Builder endToEndId(String endToEndId) {
+            this.endToEndId = endToEndId;
+            return this;
+        }
+
+        public Builder currencyId(String currencyId) {
+            this.currencyId = currencyId;
+            return this;
+        }
+
+        public Builder amount(BigDecimal amount) {
+            this.amount = amount;
+            return this;
+        }
+
+        public Builder debtorAddress(String debtorAddress) {
+            this.debtorAddress = debtorAddress;
+            return this;
+        }
+
+        public Builder creditorAddress(String creditorAddress) {
+            this.creditorAddress = creditorAddress;
+            return this;
+        }
+
+        public DltMessage build() {
+            return new DltMessage(this);
+        }
+    }
 }

server/src/main/java/com/exactpro/blockchain/kafka/KafkaConsumer.java

@@ -209,14 +209,10 @@ private Mono<Message> saveSinglePacs008Message(Transfer transfer, Pacs008Message
                 try {
                     pacs008MessageJson = objectMapper.writeValueAsString(pacsMessage);
                 } catch (JsonProcessingException e) {
-                    return Mono.error(new RuntimeException("Failed to encode Pacs008Message to JSON", e));
+                    return Mono.error(new RuntimeException("Failed to convert Pacs008Message to JSON", e));
                 }
 
-                Message messageEntity = new Message(
-                    "pacs.008",
-                    transfer.getTransferId(),
-                    pacs008MessageJson
-                );
+                Message messageEntity = new Message("pacs.008", transfer.getTransferId(), pacs008MessageJson);
                 return messageRepository.save(messageEntity);
             });
     }