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

MIFOSX-757: fix issue with vaidation on chargeTimeType

Browse Source
This commit is contained in:
Keith Woodlock
2013-10-29 12:16:42 +00:00
parent 69780c0061
commit e1c198fdb9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
+9 -1
View File
@@ -9,6 +9,7 @@ import java.lang.reflect.Type;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -186,8 +187,15 @@ public final class ChargeDefinitionCommandFromApiJsonDeserializer {
if (this.fromApiJsonHelper.parameterExists("chargeTimeType", element)) { if (this.fromApiJsonHelper.parameterExists("chargeTimeType", element)) {
final Integer chargeTimeType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed("chargeTimeType", element); final Integer chargeTimeType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed("chargeTimeType", element);
final Collection<Object> validLoanValues = Arrays.asList(ChargeTimeType.validLoanValues());
final Collection<Object> validSavingsValues = Arrays.asList(ChargeTimeType.validSavingsValues());
final Collection<Object> allValidValues = new ArrayList<Object>(validLoanValues);
allValidValues.addAll(validSavingsValues);
baseDataValidator.reset().parameter("chargeTimeType").value(chargeTimeType).notNull() baseDataValidator.reset().parameter("chargeTimeType").value(chargeTimeType).notNull()
.isOneOfTheseValues(ChargeTimeType.validLoanValues(), ChargeTimeType.validSavingsValues()); .isOneOfTheseValues(allValidValues.toArray(new Object[allValidValues.size()]));
} }
if (this.fromApiJsonHelper.parameterExists("feeOnMonthDay", element)) { if (this.fromApiJsonHelper.parameterExists("feeOnMonthDay", element)) {