Skip to content

FINERACT-2455: WC - Amortization schedule endpoint refactor #5870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
budaidev wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

FINERACT-2455: WC - Amortization schedule endpoint refactor #5870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...java/org/apache/fineract/test/stepdef/loan/WorkingCapitalAmortizationScheduleStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,19 @@ private void verifyPaymentDetails(final DataTable dataTable) {
expected.get("expectedPaymentAmount"));
assertOptionalDecimal(assertions, p + "discountFactor", actual.getDiscountFactor(), expected.get("discountFactor"));
assertNullableDecimal(assertions, p + "npvValue", actual.getNpvValue(), expected.get("npvValue"));
assertNullableDecimal(assertions, p + "balance", actual.getBalance(), expected.get("balance"));
assertNullableDecimal(assertions, p + "expectedBalance", actual.getExpectedBalance(), expected.get("expectedBalance"));
assertNullableDecimal(assertions, p + "actualBalance", actual.getActualBalance(), expected.get("actualBalance"));
assertNullableDecimal(assertions, p + "expectedAmortizationAmount", actual.getExpectedAmortizationAmount(),
expected.get("expectedAmortizationAmount"));
assertNullableDecimal(assertions, p + "actualPaymentAmount", actual.getActualPaymentAmount(),
expected.get("actualPaymentAmount"));
assertNullableDecimal(assertions, p + "actualAmortizationAmount", actual.getActualAmortizationAmount(),
expected.get("actualAmortizationAmount"));
assertNullableDecimal(assertions, p + "incomeModification", actual.getIncomeModification(), expected.get("incomeModification"));
assertNullableDecimal(assertions, p + "deferredBalance", actual.getDeferredBalance(), expected.get("deferredBalance"));
assertNullableDecimal(assertions, p + "expectedDiscountFeeBalance", actual.getExpectedDiscountFeeBalance(),
expected.get("expectedDiscountFeeBalance"));
assertNullableDecimal(assertions, p + "actualDiscountFeeBalance", actual.getActualDiscountFeeBalance(),
expected.get("actualDiscountFeeBalance"));
}

assertions.assertAll();
Expand Down
6 changes: 4 additions & 2 deletions ...src/test/java/org/apache/fineract/test/stepdef/loan/WorkingCapitalLoanAccountStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2278,12 +2278,14 @@ private String extractWcScheduleCellValue(final String headerName, final Project
case "expectedPaymentAmount" -> asText(period.getExpectedPaymentAmount());
case "discountFactor" -> asText(period.getDiscountFactor());
case "npvValue" -> asText(period.getNpvValue());
case "balance" -> asText(period.getBalance());
case "expectedBalance" -> asText(period.getExpectedBalance());
case "actualBalance" -> asText(period.getActualBalance());
case "expectedAmortizationAmount" -> asText(period.getExpectedAmortizationAmount());
case "actualPaymentAmount" -> asText(period.getActualPaymentAmount());
case "actualAmortizationAmount" -> asText(period.getActualAmortizationAmount());
case "incomeModification" -> asText(period.getIncomeModification());
case "deferredBalance" -> asText(period.getDeferredBalance());
case "expectedDiscountFeeBalance" -> asText(period.getExpectedDiscountFeeBalance());
case "actualDiscountFeeBalance" -> asText(period.getActualDiscountFeeBalance());
default -> throw new IllegalStateException(String.format("Header name %s cannot be found", headerName));
};
}
Expand Down
1,242 changes: 621 additions & 621 deletions ...t-e2e-tests-runner/src/test/resources/features/WorkingCapitalAmortizationSchedule.feature
View file
Open in desktop

Large diffs are not rendered by default.

3,266 changes: 2,725 additions & 541 deletions fineract-e2e-tests-runner/src/test/resources/features/WorkingCapitalLoanRepayment.feature
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions ...act/portfolio/workingcapitalloan/calc/DefaultProjectedAmortizationScheduleCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.time.LocalDate;
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.organisation.monetary.data.CurrencyData;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
Expand All @@ -39,14 +40,14 @@ public ProjectedAmortizationScheduleModel generateModel(@NonNull final BigDecima
@NonNull final BigDecimal periodPaymentRate, final int npvDayCount, @NonNull final LocalDate expectedDisbursementDate,
@NonNull final MathContext mc, @NonNull final CurrencyData currency) {
return ProjectedAmortizationScheduleModel.generate(discountFeeAmount, netDisbursementAmount, totalPaymentValue, periodPaymentRate,
npvDayCount, expectedDisbursementDate, mc, currency);
npvDayCount, expectedDisbursementDate, mc, currency, DateUtils.getBusinessLocalDate());
}

@Override
@NonNull
public ProjectedAmortizationScheduleModel addDisbursement(@NonNull final ProjectedAmortizationScheduleModel model,
@NonNull final BigDecimal newDiscountAmount, @NonNull final BigDecimal newNetAmount, @NonNull final LocalDate newStartDate) {
return model.regenerate(newDiscountAmount, newNetAmount, newStartDate);
return model.regenerate(newDiscountAmount, newNetAmount, newStartDate, DateUtils.getBusinessLocalDate());
}

@Override
Expand Down
Loading
Loading