FINERACT-671 loan charge specific due date fix

swagatikapanda123 · Dec 19, 2018 · 37b61d1 · 37b61d1
1 parent b3c36f1
commit 37b61d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...t-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/...t-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -134,6 +134,11 @@ public class LoanCharge extends AbstractPersistableCustom<Long> {
 
     public static LoanCharge createNewFromJson(final Loan loan, final Charge chargeDefinition, final JsonCommand command) {
         final LocalDate dueDate = command.localDateValueOfParameterNamed("dueDate");
+        if (dueDate == null) {
+            final String defaultUserMessage = "Loan charge is missing due date.";
+            throw new LoanChargeWithoutMandatoryFieldException("loanCharge", "dueDate", defaultUserMessage, chargeDefinition.getId(),
+                    chargeDefinition.getName());
+        }
         return createNewFromJson(loan, chargeDefinition, command, dueDate);
     }
 

diff --git a/...va/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java b/...va/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
@@ -248,7 +248,8 @@ public void validateAddLoanCharge(final String json) {
         baseDataValidator.reset().parameter("amount").value(amount).notNull().positiveAmount();
 
         if (this.fromApiJsonHelper.parameterExists("dueDate", element)) {
-            this.fromApiJsonHelper.extractLocalDateNamed("dueDate", element);
+        	final LocalDate dueDate = this.fromApiJsonHelper.extractLocalDateNamed("dueDate", element);
+            baseDataValidator.reset().parameter("dueDate").value(dueDate).notBlank();
         }
 
         throwExceptionIfValidationWarningsExist(dataValidationErrors);