diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanAdjustTransactionBusinessEventSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanAdjustTransactionBusinessEventSerializer.java index 4183a90f7..25052c0a4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanAdjustTransactionBusinessEventSerializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanAdjustTransactionBusinessEventSerializer.java @@ -29,6 +29,7 @@ import org.apache.fineract.infrastructure.event.external.service.serialization.m import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.AbstractBusinessEventSerializer; import org.apache.fineract.portfolio.loanaccount.data.LoanTransactionData; import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction; +import org.apache.fineract.portfolio.loanaccount.service.LoanChargePaidByReadPlatformService; import org.apache.fineract.portfolio.loanaccount.service.LoanReadPlatformService; import org.springframework.stereotype.Component; @@ -38,6 +39,7 @@ public class LoanAdjustTransactionBusinessEventSerializer extends AbstractBusine private final LoanReadPlatformService service; private final LoanTransactionDataMapper mapper; + private final LoanChargePaidByReadPlatformService loanChargePaidByReadPlatformService; @Override public boolean canSerialize(BusinessEvent event) { @@ -50,6 +52,8 @@ public class LoanAdjustTransactionBusinessEventSerializer extends AbstractBusine LoanTransaction transactionToAdjust = event.get().getTransactionToAdjust(); LoanTransactionData transactionToAdjustData = service.retrieveLoanTransaction(transactionToAdjust.getLoan().getId(), transactionToAdjust.getId()); + transactionToAdjustData.setLoanChargePaidByList( + loanChargePaidByReadPlatformService.getLoanChargesPaidByTransactionId(transactionToAdjust.getId())); LoanTransactionDataV1 transactionToAdjustAvroDto = mapper.map(transactionToAdjustData); LoanTransaction newTransactionDetail = event.get().getNewTransactionDetail(); @@ -57,6 +61,8 @@ public class LoanAdjustTransactionBusinessEventSerializer extends AbstractBusine if (newTransactionDetail != null) { LoanTransactionData newTransactionDetailData = service.retrieveLoanTransaction(newTransactionDetail.getLoan().getId(), newTransactionDetail.getId()); + newTransactionDetailData.setLoanChargePaidByList( + loanChargePaidByReadPlatformService.getLoanChargesPaidByTransactionId(newTransactionDetail.getId())); newTransactionDetailAvroDto = mapper.map(newTransactionDetailData); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanTransactionBusinessEventSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanTransactionBusinessEventSerializer.java index 599565d23..ef5e26ab2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanTransactionBusinessEventSerializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanTransactionBusinessEventSerializer.java @@ -27,6 +27,7 @@ import org.apache.fineract.infrastructure.event.business.domain.loan.transaction import org.apache.fineract.infrastructure.event.external.service.serialization.mapper.loan.LoanTransactionDataMapper; import org.apache.fineract.infrastructure.event.external.service.serialization.serializer.AbstractBusinessEventSerializer; import org.apache.fineract.portfolio.loanaccount.data.LoanTransactionData; +import org.apache.fineract.portfolio.loanaccount.service.LoanChargePaidByReadPlatformService; import org.apache.fineract.portfolio.loanaccount.service.LoanReadPlatformService; import org.springframework.stereotype.Component; @@ -36,6 +37,7 @@ public class LoanTransactionBusinessEventSerializer extends AbstractBusinessEven private final LoanReadPlatformService service; private final LoanTransactionDataMapper loanTransactionMapper; + private final LoanChargePaidByReadPlatformService loanChargePaidByReadPlatformService; @Override public boolean canSerialize(BusinessEvent event) { @@ -48,6 +50,7 @@ public class LoanTransactionBusinessEventSerializer extends AbstractBusinessEven Long loanId = event.get().getLoan().getId(); Long loanTransactionId = event.get().getId(); LoanTransactionData transactionData = service.retrieveLoanTransaction(loanId, loanTransactionId); + transactionData.setLoanChargePaidByList(loanChargePaidByReadPlatformService.getLoanChargesPaidByTransactionId(loanTransactionId)); return loanTransactionMapper.map(transactionData); }