From fe0a519247b0047766050ada0e65e77a22fb4ff7 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Fri, 29 Nov 2013 18:32:35 +0530 Subject: [PATCH 1/2] Corrected validation for borrower cycle --- .../loanproduct/serialization/LoanProductDataValidator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java index 4daf2129e..cc6e4bd86 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java @@ -1007,6 +1007,9 @@ public final class LoanProductDataValidator { LoanProductValueConditionType.GRETERTHAN.getValue()); if (lastConditionType.equals(LoanProductValueConditionType.EQUAL) && conditionType.equals(LoanProductValueConditionType.GRETERTHAN)) { + if(lastCycleNumber == 0){ + lastCycleNumber = 1; + } baseDataValidator.reset().parameter(cycleNumbersParamName).value(cycleNumber).notNull() .integerSameAsNumber(lastCycleNumber); } else if (lastConditionType.equals(LoanProductValueConditionType.EQUAL)) { From 9ffbef4994d55fad3c4d3adbe3292e5b069dc803 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Fri, 29 Nov 2013 18:49:39 +0530 Subject: [PATCH 2/2] added validation for borrower cycle to start with equal --- .../portfolio/loanproduct/LoanProductConstants.java | 3 ++- .../loanproduct/serialization/LoanProductDataValidator.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java index 3111fc9f2..2452bc8b5 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java @@ -47,5 +47,6 @@ public interface LoanProductConstants { public static final String minNumberOfRepayments = "minNumberOfRepayments"; public static final String maxNumberOfRepayments = "maxNumberOfRepayments"; - public static final String VALUE_CONDITION_TYPE_ERROR = "condition.type.must.end.with.greterthan"; + public static final String VALUE_CONDITION_END_WITH_ERROR = "condition.type.must.end.with.greterthan"; + public static final String VALUE_CONDITION_START_WITH_ERROR = "condition.type.must.start.with.equal"; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java index cc6e4bd86..b0bb1c0bc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java @@ -1008,6 +1008,7 @@ public final class LoanProductDataValidator { if (lastConditionType.equals(LoanProductValueConditionType.EQUAL) && conditionType.equals(LoanProductValueConditionType.GRETERTHAN)) { if(lastCycleNumber == 0){ + baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_START_WITH_ERROR); lastCycleNumber = 1; } baseDataValidator.reset().parameter(cycleNumbersParamName).value(cycleNumber).notNull() @@ -1028,7 +1029,7 @@ public final class LoanProductDataValidator { i++; } while (i < variationArray.size()); if(!lastConditionType.equals(LoanProductValueConditionType.GRETERTHAN)){ - baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_TYPE_ERROR); + baseDataValidator.reset().parameter(cycleNumbersParamName).failWithCode(LoanProductConstants.VALUE_CONDITION_END_WITH_ERROR); } }