Skip to content
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

FINERACT-1971: Payment type is not mandatory #3759

Merged
merged 1 commit into from
Feb 20, 2024
Merged

FINERACT-1971: Payment type is not mandatory #3759

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
18 changes: 5 additions & 13 deletions ...va/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public void validateTransaction(final String json) {
baseDataValidator.reset().parameter(LoanApiConstants.REVERSAL_EXTERNAL_ID_PARAMNAME).ignoreIfNull().value(reversalExternalId)
.notExceedingLengthOf(100);

validatePaymentDetails(baseDataValidator, element, false);
validatePaymentDetails(baseDataValidator, element);
throwExceptionIfValidationWarningsExist(dataValidationErrors);
}

Expand Down Expand Up @@ -263,7 +263,7 @@ public void validateChargebackTransaction(final String json) {
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);
}

Expand Down Expand Up @@ -313,19 +313,11 @@ public void validateRepaymentDateWithMeetingDate(final LocalDate repaymentDate,
}

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) {
Expand Down
2 changes: 1 addition & 1 deletion ...pache/fineract/integrationtests/LoanChargebackOnPaymentTypeRepaymentTransactionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void loanTransactionChargebackForPaymentTypeRepaymentTransactionTest(Loan
// 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);
Expand Down