diff --git a/pom.xml b/pom.xml
index 8979d71..401ba08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,10 @@
2.0.2
test
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
diff --git a/src/main/java/com/neo/tx/dto/TransactionRequestDto.java b/src/main/java/com/neo/tx/dto/TransactionRequestDto.java
index 14fbed1..a41404c 100644
--- a/src/main/java/com/neo/tx/dto/TransactionRequestDto.java
+++ b/src/main/java/com/neo/tx/dto/TransactionRequestDto.java
@@ -59,4 +59,22 @@ public class TransactionRequestDto {
@Schema(description = "Optional card fingerprint", example = "fp_9d82kdk29d")
@Size(max = 64)
public String cardFingerprint;
+
+ @Override
+ public String toString() {
+ return "TransactionRequestDto{" +
+ "externalId=" + externalId +
+ ", userId=" + userId +
+ ", merchantId=" + merchantId +
+ ", deviceId='" + deviceId + '\'' +
+ ", amount=" + amount +
+ ", currency='" + currency + '\'' +
+ ", initialized=" + initialized +
+ ", merchantCategory='" + merchantCategory + '\'' +
+ ", channel='" + channel + '\'' +
+ ", ipAddress='" + ipAddress + '\'' +
+ ", country='" + country + '\'' +
+ ", cardFingerprint='" + cardFingerprint + '\'' +
+ '}';
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/dto/ValidationResponseDto.java b/src/main/java/com/neo/tx/dto/ValidationResponseDto.java
index 3275f61..878eca4 100644
--- a/src/main/java/com/neo/tx/dto/ValidationResponseDto.java
+++ b/src/main/java/com/neo/tx/dto/ValidationResponseDto.java
@@ -26,4 +26,18 @@ public ValidationResponseDto(int score, RiskLevel riskLevel, Decision decision,
this.decision = decision;
this.validationResults = validationResults;
}
+
+ @Override
+ public String toString() {
+ return "ValidationResponseDto{" +
+ "id=" + id +
+ ", transactionId=" + transactionId +
+ ", score=" + score +
+ ", riskLevel=" + riskLevel +
+ ", decision=" + decision +
+ ", validationResults=" + validationResults +
+ ", createdAt=" + createdAt +
+ ", updatedAt=" + updatedAt +
+ '}';
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/dto/ValidationResultDto.java b/src/main/java/com/neo/tx/dto/ValidationResultDto.java
index 8453a38..7b3b4b9 100644
--- a/src/main/java/com/neo/tx/dto/ValidationResultDto.java
+++ b/src/main/java/com/neo/tx/dto/ValidationResultDto.java
@@ -17,4 +17,13 @@ public ValidationResultDto(String code, String description, int scoreDelta) {
this.description = description;
this.scoreDelta = scoreDelta;
}
-}
+
+ @Override
+ public String toString() {
+ return "ValidationResultDto{" +
+ "code='" + code + '\'' +
+ ", description='" + description + '\'' +
+ ", scoreDelta=" + scoreDelta +
+ '}';
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/enums/RiskCountry.java b/src/main/java/com/neo/tx/enums/RiskCountry.java
index 4421b9e..4220ea8 100644
--- a/src/main/java/com/neo/tx/enums/RiskCountry.java
+++ b/src/main/java/com/neo/tx/enums/RiskCountry.java
@@ -31,24 +31,23 @@ public enum RiskCountry {
ZAMBIA("ZMB"),
ZIMBABWE("ZWE");
- private final String alpha3;
-
- RiskCountry(String alpha3) {
- this.alpha3 = alpha3;
- }
-
- public String getAlpha3() {
- return alpha3;
- }
-
private static final Map ALPHA3_MAP =
Arrays.stream(values())
.collect(Collectors.toUnmodifiableMap(
RiskCountry::getAlpha3,
Function.identity()
));
+ private final String alpha3;
+
+ RiskCountry(String alpha3) {
+ this.alpha3 = alpha3;
+ }
public static boolean contains(String code) {
return ALPHA3_MAP.containsKey(code);
}
+
+ public String getAlpha3() {
+ return alpha3;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/message_broker/Publisher.java b/src/main/java/com/neo/tx/message_broker/Publisher.java
index 8137640..aee65b0 100644
--- a/src/main/java/com/neo/tx/message_broker/Publisher.java
+++ b/src/main/java/com/neo/tx/message_broker/Publisher.java
@@ -3,7 +3,6 @@
import com.neo.tx.model.OutboxEvent;
import com.neo.tx.repository.EventOutboxRepository;
import jakarta.transaction.Transactional;
-import org.apache.juli.logging.Log;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/neo/tx/model/OutboxEvent.java b/src/main/java/com/neo/tx/model/OutboxEvent.java
index 4e495b8..b86f66f 100644
--- a/src/main/java/com/neo/tx/model/OutboxEvent.java
+++ b/src/main/java/com/neo/tx/model/OutboxEvent.java
@@ -19,42 +19,30 @@ public enum Status {NEW, SENT, FAILED}
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
-
@Column(name = "aggregate_type", nullable = false, length = 64)
private String aggregateType;
-
@Column(name = "aggregate_id", nullable = false, length = 64)
private String aggregateId;
-
@Column(name = "event_type", nullable = false, length = 128)
private String eventType;
-
@Column(name = "topic", nullable = false, length = 255)
private String topic;
-
@Column(name = "event_key", nullable = false, length = 128)
private String eventKey;
-
@JdbcTypeCode(SqlTypes.JSON)
@Column(name = "payload", columnDefinition = "jsonb", nullable = false)
private String payload;
-
@Enumerated(EnumType.STRING)
@Column(name = "status", nullable = false, length = 16)
private Status status;
-
@Column(name = "attempts", nullable = false)
private Integer attempts;
-
@Column(name = "last_error")
private String lastError;
-
@Column(name = "available_at", nullable = false)
private Instant availableAt;
-
@Column(name = "created_at", nullable = false, updatable = false)
private Instant createdAt;
-
@Column(name = "updated_at", nullable = false)
private Instant updatedAt;
@@ -181,4 +169,23 @@ public Instant getUpdatedAt() {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
-}
+
+ @Override
+ public String toString() {
+ return "OutboxEvent{" +
+ "id=" + id +
+ ", aggregateType='" + aggregateType + '\'' +
+ ", aggregateId='" + aggregateId + '\'' +
+ ", eventType='" + eventType + '\'' +
+ ", topic='" + topic + '\'' +
+ ", eventKey='" + eventKey + '\'' +
+ ", payload='" + payload + '\'' +
+ ", status=" + status +
+ ", attempts=" + attempts +
+ ", lastError='" + lastError + '\'' +
+ ", availableAt=" + availableAt +
+ ", createdAt=" + createdAt +
+ ", updatedAt=" + updatedAt +
+ '}';
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/model/Transaction.java b/src/main/java/com/neo/tx/model/Transaction.java
index 809f013..6c6f358 100644
--- a/src/main/java/com/neo/tx/model/Transaction.java
+++ b/src/main/java/com/neo/tx/model/Transaction.java
@@ -202,4 +202,26 @@ public Instant getUpdatedAt() {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
+
+ @Override
+ public String toString() {
+ return "Transaction{" +
+ "id=" + id +
+ ", externalId=" + externalId +
+ ", userId=" + userId +
+ ", amount=" + amount +
+ ", currency='" + currency + '\'' +
+ ", initialized=" + initialized +
+ ", merchantCategory='" + merchantCategory + '\'' +
+ ", merchantId=" + merchantId +
+ ", channel='" + channel + '\'' +
+ ", ipAddress='" + ipAddress + '\'' +
+ ", country='" + country + '\'' +
+ ", deviceId='" + deviceId + '\'' +
+ ", cardFingerprint='" + cardFingerprint + '\'' +
+ ", createdAt=" + createdAt +
+ ", updatedAt=" + updatedAt +
+ ", validation=" + validation +
+ '}';
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/model/Validation.java b/src/main/java/com/neo/tx/model/Validation.java
index 3c0defa..c3c1d33 100644
--- a/src/main/java/com/neo/tx/model/Validation.java
+++ b/src/main/java/com/neo/tx/model/Validation.java
@@ -126,4 +126,18 @@ public Instant getUpdatedAt() {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
+
+ @Override
+ public String toString() {
+ return "Validation{" +
+ "id=" + id +
+ ", transaction=" + transaction +
+ ", score=" + score +
+ ", riskLevel=" + riskLevel +
+ ", decision=" + decision +
+ ", triggeredValidators=" + triggeredValidators +
+ ", createdAt=" + createdAt +
+ ", updatedAt=" + updatedAt +
+ '}';
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/repository/specification/EventOutboxJpaRepository.java b/src/main/java/com/neo/tx/repository/specification/EventOutboxJpaRepository.java
new file mode 100644
index 0000000..cc48ee4
--- /dev/null
+++ b/src/main/java/com/neo/tx/repository/specification/EventOutboxJpaRepository.java
@@ -0,0 +1,10 @@
+package com.neo.tx.repository.specification;
+
+import com.neo.tx.model.OutboxEvent;
+import com.neo.tx.model.Validation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface EventOutboxJpaRepository extends JpaRepository, JpaSpecificationExecutor {
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/neo/tx/utility/emptiness b/src/main/java/com/neo/tx/utility/emptiness
new file mode 100644
index 0000000..e69de29
diff --git a/src/test/java/com/neo/tx/integration/AbstractIntegrationTest.java b/src/test/java/com/neo/tx/integration/IntegrationTestConfig.java
similarity index 59%
rename from src/test/java/com/neo/tx/integration/AbstractIntegrationTest.java
rename to src/test/java/com/neo/tx/integration/IntegrationTestConfig.java
index cdb7445..e4069be 100644
--- a/src/test/java/com/neo/tx/integration/AbstractIntegrationTest.java
+++ b/src/test/java/com/neo/tx/integration/IntegrationTestConfig.java
@@ -1,32 +1,47 @@
package com.neo.tx.integration;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
@SpringBootTest
-@Testcontainers
@ActiveProfiles("test")
+@AutoConfigureMockMvc
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class AbstractIntegrationTest {
+public abstract class IntegrationTestConfig {
+
+ @Autowired
+ JdbcTemplate jdbc;
+
+ @BeforeEach
+ void clean() {
+ jdbc.execute("TRUNCATE TABLE validation RESTART IDENTITY CASCADE");
+ jdbc.execute("TRUNCATE TABLE transaction RESTART IDENTITY CASCADE");
+ jdbc.execute("TRUNCATE TABLE event_outbox RESTART IDENTITY CASCADE");
+ }
- @Container
@SuppressWarnings("resource")
private static final PostgreSQLContainer> POSTGRES = new PostgreSQLContainer<>("postgres:17.7-alpine")
.withDatabaseName("test_transaction")
.withUsername("test_marshmallow")
.withPassword("test_tasty");
+ static {
+ POSTGRES.start();
+ }
@DynamicPropertySource
static void configureDataSource(DynamicPropertyRegistry registry) {
registry.add("spring.datasource.url", POSTGRES::getJdbcUrl);
registry.add("spring.datasource.username", POSTGRES::getUsername);
registry.add("spring.datasource.password", POSTGRES::getPassword);
+ registry.add("spring.liquibase.enabled", () -> "true");
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/com/neo/tx/integration/TransactionControllerTest.java b/src/test/java/com/neo/tx/integration/TransactionControllerTest.java
deleted file mode 100644
index a57ffc8..0000000
--- a/src/test/java/com/neo/tx/integration/TransactionControllerTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.neo.tx.integration;
-
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-
-@SpringBootTest
-@AutoConfigureMockMvc
-class TransactionControllerTest extends AbstractIntegrationTest {
-
- @Autowired
- private MockMvc mockMvc;
-
- @Test
- void shouldValidateTransaction() throws Exception {
- mockMvc.perform(MockMvcRequestBuilders.post("/v1/transactions/validate")
- .content("{}")
- .contentType(MediaType.APPLICATION_JSON))
- .andExpect(MockMvcResultMatchers.status().is4xxClientError());
- }
-}
diff --git a/src/test/java/com/neo/tx/integration/TransactionTest.java b/src/test/java/com/neo/tx/integration/TransactionTest.java
new file mode 100644
index 0000000..7f456d5
--- /dev/null
+++ b/src/test/java/com/neo/tx/integration/TransactionTest.java
@@ -0,0 +1,174 @@
+package com.neo.tx.integration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.neo.tx.dto.TransactionRequestDto;
+import com.neo.tx.dto.ValidationResponseDto;
+import com.neo.tx.enums.Decision;
+import com.neo.tx.enums.RiskLevel;
+import com.neo.tx.model.OutboxEvent;
+import com.neo.tx.model.Transaction;
+import com.neo.tx.model.Validation;
+import com.neo.tx.repository.TransactionJpaRepository;
+import com.neo.tx.repository.TransactionRepository;
+import com.neo.tx.repository.ValidationJpaRepository;
+import com.neo.tx.repository.ValidationRepository;
+import com.neo.tx.repository.specification.EventOutboxJpaRepository;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TransactionTest extends IntegrationTestConfig {
+
+ @Autowired
+ Utility utility;
+
+ @Autowired
+ MockMvc mvc;
+
+ @Autowired
+ ObjectMapper om;
+
+ @Autowired
+ TransactionJpaRepository transactionJpaRepository;
+
+ @Autowired
+ ValidationJpaRepository validationJpaRepository;
+
+ @Autowired
+ EventOutboxJpaRepository eventOutboxJpaRepository;
+
+ @MockitoSpyBean
+ ValidationRepository validationRepository;
+
+ @MockitoSpyBean
+ TransactionRepository transactionRepository;
+
+ @Test
+ @Transactional
+ public void shouldValidateTransaction() throws Exception {
+ String transactionInput = """
+ {
+ "externalId": 1,
+ "userId": "c1c3a7c0-1c3b-4a2b-9e5a-7b3c1b2a9f11",
+ "merchantId": "9a1d6f88-0f93-4e58-9dd7-1c9d4a7d6c22",
+ "deviceId": "android-13-pixel-7",
+ "amount": 7150.50,
+ "currency": "USD",
+ "initialized": 1735689600,
+ "merchantCategory": "GROCERIES",
+ "channel": "WEB",
+ "ipAddress": "192.168.1.10",
+ "country": "AGO",
+ "cardFingerprint": "fp_9d82kdk29d"
+ }
+ """;
+
+ ArgumentCaptor transactionCaptor = ArgumentCaptor.forClass(Transaction.class);
+ ArgumentCaptor validationCaptor = ArgumentCaptor.forClass(Validation.class);
+
+ MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post("/v1/transaction/validate")
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(transactionInput))
+ .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+ .andExpect(MockMvcResultMatchers.jsonPath("$.decision").exists())
+ .andReturn();
+
+ Mockito.verify(transactionRepository).save(transactionCaptor.capture());
+ Mockito.verify(validationRepository).save(validationCaptor.capture());
+
+ TransactionRequestDto transactionRequestDto = om.readValue(transactionInput, TransactionRequestDto.class);
+ ValidationResponseDto validationResponseDto = om.readValue(mvcResult.getResponse().getContentAsString(), ValidationResponseDto.class);
+ Validation savedValidation = validationCaptor.getValue();
+ Transaction savedTransaction = transactionCaptor.getValue();
+ List validations = validationJpaRepository.findAll();
+ List transactions = transactionJpaRepository.findAll();
+ Validation dbValidation = validations.get(0);
+ Transaction dbTransaction = transactions.get(0);
+ String[] expectedCodes = new String[]{"HIGH_AMOUNT", "HIGH_RISK_COUNTRY"};
+ Object[] gotValidationCodes = validationResponseDto.validationResults.stream().map((e) -> e.code).toArray();
+ Object[] dbValidationCodes = dbValidation.getTriggeredValidators().stream().map((e) -> e.code).toArray();
+
+ assertEquals(1, validations.size());
+ assertEquals(1, transactions.size());
+
+ assertEquals(dbValidation.getDecision(), savedValidation.getDecision());
+ assertEquals(dbValidation.getDecision(), validationResponseDto.decision);
+
+ assertEquals(dbValidation.getRiskLevel(), savedValidation.getRiskLevel());
+ assertEquals(dbValidation.getRiskLevel(), validationResponseDto.riskLevel);
+
+ assertEquals(dbValidation.getScore(), savedValidation.getScore());
+ assertEquals(dbValidation.getScore(), validationResponseDto.score);
+
+ assertEquals(transactionRequestDto.externalId, savedTransaction.getExternalId());
+ assertEquals(transactionRequestDto.externalId, dbTransaction.getExternalId());
+
+ assertEquals(validationResponseDto.transactionId, dbTransaction.getId());
+ assertEquals(validationResponseDto.transactionId, dbValidation.getTransaction().getId());
+
+ assertEquals(transactionRequestDto.cardFingerprint, savedTransaction.getCardFingerprint());
+ assertEquals(transactionRequestDto.merchantCategory, savedTransaction.getMerchantCategory());
+ assertEquals(transactionRequestDto.cardFingerprint, dbTransaction.getCardFingerprint());
+ assertEquals(transactionRequestDto.merchantCategory, dbTransaction.getMerchantCategory());
+
+ assertArrayEquals(expectedCodes, gotValidationCodes);
+ assertArrayEquals(expectedCodes, dbValidationCodes);
+
+ Mockito.verify(validationRepository, Mockito.times(1)).save(Mockito.any(Validation.class));
+ Mockito.verify(transactionRepository, Mockito.times(1)).save(Mockito.any(Transaction.class));
+ }
+
+ @Test
+ public void shouldThrowAnErrorBecauseOfInvalidInput() throws Exception {
+ String transactionInput = """
+ {
+ "externalId": 1,
+ "userId": "c1c3a7c0-1c3b-4a2b-9e5a-7b3c1b2a9f11",
+ "merchantId": "9a1d6f88-0f93-4e58-9dd7-1c9d4a7d6c22",
+ "deviceId": "android-13-pixel-7",
+ "amount": MANY,
+ "currency": "BUCKS",
+ "initialized": 1735689600,
+ "merchantCategory": "GROCERIES",
+ "channel": "WEB",
+ "ipAddress": "192.168.1.10",
+ "country": "CALIFORNIA",
+ "cardFingerprint": "fp_9d82kdk29d"
+ }
+ """;
+
+ mvc.perform(MockMvcRequestBuilders.post("/v1/transaction/validate")
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(transactionInput))
+ .andExpect(MockMvcResultMatchers.status().is4xxClientError());
+ }
+
+ @Test
+ public void shouldInsertEventInOutboxOnTransactionValidation() throws Exception {
+ utility.insertTransaction();
+
+ List events = eventOutboxJpaRepository.findAll();
+ OutboxEvent outboxEvent = events.get(0);
+
+ assertEquals(1, events.size());
+
+ System.out.println(outboxEvent);
+ Validation validation = om.readValue(outboxEvent.getPayload(), Validation.class);
+
+ assertEquals(Decision.REVIEW, validation.getDecision());
+ assertEquals(RiskLevel.MEDIUM, validation.getRiskLevel());
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/com/neo/tx/integration/Utility.java b/src/test/java/com/neo/tx/integration/Utility.java
new file mode 100644
index 0000000..faa7249
--- /dev/null
+++ b/src/test/java/com/neo/tx/integration/Utility.java
@@ -0,0 +1,45 @@
+package com.neo.tx.integration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.neo.tx.dto.TransactionRequestDto;
+import com.neo.tx.dto.ValidationResponseDto;
+import com.neo.tx.service.TransactionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+@Component
+public class Utility {
+
+ private static final AtomicLong EXTERNAL_ID = new AtomicLong(1);
+
+ @Autowired
+ private TransactionService transactionService;
+
+ @Autowired
+ private ObjectMapper om;
+
+ public ValidationResponseDto insertTransaction() throws Exception {
+ String formatted = String.format("""
+ {
+ "externalId": %d,
+ "userId": "c1c3a7c0-1c3b-4a2b-9e5a-7b3c1b2a9f11",
+ "merchantId": "9a1d6f88-0f93-4e58-9dd7-1c9d4a7d6c22",
+ "deviceId": "android-13-pixel-7",
+ "amount": 7150.50,
+ "currency": "USD",
+ "initialized": 1735689600,
+ "merchantCategory": "GROCERIES",
+ "channel": "WEB",
+ "ipAddress": "192.168.1.10",
+ "country": "AGO",
+ "cardFingerprint": "fp_9d82kdk29d"
+ }
+ """, EXTERNAL_ID.getAndIncrement());
+
+ TransactionRequestDto transactionRequestDto = om.readValue(formatted, TransactionRequestDto.class);
+
+ return transactionService.validateTransaction(transactionRequestDto, "default");
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/com/neo/tx/integration/ValidationTest.java b/src/test/java/com/neo/tx/integration/ValidationTest.java
new file mode 100644
index 0000000..2a476cf
--- /dev/null
+++ b/src/test/java/com/neo/tx/integration/ValidationTest.java
@@ -0,0 +1,105 @@
+package com.neo.tx.integration;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.neo.tx.dto.ValidationResponseDto;
+import com.neo.tx.enums.RiskLevel;
+import com.neo.tx.repository.TransactionJpaRepository;
+import com.neo.tx.repository.TransactionRepository;
+import com.neo.tx.repository.ValidationJpaRepository;
+import com.neo.tx.repository.ValidationRepository;
+import com.neo.tx.service.TransactionService;
+import com.neo.tx.service.ValidationService;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class ValidationTest extends IntegrationTestConfig {
+
+ @Autowired
+ Utility utility;
+
+ @Autowired
+ MockMvc mvc;
+
+ @Autowired
+ ObjectMapper om;
+
+ @Autowired
+ TransactionJpaRepository transactionJpaRepository;
+
+ @Autowired
+ ValidationJpaRepository validationJpaRepository;
+
+ @Autowired
+ TransactionService transactionService;
+
+ @Autowired
+ ValidationService validationService;
+
+ @MockitoSpyBean
+ ValidationRepository validationRepository;
+
+ @MockitoSpyBean
+ TransactionRepository transactionRepository;
+
+ @Test
+ @Transactional
+ public void shouldFindAndReturnValidationById() throws Exception {
+
+ System.out.println("transactionJpaRepository.findAll().size()");
+ System.out.println(transactionJpaRepository.findAll().size());
+ ValidationResponseDto validationResponseDto1 = utility.insertTransaction();
+
+ MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.get("/v1/validation/{id}", validationResponseDto1.id))
+ .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+ .andReturn();
+
+ ValidationResponseDto validationResponseDto = om.readValue(mvcResult.getResponse().getContentAsString(), ValidationResponseDto.class);
+
+ assertNotNull(validationResponseDto);
+ }
+
+ @Test
+ @Transactional
+ public void shouldThrowNotFoundExceptionAndReturnNotFoundResponse() throws Exception {
+ MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.get("/v1/validation/{id}", 1))
+ .andExpect(MockMvcResultMatchers.status().is4xxClientError())
+ .andReturn();
+
+ String expectedResponse = "{\"type\":\"about:blank\",\"title\":\"Validation not found\",\"status\":404,\"detail\":\"Validation with id [1] was not found\",\"instance\":\"/v1/validation/1\",\"code\":\"validation_not_found\",\"meta\":{}}";
+ assertEquals(expectedResponse, mvcResult.getResponse().getContentAsString());
+ }
+
+ @Test
+ @Transactional
+ public void shouldReturnListOfValidations() throws Exception {
+ utility.insertTransaction();
+ utility.insertTransaction();
+ utility.insertTransaction();
+
+ MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.get(
+ "/v1/validation?riskLevel={riskLevel}",
+ RiskLevel.MEDIUM
+ ))
+ .andExpect(MockMvcResultMatchers.status().is2xxSuccessful())
+ .andReturn();
+
+ JsonNode contentNode = om.readTree(mvcResult.getResponse().getContentAsString()).get("content");
+ ValidationResponseDto[] validationResponses = om.treeToValue(contentNode, ValidationResponseDto[].class);
+
+ assertEquals(3, validationResponses.length);
+
+ for (int i = 0; i < validationResponses.length; i++) {
+ assertEquals(RiskLevel.MEDIUM, validationResponses[i].riskLevel);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml
index b89727a..190368a 100644
--- a/src/test/resources/application-test.yaml
+++ b/src/test/resources/application-test.yaml
@@ -1,24 +1,40 @@
spring: # Spring config
- config: # config
- activate: # activate
- on-profile: test # on which profile (service run mode) this configuration should be loaded
+ config: # config
+ activate: # activate
+ on-profile: test # on which profile (service run mode) this configuration should be loaded
- jpa:
- hibernate:
- ddl-auto: update
- properties:
- hibernate.format_sql: true
- datasource:
- url: jdbc:postgresql://localhost:5432/test
- username: test
- password: test
- # URL and credentials are overridden dynamically from Testcontainers
+ jpa:
+ hibernate:
+ ddl-auto: update
+ properties:
+ hibernate.format_sql: true
+ show-sql: false
- test:
- database:
- replace: none # don't use in-memory DB
+ datasource: # URL and credentials are overridden dynamically from Testcontainers
+ url: jdbc:postgresql://localhost:5432/placeholder
+ username: placeholder
+ password: placeholder
-logging:
- level:
- root: WARN
- com.neo.tx: DEBUG
+ test:
+ database:
+ replace: none # don't use in-memory DB
+
+logging: # logging configuration (overrides logback logging levels)
+ level: # levels
+ root: WARN # default logging level for all unspecified loggers
+ com.neo.tx: WARN # minimum level for the application package (log.WARN(), log.WARN(), etc)
+ com.fasterxml.jackson: WARN # Jackson logs (JSON serialization/deserialization)
+ liquibase: WARN # Liquibase migration logs
+ org.hibernate.SQL: WARN # Hibernate SQL statement logging (prints SQL queries)
+ org.hibernate.orm.jdbc.bind: WARN # Hibernate parameter binding logger (shows bound values with TRACE)
+ org.springframework.web: WARN # Spring Web / MVC logs
+ org.springframework.web.servlet.DispatcherServlet: WARN # Specific logger for DispatcherServlet (main Spring MVC dispatcher. WARN prints request lifecycle messages)
+
+properties:
+ score.min: 0
+ score.max: 100
+ risk.threshold.low: 30
+ risk.threshold.medium: 70
+ risk.threshold.high: 100
+ kafka.consumer.enabled: false
+ kafka.consumer.validation.topic: transaction.validation.completed
\ No newline at end of file