fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nazeer1100...@apache.org
Subject [2/6] fineract git commit: Optional e-mauk field of the AdHoc page
Date Mon, 11 Dec 2017 10:29:25 GMT
Optional e-mauk field of the AdHoc page


Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/f47e0fb2
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/f47e0fb2
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/f47e0fb2

Branch: refs/heads/develop
Commit: f47e0fb2fbc1badec862ba55f0d636bda46ddef5
Parents: 5cfea88
Author: Konstantin Golub <key.offecka@runbox.com>
Authored: Wed Oct 4 20:59:27 2017 -0300
Committer: Konstantin Golub <key.offecka@runbox.com>
Committed: Wed Oct 4 20:59:27 2017 -0300

----------------------------------------------------------------------
 .../adhocquery/service/AdHocDataValidator.java  |  4 ++--
 .../core_db/V337__nullable-adhoc-email.sql      | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/fineract/blob/f47e0fb2/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
index b96cc10..bb4434b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
@@ -80,7 +80,7 @@ public final class AdHocDataValidator {
         baseDataValidator.reset().parameter("tableFields").value(tableFields).notBlank().notExceedingLengthOf(1000);
 
         final String email = this.fromApiJsonHelper.extractStringNamed("email", element);
-        baseDataValidator.reset().parameter("email").value(email).notBlank().notExceedingLengthOf(500);
+        baseDataValidator.reset().parameter("email").value(email).ignoreIfNull().notExceedingLengthOf(500);
 
         final Long reportRunFrequencyCode = this.fromApiJsonHelper.extractLongNamed("reportRunFrequency",
element);
         if (reportRunFrequencyCode != null) {
@@ -126,7 +126,7 @@ public final class AdHocDataValidator {
         }
         if (this.fromApiJsonHelper.parameterExists("email", element)) {
             final String email = this.fromApiJsonHelper.extractStringNamed("email", element);
-            baseDataValidator.reset().parameter("email").value(email).notBlank().notExceedingLengthOf(500);
+            baseDataValidator.reset().parameter("email").value(email).ignoreIfNull().notExceedingLengthOf(500);
         }
         if (this.fromApiJsonHelper.parameterExists("reportRunFrequency", element)) {
             final Long reportRunFrequencyCode = this.fromApiJsonHelper.extractLongNamed("reportRunFrequency",
element);

http://git-wip-us.apache.org/repos/asf/fineract/blob/f47e0fb2/fineract-provider/src/main/resources/sql/migrations/core_db/V337__nullable-adhoc-email.sql
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V337__nullable-adhoc-email.sql
b/fineract-provider/src/main/resources/sql/migrations/core_db/V337__nullable-adhoc-email.sql
new file mode 100644
index 0000000..0f7296f
--- /dev/null
+++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V337__nullable-adhoc-email.sql
@@ -0,0 +1,20 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+ALTER TABLE m_adhoc MODIFY `email` VARCHAR(500) NULL DEFAULT NULL;
\ No newline at end of file


Mime
View raw message