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
The following commit(s) were added to refs/heads/develop by this push:
new a6b69ec02 FINERACT-2081: Fix linked account validation
a6b69ec02 is described below
commit a6b69ec029fa96ff481dbc6839a851e3b8256493
Author: Adam Saghy <[email protected]>
AuthorDate: Mon Jun 10 12:48:19 2024 +0200
FINERACT-2081: Fix linked account validation
---
.../loanaccount/serialization/LoanApplicationValidator.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
index 6cb8c9222..19358daa8 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
@@ -1531,12 +1531,11 @@ public final class LoanApplicationValidator {
public void validateLinkedSavingsAccount(final JsonElement element,
DataValidatorBuilder baseDataValidator) {
final boolean linkedAccountIdWasProvided =
this.fromApiJsonHelper.parameterExists(LoanApiConstants.linkAccountIdParameterName,
element);
- if (linkedAccountIdWasProvided) {
- final Long linkAccountId =
this.fromApiJsonHelper.extractLongNamed(LoanApiConstants.linkAccountIdParameterName,
element);
-
baseDataValidator.reset().parameter(LoanApiConstants.linkAccountIdParameterName).value(linkAccountId).ignoreIfNull()
+ final Long linkedAccountId =
this.fromApiJsonHelper.extractLongNamed(LoanApiConstants.linkAccountIdParameterName,
element);
+ if (linkedAccountIdWasProvided && linkedAccountId != null) {
+
baseDataValidator.reset().parameter(LoanApiConstants.linkAccountIdParameterName).value(linkedAccountId).ignoreIfNull()
.longGreaterThanZero();
- final Long linkedAccountId =
this.fromApiJsonHelper.extractLongNamed(LoanApiConstants.linkAccountIdParameterName,
element);
final SavingsAccount savingsAccount =
savingsAccountRepository.findOneWithNotFoundDetection(linkedAccountId);
final Long clientId =
this.fromApiJsonHelper.extractLongNamed(LoanApiConstants.clientIdParameterName,
element);
if (savingsAccount.isNotActive()) {