From 712690f2f5ab821fa07c931770f882b93b2da64e Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Tue, 29 Oct 2013 12:16:42 +0000
Subject: [PATCH] MIFOSX-757: fix issue with vaidation on chargeTimeType

---
 ...ChargeDefinitionCommandFromApiJsonDeserializer.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
index 9a6c84b18..6d159829d 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/charge/serialization/ChargeDefinitionCommandFromApiJsonDeserializer.java
@@ -9,6 +9,7 @@ import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -186,8 +187,15 @@ public final class ChargeDefinitionCommandFromApiJsonDeserializer {
         if (this.fromApiJsonHelper.parameterExists("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()
-                    .isOneOfTheseValues(ChargeTimeType.validLoanValues(), ChargeTimeType.validSavingsValues());
+                    .isOneOfTheseValues(allValidValues.toArray(new Object[allValidValues.size()]));
         }
 
         if (this.fromApiJsonHelper.parameterExists("feeOnMonthDay", element)) {