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

FINERACT-1971: Payment type is not mandatory

Browse Source
This commit is contained in:
Adam Saghy
2024-02-20 08:28:46 +01:00
committed by Arnold Gálovics
parent 23e00ffec9
commit 8e991e1a36
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
+5 -13
View File
@@ -233,7 +233,7 @@ public final class LoanEventApiJsonValidator {
baseDataValidator.reset().parameter(LoanApiConstants.REVERSAL_EXTERNAL_ID_PARAMNAME).ignoreIfNull().value(reversalExternalId)
.notExceedingLengthOf(100);
validatePaymentDetails(baseDataValidator, element, false);
validatePaymentDetails(baseDataValidator, element);
throwExceptionIfValidationWarningsExist(dataValidationErrors);
}
@@ -263,7 +263,7 @@ public final class LoanEventApiJsonValidator {
final String note = this.fromApiJsonHelper.extractStringNamed(LoanApiConstants.noteParameterName, element);
baseDataValidator.reset().parameter(LoanApiConstants.noteParameterName).value(note).notExceedingLengthOf(1000);
validatePaymentDetails(baseDataValidator, element, true);
validatePaymentDetails(baseDataValidator, element);
throwExceptionIfValidationWarningsExist(dataValidationErrors);
}
@@ -313,19 +313,11 @@ public final class LoanEventApiJsonValidator {
}
private void validatePaymentDetails(final DataValidatorBuilder baseDataValidator, final JsonElement element) {
final boolean paymentDetailRequired = false; // Default value for backward compatibility
validatePaymentDetails(baseDataValidator, element, paymentDetailRequired);
}
private void validatePaymentDetails(final DataValidatorBuilder baseDataValidator, final JsonElement element,
final boolean paymentDetailRequired) {
// Validate all string payment detail fields for max length
final Integer paymentTypeId = this.fromApiJsonHelper.extractIntegerWithLocaleNamed("paymentTypeId", element);
if (paymentDetailRequired) {
baseDataValidator.reset().parameter("paymentTypeId").value(paymentTypeId).notNull().integerGreaterThanZero();
} else {
baseDataValidator.reset().parameter("paymentTypeId").value(paymentTypeId).ignoreIfNull().integerGreaterThanZero();
}
baseDataValidator.reset().parameter("paymentTypeId").value(paymentTypeId).ignoreIfNull().integerGreaterThanZero();
final Set<String> paymentDetailParameters = new HashSet<>(
Arrays.asList("accountNumber", "checkNumber", "routingCode", "receiptNumber", "bankNumber"));
for (final String paymentDetailParameterName : paymentDetailParameters) {
integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java
+1 -1
View File
@@ -201,7 +201,7 @@ public class LoanChargebackOnPaymentTypeRepaymentTransactionsTest {
// chargeback on Merchant Issued Refund Transaction
chargebackTransactionResponse = loanTransactionHelper.chargebackLoanTransaction(loanExternalIdStr,
merchantIssuedRefund_1.getResourceId(),
new PostLoansLoanIdTransactionsTransactionIdRequest().locale("en").transactionAmount(100.0).paymentTypeId(1L));
new PostLoansLoanIdTransactionsTransactionIdRequest().locale("en").transactionAmount(100.0));
// verify transaction relation and outstanding balance
assertNotNull(chargebackTransactionResponse);