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

FINERACT-2181: fix api double values in loan definitions

Browse Source
This commit is contained in:
mark.vituska
2025-05-27 10:02:25 +02:00
committed by Adam Saghy
parent a40c0d4703
commit c89ec910d8
65 changed files with 1669 additions and 3133 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
+2 -2
View File
@@ -420,8 +420,8 @@ public class EventCheckHelper {
.getGlobalConfiguration("outstanding-interest-calculation-strategy-for-external-asset-transfer");
if ("PAYABLE_OUTSTANDING_INTEREST".equals(outstandingInterestStrategy.getStringValue())) {
Response<GetLoansLoanIdResponse> loanDetails = loansApi.retrieveLoan(loanId, false, "all", null, null).execute();
totalOutstandingBalanceAmountExpected = loanDetails.body().getSummary().getTotalOutstanding();
outstandingInterestPortionExpected = loanDetails.body().getSummary().getInterestOutstanding();
totalOutstandingBalanceAmountExpected = zeroConversion(loanDetails.body().getSummary().getTotalOutstanding());
outstandingInterestPortionExpected = zeroConversion(loanDetails.body().getSummary().getInterestOutstanding());
}
String ownerExternalIdExpected = filtered.getStatus().getValue().equals("BUYBACK") ? null : filtered.getOwner().getExternalId();
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanDelinquencyStepDef.java
+4 -1
View File
@@ -59,6 +59,7 @@ import org.apache.fineract.test.data.LoanStatus;
import org.apache.fineract.test.helper.ErrorHelper;
import org.apache.fineract.test.helper.ErrorMessageHelper;
import org.apache.fineract.test.helper.ErrorResponse;
import org.apache.fineract.test.helper.Utils;
import org.apache.fineract.test.messaging.EventAssertion;
import org.apache.fineract.test.messaging.event.EventCheckHelper;
import org.apache.fineract.test.messaging.event.loan.delinquency.LoanDelinquencyRangeChangeEvent;
@@ -538,7 +539,9 @@ public class LoanDelinquencyStepDef extends AbstractStepDef {
String actualDelinquencyRangeValue = loanDetails.body().getDelinquencyRange() == null ? "NO_DELINQUENCY"
: loanDetails.body().getDelinquencyRange().getClassification();
GetLoansLoanIdDelinquencySummary delinquent = loanDetails.body().getDelinquent();
List<String> actualValuesList = List.of(actualDelinquencyRangeValue, delinquent.getDelinquentAmount().toString(),
String delinquentAmount = delinquent.getDelinquentAmount() == null ? null
: new Utils.DoubleFormatter(delinquent.getDelinquentAmount().doubleValue()).format();
List<String> actualValuesList = List.of(actualDelinquencyRangeValue, delinquentAmount,
delinquent.getDelinquentDate() == null ? "null" : FORMATTER.format(delinquent.getDelinquentDate()),
delinquent.getDelinquentDays().toString(), delinquent.getPastDueDays().toString());
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java
+12 -7
View File
@@ -1121,9 +1121,11 @@ public class LoanStepDef extends AbstractStepDef {
ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
GetLoansLoanIdDelinquencySummary delinquent = loanDetailsResponse.body().getDelinquent();
String lastPaymentAmountActual = new Utils.DoubleFormatter(delinquent.getLastPaymentAmount().doubleValue()).format();
String lastPaymentAmountActual = delinquent.getLastPaymentAmount() == null ? null
: new Utils.DoubleFormatter(delinquent.getLastPaymentAmount().doubleValue()).format();
String lastPaymentDateActual = FORMATTER.format(delinquent.getLastPaymentDate());
String lastRepaymentAmountActual = new Utils.DoubleFormatter(delinquent.getLastRepaymentAmount().doubleValue()).format();
String lastRepaymentAmountActual = delinquent.getLastRepaymentAmount() == null ? null
: new Utils.DoubleFormatter(delinquent.getLastRepaymentAmount().doubleValue()).format();
String lastRepaymentDateActual = FORMATTER.format(delinquent.getLastRepaymentDate());
assertThat(lastPaymentAmountActual)
@@ -1163,7 +1165,8 @@ public class LoanStepDef extends AbstractStepDef {
String amountEventActual = loanChargePaidByListEvent.get(i).getAmount().setScale(1, RoundingMode.HALF_DOWN).toString();
String nameEventActual = loanChargePaidByListEvent.get(i).getName();
String amountActual = String.valueOf(loanChargePaidByList.get(i).getAmount());
String amountActual = loanChargePaidByList.get(i).getAmount() == null ? null
: new Utils.DoubleFormatter(loanChargePaidByList.get(i).getAmount().doubleValue()).format();
String nameActual = loanChargePaidByList.get(i).getName();
String amountExpected = data.get(i + 1).get(0);
@@ -2682,9 +2685,11 @@ public class LoanStepDef extends AbstractStepDef {
ErrorHelper.checkSuccessfulApiCall(loanDetailsResponse);
GetLoansLoanIdDelinquencySummary delinquent = loanDetailsResponse.body().getDelinquent();
String lastPaymentAmountActual = new Utils.DoubleFormatter(delinquent.getLastPaymentAmount().doubleValue()).format();
String lastPaymentAmountActual = delinquent.getLastPaymentAmount() == null ? null
: new Utils.DoubleFormatter(delinquent.getLastPaymentAmount().doubleValue()).format();
String lastPaymentDateActual = FORMATTER.format(delinquent.getLastPaymentDate());
String lastRepaymentAmountActual = new Utils.DoubleFormatter(delinquent.getLastRepaymentAmount().doubleValue()).format();
String lastRepaymentAmountActual = delinquent.getLastRepaymentAmount() == null ? null
: new Utils.DoubleFormatter(delinquent.getLastRepaymentAmount().doubleValue()).format();
String lastRepaymentDateActual = FORMATTER.format(delinquent.getLastRepaymentDate());
assertThat(lastPaymentAmountActual)
@@ -3857,8 +3862,8 @@ public class LoanStepDef extends AbstractStepDef {
actualValues.add(emiVariation.getTermType().getValue() == null ? null : emiVariation.getTermType().getValue());
case "Applicable From" -> actualValues.add(emiVariation.getTermVariationApplicableFrom() == null ? null
: FORMATTER.format(emiVariation.getTermVariationApplicableFrom()));
case "Decimal Value" ->
actualValues.add(emiVariation.getDecimalValue() == null ? null : new Utils.DoubleFormatter(emiVariation.getDecimalValue().doubleValue()).format());
case "Decimal Value" -> actualValues.add(emiVariation.getDecimalValue() == null ? null
: new Utils.DoubleFormatter(emiVariation.getDecimalValue().doubleValue()).format());
case "Date Value" ->
actualValues.add(emiVariation.getDateValue() == null ? null : FORMATTER.format(emiVariation.getDateValue()));
case "Is Specific To Installment" -> actualValues.add(String.valueOf(emiVariation.getIsSpecificToInstallment()));