Add timestamp to Message

Author: ASitnikov

gui/src/services/backend/api.ts

@@ -24,7 +24,7 @@ import config from '../../../config'
 import * as hardcoded from '../hardcoded'
 
 function bankBaseRoute(bank: BankName): string {
-  // return `http://localhost:8083/${bank.toLowerCase().replace(/ /g, '-')}/api`
+//  return `http://localhost:8083/${bank.toLowerCase().replace(/ /g, '-')}/api`
   return `/${bank.toLowerCase().replace(/ /g, '-')}/api`
 }
 
@@ -94,7 +94,7 @@ function mapMessage(message: any): TransferMessage {
     type: message.messageType,
     title: "",
     summary: JSON.parse(message.content),
-    timestamp: "2025-08-04T14:59:22.028532Z"
+    timestamp: message.timestamp
   }
   console.log(foo)
   return foo
@@ -231,7 +231,7 @@ async function getIbans(bank: BankName): Promise<string[]> {
     const response = await ofetch<string[]>(joinURL(bankBaseRoute(contraBank), 'bank', 'iban'), {
       method: 'GET'
     })
-    //     const response = ["GB33BUKB20201555555555"];
+//     const response = ['GB33BUKB20201555555555'];
     return z.string().array().parse(response)
   } catch (error) {
     handleError(`fetching IBANs for ${bank}`, error)

server/src/main/java/com/exactpro/blockchain/CustomerCreditTransferConverter.java

@@ -29,7 +29,7 @@ public Transfer newTransfer(@NonNull Client client, @NonNull TransferRequest tra
             .amount(transferRequest.getAmount())
             .clientId(client.getClientId())
             .creditorBic(transferRequest.getCreditorBic())
-            .creditorFullName(client.getFullName())
+            .creditorFullName(transferRequest.getCreditorFullName())
             .creditorIban(transferRequest.getCreditorIban())
             .currencyCode(transferRequest.getCurrencyCode())
             .debtorBic(myBic)

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

@@ -24,6 +24,7 @@
 import javax.xml.transform.TransformerException;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
+import java.time.Instant;
 
 @Component
 public class ClientHandler {
@@ -214,7 +215,7 @@ Mono<Void> handle(
             return Mono.error(new RuntimeException("Failed to convert Pacs008Message to JSON", e));
         }
 
-        Message message = new Message("pacs.008", transfer.getTransferId(), pacs008MessageJson);
+        Message message = new Message("pacs.008", transfer.getTransferId(), pacs008MessageJson, Instant.now());
         return messageRepository.save(message);
     }
 

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

@@ -24,6 +24,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
@@ -141,7 +142,7 @@ public Mono<Void> transfer(@NonNull Integer transferId,
             return Mono.error(new RuntimeException("Failed to convert DltMessage to JSON", e));
         }
 
-        Message message = new Message("erc-1155.safeTransfer", transferId, dltJson);
+        Message message = new Message("erc-1155.safeTransfer", transferId, dltJson, Instant.now());
 
         return messageRepository.save(message);
     }

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

@@ -1,10 +1,13 @@
 package com.exactpro.blockchain.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Column;
 import org.springframework.data.relational.core.mapping.Table;
 
+import java.time.Instant;
+
 @Table("Message")
 public class Message {
     @Id
@@ -20,13 +23,17 @@ public class Message {
 
     private String content;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Instant timestamp;
+
     public Message() {
     }
 
-    public Message(String messageType, Integer transferId, String content) {
+    public Message(String messageType, Integer transferId, String content, Instant timestamp) {
         this.messageType = messageType;
         this.transferId = transferId;
         this.content = content;
+        this.timestamp = timestamp;
     }
 
     public String getMessageId() {

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

@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -212,7 +213,7 @@ private Mono<Message> saveSinglePacs008Message(Transfer transfer, Pacs008Message
                     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, Instant.now());
                 return messageRepository.save(messageEntity);
             });
     }

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

@@ -7,6 +7,6 @@
 import reactor.core.publisher.Flux;
 
 public interface MessageRepository extends ReactiveCrudRepository<Message, String> {
-    @Query("SELECT m.messageId, m.transferId, m.messageType, m.content FROM Message m INNER JOIN Transfer t ON m.transferId = t.transferId WHERE t.endToEndId = :endToEndId")
+    @Query("SELECT m.* FROM Message m INNER JOIN Transfer t ON m.transferId = t.transferId WHERE t.endToEndId = :endToEndId")
     Flux<Message> findByEndToEndId(@Param("endToEndId") String currencyCode);
 }

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

@@ -60,5 +60,6 @@ CREATE TABLE Message (
     messageType VARCHAR(255) NOT NULL,
     transferId INTEGER NOT NULL,
     content TEXT NOT NULL,
+    timestamp TIMESTAMPTZ NOT NULL,
     FOREIGN KEY (transferId) REFERENCES Transfer(transferId)
 );