From 22a3ca4fd8c0247b58d6815316d1b11a8deb0c6c Mon Sep 17 00:00:00 2001 From: taskain7 Date: Fri, 9 Jun 2023 02:54:35 +0200 Subject: [PATCH] [FINERACT-1724] currency data in LoanAccountDataV1 --- .../serializer/loan/LoanBusinessEventSerializer.java | 2 ++ .../portfolio/loanaccount/data/LoanSummaryData.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java index 25dbe7eb8..2ed15944a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java @@ -71,6 +71,8 @@ public class LoanBusinessEventSerializer implements BusinessEventSerializer { if (data.getSummary() != null) { final Collection currentLoanTransactions = service.retrieveLoanTransactions(loanId); data.setSummary(LoanSummaryData.withTransactionAmountsSummary(data.getSummary(), currentLoanTransactions)); + } else { + data.setSummary(LoanSummaryData.withOnlyCurrencyData(data.getCurrency())); } return mapper.map(data); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java index ae47a1ed0..f0c8197f2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanSummaryData.java @@ -208,6 +208,12 @@ public class LoanSummaryData { .setTotalRepaymentTransactionReversed(totalRepaymentTransactionReversed); } + public static LoanSummaryData withOnlyCurrencyData(CurrencyData currencyData) { + return new LoanSummaryData(currencyData, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null); + } + private static BigDecimal computeTotalAmountForReversedTransactions(LoanTransactionType transactionType, Collection loanTransactions) { return loanTransactions.stream().filter(