This is an automated email from the ASF dual-hosted git repository. adamsaghy pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 18ce75b63b669f31804c3783abef4ab2288c66d4 Merge: 8ce8392e2c 8667cb2b02 Author: Adam Saghy <[email protected]> AuthorDate: Thu Oct 29 16:36:12 2026 +0000 Merge pull request #6759 from SolDevelo/FINERACT-3009 FINERACT-3009: Read Working Capital amounts with the request's locale ...WorkingCapitalLoanApplicationDataValidator.java | 34 ++-- .../WorkingCapitalLoanDataValidator.java | 38 ++--- .../service/WorkingCapitalLoanAssemblerImpl.java | 30 ++-- ...apitalLoanNearBreachActionWriteServiceImpl.java | 4 +- ...CapitalLoanRecoveryPaymentWriteServiceImpl.java | 3 +- ...WorkingCapitalLoanWritePlatformServiceImpl.java | 33 ++-- .../WorkingCapitalLoanProductDataValidator.java | 14 +- ...ngCapitalLoanDataValidatorAmountLocaleTest.java | 141 ++++++++++++++++ .../WorkingCapitalLoanAdjustByDeltaReplayTest.java | 3 +- ...CapitalLoanRecoveryPaymentWriteServiceTest.java | 3 +- .../FeignWorkingCapitalLoanAmountLocaleTest.java | 182 +++++++++++++++++++++ 11 files changed, 400 insertions(+), 85 deletions(-) diff --cc fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java index cd4be5482c,518d6cde6f..c963281925 --- a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java +++ b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/serialization/WorkingCapitalLoanDataValidator.java @@@ -603,11 -596,9 +601,11 @@@ public class WorkingCapitalLoanDataVali } final BigDecimal transactionAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(transactionAmount).notNull() .positiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, transactionAmount, currencyDigitsOf(loan)); if (transactionAmount != null && loan.getApprovedPrincipal() != null && transactionAmount.compareTo(loan.getApprovedPrincipal()) > 0) { baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName) @@@ -616,11 -607,9 +614,11 @@@ if (this.fromApiJsonHelper.parameterHasValue(WorkingCapitalLoanConstants.discountAmountParamName, element)) { final BigDecimal discountAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.discountAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.discountAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.discountAmountParamName).value(discountAmount).ignoreIfNull() .zeroOrPositiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.discountAmountParamName, discountAmount, currencyDigitsOf(loan)); // discountAmount must be >= 0 and <= approved discount (approval-time) discount final BigDecimal currentDiscount = loan.getLoanProductRelatedDetails() != null @@@ -816,11 -805,9 +814,11 @@@ // The amount is a signed delta on the transaction's amount. Zero would reverse and recreate the transaction // unchanged. - final BigDecimal delta = this.fromApiJsonHelper.extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, - element, new HashSet<>()); + final BigDecimal delta = this.fromApiJsonHelper + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(delta).notNull(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, delta, currencyDigitsOf(loan)); if (delta != null && delta.compareTo(BigDecimal.ZERO) == 0) { baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName) .failWithCode("zero.amount.not.supported"); @@@ -947,11 -934,9 +945,11 @@@ } final BigDecimal transactionAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(transactionAmount).notNull() .positiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, transactionAmount, currencyDigitsOf(loan)); validateClassificationIdExists(baseDataValidator, element); @@@ -1113,11 -1098,9 +1111,11 @@@ } final BigDecimal transactionAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(transactionAmount).notNull() .positiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, transactionAmount, currencyDigitsOf(loan)); final WorkingCapitalLoanBalance balance = loan.getBalance(); if (transactionAmount != null && balance != null) { @@@ -1208,11 -1191,9 +1206,11 @@@ } final BigDecimal transactionAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(transactionAmount).notNull() .positiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, transactionAmount, currencyDigitsOf(loan)); final Integer classificationId = this.fromApiJsonHelper .extractIntegerSansLocaleNamed(WorkingCapitalLoanConstants.classificationIdParamName, element); @@@ -1450,11 -1431,9 +1448,11 @@@ final LocalDate transactionDate = this.fromApiJsonHelper.extractLocalDateNamed(WorkingCapitalLoanConstants.transactionDateParamName, element); final BigDecimal transactionAmount = this.fromApiJsonHelper - .extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element, new HashSet<>()); + .extractBigDecimalWithLocaleNamed(WorkingCapitalLoanConstants.transactionAmountParamName, element); baseDataValidator.reset().parameter(WorkingCapitalLoanConstants.transactionAmountParamName).value(transactionAmount).notNull() .zeroOrPositiveAmount(); + WorkingCapitalAmountScaleValidator.validateNotFinerThanCurrency(baseDataValidator, + WorkingCapitalLoanConstants.transactionAmountParamName, transactionAmount, currencyDigitsOf(loan)); // Zero amount is undo: transactionDate is unused. A positive amount creates a replacement and requires a date. final boolean createsReplacement = MathUtil.isGreaterThanZero(transactionAmount);
