diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java index b7b4f5071..e167596b8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java @@ -844,7 +844,9 @@ public class LoansApiResource { Collection loanCollateralManagements; Collection loanCollateralManagementData = new ArrayList<>(); CollectionData collectionData = CollectionData.template(); - + if (loanBasicDetails.isActive()) { + collectionData = this.delinquencyReadPlatformService.calculateLoanCollectionData(resolvedLoanId); + } final Set mandatoryResponseParameters = new HashSet<>(); final Set associationParameters = ApiParameterHelper.extractAssociationsForResponseIfProvided(uriInfo.getQueryParameters()); final Collection currentLoanRepayments = this.loanReadPlatformService.retrieveLoanTransactions(resolvedLoanId); @@ -948,13 +950,6 @@ public class LoansApiResource { mandatoryResponseParameters.add(DataTableApiConstant.linkedAccountAssociateParamName); linkedAccount = this.accountAssociationsReadPlatformService.retriveLoanLinkedAssociation(resolvedLoanId); } - - if (associationParameters.contains(DataTableApiConstant.collectionAssociateParamName)) { - mandatoryResponseParameters.add(DataTableApiConstant.collectionAssociateParamName); - if (loanBasicDetails.isActive()) { - collectionData = this.delinquencyReadPlatformService.calculateLoanCollectionData(resolvedLoanId); - } - } } Collection productOptions = null;