CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-2326: Delinquent section in loan details using associations

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2025-09-02 20:21:13 +02:00
committed by Arnold Gálovics
parent 937bfe529c
commit 9ba17bf79a
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/messaging/event/EventCheckHelper.java
+1 -1
View File
@@ -499,7 +499,7 @@ public class EventCheckHelper {
} }
public void loanAccountDelinquencyPauseChangedBusinessEventCheck(Long loanId) throws IOException { public void loanAccountDelinquencyPauseChangedBusinessEventCheck(Long loanId) throws IOException {
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "all", "", "").execute();
List<GetLoansLoanIdDelinquencyPausePeriod> delinquencyPausePeriodsActual = loanDetails.body().getDelinquent() List<GetLoansLoanIdDelinquencyPausePeriod> delinquencyPausePeriodsActual = loanDetails.body().getDelinquent()
.getDelinquencyPausePeriods(); .getDelinquencyPausePeriods();
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java
+9 -9
View File
@@ -94,7 +94,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
Integer loanStatus = loanDetails.body().getStatus().getId(); Integer loanStatus = loanDetails.body().getStatus().getId();
@@ -517,7 +517,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
List<GetLoansLoanIdLoanInstallmentLevelDelinquency> installmentLevelDelinquency = loanDetails.body().getDelinquent() List<GetLoansLoanIdLoanInstallmentLevelDelinquency> installmentLevelDelinquency = loanDetails.body().getDelinquent()
.getInstallmentLevelDelinquency() == null ? null : loanDetails.body().getDelinquent().getInstallmentLevelDelinquency(); .getInstallmentLevelDelinquency() == null ? null : loanDetails.body().getDelinquent().getInstallmentLevelDelinquency();
@@ -534,7 +534,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
String expectedDelinquencyRangeValue = expectedDelinquencyRange.getValue(); String expectedDelinquencyRangeValue = expectedDelinquencyRange.getValue();
expectedValuesList.set(0, expectedDelinquencyRangeValue); expectedValuesList.set(0, expectedDelinquencyRangeValue);
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
String actualDelinquencyRangeValue = loanDetails.body().getDelinquencyRange() == null ? "NO_DELINQUENCY" String actualDelinquencyRangeValue = loanDetails.body().getDelinquencyRange() == null ? "NO_DELINQUENCY"
: loanDetails.body().getDelinquencyRange().getClassification(); : loanDetails.body().getDelinquencyRange().getClassification();
@@ -559,7 +559,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
String expectedDelinquencyRangeValue = expectedDelinquencyRange.getValue(); String expectedDelinquencyRangeValue = expectedDelinquencyRange.getValue();
expectedValuesList.set(0, expectedDelinquencyRangeValue); expectedValuesList.set(0, expectedDelinquencyRangeValue);
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
String actualDelinquencyRangeValue = loanDetails.body().getDelinquencyRange() == null ? "NO_DELINQUENCY" String actualDelinquencyRangeValue = loanDetails.body().getDelinquencyRange() == null ? "NO_DELINQUENCY"
@@ -581,7 +581,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
List<GetLoansLoanIdLoanInstallmentLevelDelinquency> installmentLevelDelinquency = loanDetails.body().getDelinquent() List<GetLoansLoanIdLoanInstallmentLevelDelinquency> installmentLevelDelinquency = loanDetails.body().getDelinquent()
.getInstallmentLevelDelinquency(); .getInstallmentLevelDelinquency();
@@ -612,7 +612,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
List<List<String>> expectedData = table.asLists(); List<List<String>> expectedData = table.asLists();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
List<GetLoansLoanIdDelinquencyPausePeriod> delinquencyPausePeriods = loanDetails.body().getDelinquent() List<GetLoansLoanIdDelinquencyPausePeriod> delinquencyPausePeriods = loanDetails.body().getDelinquent()
@@ -639,7 +639,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
String actualDate = FORMATTER.format(loanDetails.body().getDelinquent().getNextPaymentDueDate()); String actualDate = FORMATTER.format(loanDetails.body().getDelinquent().getNextPaymentDueDate());
@@ -669,7 +669,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
DelinquencyRangeData delinquencyRange = loanDetails.body().getDelinquencyRange(); DelinquencyRangeData delinquencyRange = loanDetails.body().getDelinquencyRange();
GetLoansLoanIdDelinquencySummary delinquent = loanDetails.body().getDelinquent(); GetLoansLoanIdDelinquencySummary delinquent = loanDetails.body().getDelinquent();
@@ -741,7 +741,7 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanResponse.body().getLoanId(); long loanId = loanResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
Double expectedLastRepaymentAmount1 = Double.valueOf(expectedLastRepaymentAmount); Double expectedLastRepaymentAmount1 = Double.valueOf(expectedLastRepaymentAmount);
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java
+2 -2
View File
@@ -2210,7 +2210,7 @@ public class LoanStepDef extends AbstractStepDef {
Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE); Response<PostLoansResponse> loanCreateResponse = testContext().get(TestContextKey.LOAN_CREATE_RESPONSE);
long loanId = loanCreateResponse.body().getLoanId(); long loanId = loanCreateResponse.body().getLoanId();
Response<GetLoansLoanIdResponse> loanDetailsResponse = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); Response<GetLoansLoanIdResponse> loanDetailsResponse = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse); ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
testContext().set(TestContextKey.LOAN_RESPONSE, loanDetailsResponse); testContext().set(TestContextKey.LOAN_RESPONSE, loanDetailsResponse);
@@ -3299,7 +3299,7 @@ public class LoanStepDef extends AbstractStepDef {
assert loanResponse.body() != null; assert loanResponse.body() != null;
final long loanId = loanResponse.body().getLoanId(); final long loanId = loanResponse.body().getLoanId();
final Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "", "", "").execute(); final Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "collection", "", "").execute();
ErrorHelper.checkSuccessfulApiCall(loanDetails); ErrorHelper.checkSuccessfulApiCall(loanDetails);
assert loanDetails.body() != null; assert loanDetails.body() != null;
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java
+6 -1
View File
@@ -1037,7 +1037,7 @@ public class LoansApiResource {
List<LoanTermVariationsData> loanTermVariations = null; List<LoanTermVariationsData> loanTermVariations = null;
Collection<LoanCollateralResponseData> loanCollateralManagements; Collection<LoanCollateralResponseData> loanCollateralManagements;
Collection<LoanCollateralManagementData> loanCollateralManagementData = new ArrayList<>(); Collection<LoanCollateralManagementData> loanCollateralManagementData = new ArrayList<>();
CollectionData collectionData = this.delinquencyReadPlatformService.calculateLoanCollectionData(resolvedLoanId); CollectionData collectionData = null;
final Set<String> mandatoryResponseParameters = new HashSet<>(); final Set<String> mandatoryResponseParameters = new HashSet<>();
final Set<String> associationParameters = ApiParameterHelper.extractAssociationsForResponseIfProvided(uriInfo.getQueryParameters()); final Set<String> associationParameters = ApiParameterHelper.extractAssociationsForResponseIfProvided(uriInfo.getQueryParameters());
@@ -1062,6 +1062,11 @@ public class LoansApiResource {
} }
} }
if (associationParameters.contains(DataTableApiConstant.collectionAssociateParamName)) {
mandatoryResponseParameters.add(DataTableApiConstant.collectionAssociateParamName);
collectionData = this.delinquencyReadPlatformService.calculateLoanCollectionData(resolvedLoanId);
}
if (associationParameters.contains(DataTableApiConstant.transactionsAssociateParamName)) { if (associationParameters.contains(DataTableApiConstant.transactionsAssociateParamName)) {
mandatoryResponseParameters.add(DataTableApiConstant.transactionsAssociateParamName); mandatoryResponseParameters.add(DataTableApiConstant.transactionsAssociateParamName);
loanRepayments = this.loanReadPlatformService.retrieveLoanTransactions(resolvedLoanId); loanRepayments = this.loanReadPlatformService.retrieveLoanTransactions(resolvedLoanId);