Repository: incubator-unomi Updated Branches: refs/heads/master 5084951dd -> 79198c4d1
UNOMI-24 : Parse event conditions in PastEventCondition* classes Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/79198c4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/79198c4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/79198c4d Branch: refs/heads/master Commit: 79198c4d16f933af0d932341064778d3bc2caa48 Parents: 5084951 Author: Thomas Draier <[email protected]> Authored: Fri Apr 15 18:29:38 2016 +0200 Committer: Thomas Draier <[email protected]> Committed: Fri Apr 15 18:29:38 2016 +0200 ---------------------------------------------------------------------- .../baseplugin/conditions/PastEventConditionESQueryBuilder.java | 3 ++- .../baseplugin/conditions/PastEventConditionEvaluator.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/79198c4d/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java ---------------------------------------------------------------------- diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java index 64fe15f..1472cf9 100644 --- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java +++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionESQueryBuilder.java @@ -21,6 +21,7 @@ import org.apache.unomi.api.Event; import org.apache.unomi.api.Profile; import org.apache.unomi.api.conditions.Condition; import org.apache.unomi.api.services.DefinitionsService; +import org.apache.unomi.persistence.elasticsearch.conditions.ConditionContextHelper; import org.apache.unomi.persistence.elasticsearch.conditions.ConditionESQueryBuilder; import org.apache.unomi.persistence.elasticsearch.conditions.ConditionESQueryBuilderDispatcher; import org.apache.unomi.persistence.spi.PersistenceService; @@ -58,7 +59,7 @@ public class PastEventConditionESQueryBuilder implements ConditionESQueryBuilder andCondition.setParameter("operator", "and"); andCondition.setParameter("subConditions", l); - l.add(eventCondition); + l.add(ConditionContextHelper.getContextualCondition(eventCondition, context)); Integer numberOfDays = (Integer) condition.getParameter("numberOfDays"); if (numberOfDays != null) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/79198c4d/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionEvaluator.java ---------------------------------------------------------------------- diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionEvaluator.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionEvaluator.java index 0b18df5..8d4a6a2 100644 --- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionEvaluator.java +++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PastEventConditionEvaluator.java @@ -22,6 +22,7 @@ import org.apache.unomi.api.Item; import org.apache.unomi.api.Profile; import org.apache.unomi.api.conditions.Condition; import org.apache.unomi.api.services.DefinitionsService; +import org.apache.unomi.persistence.elasticsearch.conditions.ConditionContextHelper; import org.apache.unomi.persistence.elasticsearch.conditions.ConditionEvaluator; import org.apache.unomi.persistence.elasticsearch.conditions.ConditionEvaluatorDispatcher; import org.apache.unomi.persistence.spi.PersistenceService; @@ -75,7 +76,7 @@ public class PastEventConditionEvaluator implements ConditionEvaluator { andCondition.setParameter("operator", "and"); andCondition.setParameter("subConditions", l); - l.add(eventCondition); + l.add(ConditionContextHelper.getContextualCondition(eventCondition, context)); Condition profileCondition = new Condition(); profileCondition.setConditionType(definitionsService.getConditionType("sessionPropertyCondition"));
