This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 2275f9c30 FINERACT-1926: Enrich with external owner Loan transaction
adjust business event
2275f9c30 is described below
commit 2275f9c301b0df07b2e9fafa14ad158c1b08de97
Author: Adam Saghy <[email protected]>
AuthorDate: Tue Aug 15 15:19:35 2023 +0200
FINERACT-1926: Enrich with external owner Loan transaction adjust business
event
---
.../LoanTransactionAdjustmentDataV1Enricher.java | 46 +++++++++++
.../external/service/ExternalEventServiceTest.java | 88 ++++++++++++++++++++--
2 files changed, 127 insertions(+), 7 deletions(-)
diff --git
a/fineract-investor/src/main/java/org/apache/fineract/investor/enricher/LoanTransactionAdjustmentDataV1Enricher.java
b/fineract-investor/src/main/java/org/apache/fineract/investor/enricher/LoanTransactionAdjustmentDataV1Enricher.java
new file mode 100644
index 000000000..3ce77031c
--- /dev/null
+++
b/fineract-investor/src/main/java/org/apache/fineract/investor/enricher/LoanTransactionAdjustmentDataV1Enricher.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.investor.enricher;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.avro.loan.v1.LoanTransactionAdjustmentDataV1;
+import org.apache.fineract.infrastructure.core.service.DataEnricher;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class LoanTransactionAdjustmentDataV1Enricher implements
DataEnricher<LoanTransactionAdjustmentDataV1> {
+
+ private final LoanTransactionDataV1Enricher loanTransactionDataV1Enricher;
+
+ @Override
+ public boolean isDataTypeSupported(Class<LoanTransactionAdjustmentDataV1>
dataType) {
+ return
dataType.isAssignableFrom(LoanTransactionAdjustmentDataV1.class);
+ }
+
+ @Override
+ public void enrich(LoanTransactionAdjustmentDataV1 data) {
+ if (data.getTransactionToAdjust() != null) {
+
loanTransactionDataV1Enricher.enrich(data.getTransactionToAdjust());
+ }
+ if (data.getNewTransactionDetail() != null) {
+
loanTransactionDataV1Enricher.enrich(data.getNewTransactionDetail());
+ }
+ }
+}
diff --git
a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java
b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java
index 5c529d0a6..b89b0ca2a 100644
---
a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java
+++
b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java
@@ -32,7 +32,6 @@ import java.nio.ByteBuffer;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,6 +39,8 @@ import java.util.Optional;
import org.apache.fineract.avro.BulkMessageItemV1;
import org.apache.fineract.avro.generator.ByteBufferSerializable;
import org.apache.fineract.avro.loan.v1.LoanAccountDataV1;
+import org.apache.fineract.avro.loan.v1.LoanTransactionAdjustmentDataV1;
+import org.apache.fineract.avro.loan.v1.LoanTransactionDataV1;
import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
import org.apache.fineract.infrastructure.core.service.DataEnricherProcessor;
@@ -54,11 +55,14 @@ import
org.apache.fineract.infrastructure.event.external.service.serialization.s
import
org.apache.fineract.infrastructure.event.external.service.serialization.serializer.BusinessEventSerializerFactory;
import
org.apache.fineract.infrastructure.event.external.service.support.ByteBufferConverter;
import org.apache.fineract.investor.enricher.LoanAccountDataV1Enricher;
+import
org.apache.fineract.investor.enricher.LoanTransactionAdjustmentDataV1Enricher;
+import org.apache.fineract.investor.enricher.LoanTransactionDataV1Enricher;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
@@ -80,16 +84,23 @@ class ExternalEventServiceTest {
private BulkMessageItemFactory bulkMessageItemFactory;
@Mock
private EntityManager entityManager;
-
@Mock
private LoanAccountDataV1Enricher loanAccountDataV1Enricher;
+ @Mock
+ private LoanTransactionAdjustmentDataV1Enricher
loanTransactionAdjustmentDataV1Enricher;
+ @Mock
+ private LoanTransactionDataV1Enricher loanTransactionDataV1Enricher;
private ExternalEventService underTest;
@BeforeEach
public void setUp() {
-
lenient().when(loanAccountDataV1Enricher.isDataTypeSupported(any())).thenReturn(true);
- DataEnricherProcessor dataEnricherProcessor = new
DataEnricherProcessor(Optional.of(Arrays.asList(loanAccountDataV1Enricher)));
+
lenient().when(loanAccountDataV1Enricher.isDataTypeSupported(Mockito.eq(LoanAccountDataV1.class))).thenReturn(true);
+
lenient().when(loanTransactionDataV1Enricher.isDataTypeSupported(Mockito.eq(LoanTransactionDataV1.class))).thenReturn(true);
+
lenient().when(loanTransactionAdjustmentDataV1Enricher.isDataTypeSupported(Mockito.eq(LoanTransactionAdjustmentDataV1.class)))
+ .thenReturn(true);
+ DataEnricherProcessor dataEnricherProcessor = new
DataEnricherProcessor(
+ Optional.of(List.of(loanAccountDataV1Enricher,
loanTransactionAdjustmentDataV1Enricher, loanTransactionDataV1Enricher)));
underTest = new ExternalEventService(repository,
idempotencyKeyGenerator, serializerFactory, byteBufferConverter,
bulkMessageItemFactory, dataEnricherProcessor);
underTest.setEntityManager(entityManager);
@@ -123,7 +134,7 @@ class ExternalEventServiceTest {
}
@Test
- public void testPostEventShouldWorkWithRegularEvent() throws IOException {
+ public void testPostEventShouldWorkWithRegularEvent() {
// given
ArgumentCaptor<ExternalEvent> externalEventArgumentCaptor =
ArgumentCaptor.forClass(ExternalEvent.class);
@@ -182,7 +193,7 @@ class ExternalEventServiceTest {
}
@Test
- public void testPostEventShouldSaveEventCategory() throws IOException {
+ public void testPostEventShouldSaveEventCategory() {
// given
ArgumentCaptor<ExternalEvent> externalEventArgumentCaptor =
ArgumentCaptor.forClass(ExternalEvent.class);
String eventSchema =
"org.apache.fineract.avro.loan.v1.LoanAccountDataV1";
@@ -208,7 +219,7 @@ class ExternalEventServiceTest {
}
@Test
- public void testEventShouldSaveDatesInMilliSecondFormat() throws
IOException {
+ public void testEventShouldSaveDatesInMilliSecondFormat() {
// given
ArgumentCaptor<ExternalEvent> externalEventArgumentCaptor =
ArgumentCaptor.forClass(ExternalEvent.class);
String eventSchema =
"org.apache.fineract.avro.loan.v1.LoanAccountDataV1";
@@ -232,4 +243,67 @@ class ExternalEventServiceTest {
assertThat(externalEvent.getCreatedAt().isSupported(ChronoUnit.MILLIS)).isTrue();
}
+ @Test
+ public void testPostEventShouldWorkWithTransactionEvent() {
+ // given
+ ArgumentCaptor<ExternalEvent> externalEventArgumentCaptor =
ArgumentCaptor.forClass(ExternalEvent.class);
+
+ String eventSchema =
"org.apache.fineract.avro.loan.v1.LoanTransactionDataV1";
+ String eventType = "TestType";
+ String idempotencyKey = "key";
+ BusinessEvent event = mock(BusinessEvent.class);
+ BusinessEventSerializer eventSerializer =
mock(BusinessEventSerializer.class);
+ byte[] data = new byte[0];
+
+ given(event.getType()).willReturn(eventType);
+
given(idempotencyKeyGenerator.generate(event)).willReturn(idempotencyKey);
+ given(serializerFactory.create(event)).willReturn(eventSerializer);
+ LoanTransactionDataV1 loanTransactionData = new
LoanTransactionDataV1();
+ given(eventSerializer.getSupportedSchema()).will(invocation ->
LoanTransactionDataV1.class);
+
given(eventSerializer.toAvroDTO(event)).willReturn(loanTransactionData);
+
given(byteBufferConverter.convert(any(ByteBuffer.class))).willReturn(data);
+ // when
+ underTest.postEvent(event);
+ // then
+ verify(repository).save(externalEventArgumentCaptor.capture());
+
verify(loanTransactionDataV1Enricher).isDataTypeSupported(LoanTransactionDataV1.class);
+ verify(loanTransactionDataV1Enricher).enrich(loanTransactionData);
+ ExternalEvent externalEvent = externalEventArgumentCaptor.getValue();
+
assertThat(externalEvent.getIdempotencyKey()).isEqualTo(idempotencyKey);
+ assertThat(externalEvent.getData()).isEqualTo(data);
+ assertThat(externalEvent.getType()).isEqualTo(eventType);
+ assertThat(externalEvent.getSchema()).isEqualTo(eventSchema);
+ }
+
+ @Test
+ public void testPostEventShouldWorkWithTransactionAdjustEvent() {
+ // given
+ ArgumentCaptor<ExternalEvent> externalEventArgumentCaptor =
ArgumentCaptor.forClass(ExternalEvent.class);
+
+ String eventSchema =
"org.apache.fineract.avro.loan.v1.LoanTransactionAdjustmentDataV1";
+ String eventType = "TestType";
+ String idempotencyKey = "key";
+ BusinessEvent event = mock(BusinessEvent.class);
+ BusinessEventSerializer eventSerializer =
mock(BusinessEventSerializer.class);
+ byte[] data = new byte[0];
+
+ given(event.getType()).willReturn(eventType);
+
given(idempotencyKeyGenerator.generate(event)).willReturn(idempotencyKey);
+ given(serializerFactory.create(event)).willReturn(eventSerializer);
+ LoanTransactionAdjustmentDataV1 loanTransactionAdjustmentData = new
LoanTransactionAdjustmentDataV1();
+ given(eventSerializer.getSupportedSchema()).will(invocation ->
LoanTransactionAdjustmentDataV1.class);
+
given(eventSerializer.toAvroDTO(event)).willReturn(loanTransactionAdjustmentData);
+
given(byteBufferConverter.convert(any(ByteBuffer.class))).willReturn(data);
+ // when
+ underTest.postEvent(event);
+ // then
+ verify(repository).save(externalEventArgumentCaptor.capture());
+
verify(loanTransactionAdjustmentDataV1Enricher).isDataTypeSupported(LoanTransactionAdjustmentDataV1.class);
+
verify(loanTransactionAdjustmentDataV1Enricher).enrich(loanTransactionAdjustmentData);
+ ExternalEvent externalEvent = externalEventArgumentCaptor.getValue();
+
assertThat(externalEvent.getIdempotencyKey()).isEqualTo(idempotencyKey);
+ assertThat(externalEvent.getData()).isEqualTo(data);
+ assertThat(externalEvent.getType()).isEqualTo(eventType);
+ assertThat(externalEvent.getSchema()).isEqualTo(eventSchema);
+ }
}
