You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/06/24 18:38:56 UTC

[31/50] [abbrv] incubator-unomi git commit: UNOMI-100 fix issue with isDay and isNotDay date wasn't converted as ISO, add unit test

UNOMI-100 fix issue with isDay and isNotDay date wasn't converted as ISO, add unit test


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0f441403
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0f441403
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0f441403

Branch: refs/heads/feature-UNOMI-5-KARAF4
Commit: 0f4414039274750a3fe2b62fdcbecbfda73eaed4
Parents: 46be002
Author: dgaillard <dg...@jahia.com>
Authored: Wed Jun 7 18:51:09 2017 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Wed Jun 7 18:51:09 2017 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/unomi/itests/ConditionBuilder.java  | 8 ++++++++
 .../java/org/apache/unomi/itests/ConditionEvaluatorIT.java   | 3 +++
 .../conditions/PropertyConditionESQueryBuilder.java          | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
index 0fbffcd..38356b5 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
@@ -129,6 +129,14 @@ public class ConditionBuilder {
             return op("in").dateValues(values);
         }
 
+        public ComparisonCondition isDay(Date value) {
+            return op("isDay").dateValue(value);
+        }
+
+        public ComparisonCondition isNotDay(Date value) {
+            return op("isNotDay").dateValue(value);
+        }
+
         public ComparisonCondition in(Integer... values) {
             return op("in").integerValues(values);
         }

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
index b75a8f5..5fb6b6f 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
@@ -112,6 +112,9 @@ public class ConditionEvaluatorIT extends BaseIT {
         assertTrue(eval(builder.profileProperty("properties.lastVisit").all(lastVisit).build()));
         assertFalse(eval(builder.profileProperty("properties.lastVisit")
                 .all(new Date(lastVisit.getTime() + 10000), lastVisit).build()));
+
+        assertTrue(eval(builder.profileProperty("properties.lastVisit").isDay(lastVisit).build()));
+        assertTrue(eval(builder.profileProperty("properties.lastVisit").isNotDay(new Date(lastVisit.getTime() + 10000)).build()));
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
index 26e480a..b06c94e 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
@@ -166,7 +166,7 @@ public class PropertyConditionESQueryBuilder implements ConditionESQueryBuilder
         DateTime date = new DateTime(value);
         DateTime dayStart = date.withTimeAtStartOfDay();
         DateTime dayAfterStart = date.plusDays(1).withTimeAtStartOfDay();
-        return QueryBuilders.rangeQuery(name).gte(dayStart.toDate()).lte(dayAfterStart.toDate());
+        return QueryBuilders.rangeQuery(name).gte(convertDateToISO(dayStart.toDate())).lte(convertDateToISO(dayAfterStart.toDate()));
     }
 
     private Object convertDateToISO(Object dateValue) {