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

FINERACT-2232: Validations and cob step fix

Browse Source 
- Add validation for capitalized income transaction not being in the future
- CapitalizedIncomeAmortizationBusinessStep add filter against too early amortization
This commit is contained in:
adam.magyari
2025-06-02 13:22:02 +02:00
committed by Adam Saghy
parent 1aff3fc9b6
commit 5281c7b17d
4 changed files with 102 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-progressive-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/service/ProgressiveLoanTransactionValidatorImpl.java
+14 -1
View File
@@ -36,6 +36,7 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
import org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.infrastructure.core.service.MathUtil;
import org.apache.fineract.organisation.holiday.domain.Holiday;
import org.apache.fineract.organisation.workingdays.domain.WorkingDays;
@@ -108,6 +109,12 @@ public class ProgressiveLoanTransactionValidatorImpl implements ProgressiveLoanT
"Transaction date cannot be before disbursement date");
}
// Validate transaction date is not in the future
if (transactionDate != null && transactionDate.isAfter(DateUtils.getBusinessLocalDate())) {
baseDataValidator.reset().parameter("transactionDate").failWithCode("cannot.be.in.the.future",
"Transaction date cannot be in the future");
}
final BigDecimal transactionAmount = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed("transactionAmount", element);
baseDataValidator.reset().parameter("transactionAmount").value(transactionAmount).notNull().positiveAmount();
@@ -142,7 +149,7 @@ public class ProgressiveLoanTransactionValidatorImpl implements ProgressiveLoanT
final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, getCapitalizedIncomeAdjustmentParameters());
Validator.validateOrThrow("loan.capitalized.incomeAdjustment", baseDataValidator -> {
Validator.validateOrThrow("loan.capitalizedIncomeAdjustment", baseDataValidator -> {
final Loan loan = this.loanRepositoryWrapper.findOneWithNotFoundDetection(loanId, true);
validateLoanClientIsActive(loan);
validateLoanGroupIsActive(loan);
@@ -171,6 +178,12 @@ public class ProgressiveLoanTransactionValidatorImpl implements ProgressiveLoanT
"Transaction date cannot be before disbursement date");
}
// Validate transaction date is not in the future
if (transactionDate != null && transactionDate.isAfter(DateUtils.getBusinessLocalDate())) {
baseDataValidator.reset().parameter("transactionDate").failWithCode("cannot.be.in.the.future",
"Transaction date cannot be in the future");
}
final BigDecimal transactionAmount = this.fromApiJsonHelper.extractBigDecimalWithLocaleNamed("transactionAmount", element);
baseDataValidator.reset().parameter("transactionAmount").value(transactionAmount).notNull().positiveAmount();