From 883e540f89c2885f8ed058e6ec66d3d773ded850 Mon Sep 17 00:00:00 2001
From: Enrico <enrico@dhis2.org>
Date: Thu, 12 Oct 2023 15:48:08 +0200
Subject: [PATCH 1/3] chore: Upgrade to next snapshot for legacy branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d7c89a4b..0d7f136d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.hisp.dhis.rules</groupId>
     <artifactId>rule-engine</artifactId>
-    <version>2.1.8.0-SNAPSHOT</version>
+    <version>2.1.8.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>rule-engine</name>
 

From f80e832ea926334fd4f36d9052833a91f72ddace Mon Sep 17 00:00:00 2001
From: Enrico <enrico@dhis2.org>
Date: Tue, 15 Oct 2024 15:59:43 +0200
Subject: [PATCH 2/3] fix: Add createdDate to RuleEvent [DHIS2-18089]

---
 .../hisp/dhis/rules/RuleVariableValue.java    |   4 +-
 .../rules/RuleVariableValueMapBuilder.java    |  17 +-
 src/main/java/org/hisp/dhis/rules/Utils.java  |  33 +++-
 .../rules/models/RuleDataValueHistory.java    |  31 ++++
 .../org/hisp/dhis/rules/models/RuleEvent.java |  13 +-
 .../hisp/dhis/rules/models/RuleVariable.java  |   2 +-
 .../rules/models/RuleVariableAttribute.java   |   2 +-
 .../models/RuleVariableCalculatedValue.java   |   2 +-
 .../models/RuleVariableCurrentEvent.java      |   2 +-
 .../rules/models/RuleVariableNewestEvent.java |  11 +-
 .../models/RuleVariableNewestStageEvent.java  |  19 ++-
 .../models/RuleVariablePreviousEvent.java     |  16 +-
 .../hisp/dhis/rules/ConstantsValueTest.java   |   1 +
 .../dhis/rules/ProgramRuleVariableTest.java   |   1 +
 .../dhis/rules/RuleEngineEffectTypesTest.java |   1 +
 .../dhis/rules/RuleEngineFunctionTest.java    | 154 ++++++++---------
 .../org/hisp/dhis/rules/RuleEngineTest.java   |   2 +-
 .../dhis/rules/RuleEngineValueTypesTest.java  |   6 +-
 .../rules/RuleEngineVariableNameTest.java     |  70 ++++----
 .../rules/RuleVariablePreviousEventTest.java  | 160 ++++++++++++++++++
 .../RuleVariableValueMapBuilderTest.java      |  56 +++---
 .../dhis/rules/VariableValueTypeTest.java     |   4 +-
 .../rules/models/CalculatedValueTest.java     |   3 +
 .../hisp/dhis/rules/models/RuleEventTest.java |  28 +--
 .../models/RuleVariablePreviousEventTest.java |  43 -----
 .../hisp/dhis/rules/util/MockRuleEvent.java   |   6 +
 .../dhis/rules/util/MockRuleVariable.java     |   3 +-
 27 files changed, 451 insertions(+), 239 deletions(-)
 create mode 100644 src/main/java/org/hisp/dhis/rules/models/RuleDataValueHistory.java
 create mode 100644 src/test/java/org/hisp/dhis/rules/RuleVariablePreviousEventTest.java
 delete mode 100644 src/test/java/org/hisp/dhis/rules/models/RuleVariablePreviousEventTest.java

diff --git a/src/main/java/org/hisp/dhis/rules/RuleVariableValue.java b/src/main/java/org/hisp/dhis/rules/RuleVariableValue.java
index 44671123..4baba7f6 100644
--- a/src/main/java/org/hisp/dhis/rules/RuleVariableValue.java
+++ b/src/main/java/org/hisp/dhis/rules/RuleVariableValue.java
@@ -22,7 +22,7 @@ public abstract class RuleVariableValue implements VariableValue
     @Nonnull
     public static RuleVariableValue create( @Nonnull RuleValueType ruleValueType )
     {
-        return new AutoValue_RuleVariableValue( null, ruleValueType, List.of(), getFormattedDate( new Date() ) );
+        return new AutoValue_RuleVariableValue( null, ruleValueType, List.of(), null );
     }
 
     @Nonnull
@@ -30,7 +30,7 @@ public static RuleVariableValue create( @Nonnull String value,
         @Nonnull RuleValueType ruleValueType )
     {
         return new AutoValue_RuleVariableValue( value, ruleValueType,
-            List.of(), getFormattedDate( new Date() ) );
+            List.of(), null );
     }
 
     @Nonnull
diff --git a/src/main/java/org/hisp/dhis/rules/RuleVariableValueMapBuilder.java b/src/main/java/org/hisp/dhis/rules/RuleVariableValueMapBuilder.java
index 43c96023..ddef4220 100644
--- a/src/main/java/org/hisp/dhis/rules/RuleVariableValueMapBuilder.java
+++ b/src/main/java/org/hisp/dhis/rules/RuleVariableValueMapBuilder.java
@@ -220,9 +220,9 @@ private Map<String, RuleAttributeValue> buildCurrentEnrollmentValues()
         return currentEnrollmentValues;
     }
 
-    private Map<String, List<RuleDataValue>> buildAllEventValues()
+    private Map<String, List<RuleDataValueHistory>> buildAllEventValues()
     {
-        Map<String, List<RuleDataValue>> allEventsValues = new HashMap<>();
+        Map<String, List<RuleDataValueHistory>> allEventsValues = new HashMap<>();
         List<RuleEvent> events = new ArrayList<>( ruleEvents );
 
         if ( ruleEvent != null )
@@ -242,17 +242,22 @@ private Map<String, List<RuleDataValue>> buildAllEventValues()
 
             for ( int j = 0; j < ruleEvent.dataValues().size(); j++ )
             {
-                RuleDataValue ruleDataValue = ruleEvent.dataValues().get( j );
+                RuleDataValue ruleDataValue = ruleEvent.dataValues().get(j);
+                RuleDataValueHistory ruleDataValueHistory = new RuleDataValueHistory(
+                        ruleDataValue.value(),
+                        ruleEvent.eventDate(),
+                        ruleEvent.createdDate(),
+                        ruleEvent.programStage() );
 
                 // push new list if it is not there for the given data element
                 if ( !allEventsValues.containsKey( ruleDataValue.dataElement() ) )
                 {
                     allEventsValues.put( ruleDataValue.dataElement(),
-                        new ArrayList<RuleDataValue>( events.size() ) ); //NOPMD
+                        new ArrayList<RuleDataValueHistory>( events.size() ) ); //NOPMD
                 }
 
                 // append data value to the list
-                allEventsValues.get( ruleDataValue.dataElement() ).add( ruleDataValue );
+                allEventsValues.get( ruleDataValue.dataElement() ).add( ruleDataValueHistory );
             }
         }
 
@@ -377,7 +382,7 @@ private Map<String, RuleVariableValue> buildRuleVariableValues()
         Map<String, RuleVariableValue> valueMap = new HashMap<>();
 
         // map data values within all events to data elements
-        Map<String, List<RuleDataValue>> allEventValues = buildAllEventValues();
+        Map<String, List<RuleDataValueHistory>> allEventValues = buildAllEventValues();
 
         // map tracked entity attributes to values from enrollment
         Map<String, RuleAttributeValue> currentEnrollmentValues = buildCurrentEnrollmentValues();
diff --git a/src/main/java/org/hisp/dhis/rules/Utils.java b/src/main/java/org/hisp/dhis/rules/Utils.java
index ae9708db..580a5e28 100644
--- a/src/main/java/org/hisp/dhis/rules/Utils.java
+++ b/src/main/java/org/hisp/dhis/rules/Utils.java
@@ -1,6 +1,7 @@
 package org.hisp.dhis.rules;
 
 import org.hisp.dhis.rules.models.RuleDataValue;
+import org.hisp.dhis.rules.models.RuleDataValueHistory;
 import org.hisp.dhis.rules.models.RuleEvent;
 
 import java.text.SimpleDateFormat;
@@ -32,14 +33,26 @@ public static List<String> values( List<RuleDataValue> ruleDataValues )
         return Collections.unmodifiableList( values );
     }
 
-    public static String getLastUpdateDateForPrevious( List<RuleDataValue> ruleDataValues,
+    public static List<String> valuesForHistory( List<RuleDataValueHistory> ruleDataValues )
+    {
+        List<String> values = new ArrayList<>( ruleDataValues.size() );
+        for ( RuleDataValueHistory ruleDataValue : ruleDataValues )
+        {
+            values.add( ruleDataValue.getValue() );
+        }
+        return Collections.unmodifiableList( values );
+    }
+
+    public static String getLastUpdateDateForPrevious( List<RuleDataValueHistory> ruleDataValues,
         RuleEvent ruleEvent )
     {
         List<Date> dates = new ArrayList<>();
-        for ( RuleDataValue date : ruleDataValues )
+        for ( RuleDataValueHistory date : ruleDataValues )
         {
-            Date d = date.eventDate();
-            if ( d.before( ruleEvent.eventDate() ) )
+            Date d = date.getEventDate();
+            if ( d.before( ruleEvent.eventDate() ) ||
+                    (ruleEvent.eventDate().equals(d) && ruleEvent.createdDate().after(date.getCreatedDate()))
+            )
             {
                 dates.add( d );
             }
@@ -48,6 +61,18 @@ public static String getLastUpdateDateForPrevious( List<RuleDataValue> ruleDataV
         return dateFormat.format( Collections.max( dates ) );
     }
 
+    public static String getLastUpdateDateForHistory( List<RuleDataValueHistory> ruleDataValues )
+    {
+        List<Date> dates = new ArrayList<>();
+        for ( RuleDataValueHistory date : ruleDataValues )
+        {
+            Date d = date.getEventDate();
+            dates.add( d );
+        }
+
+        return dateFormat.format( Collections.max( dates ) );
+    }
+
     public static String getLastUpdateDate( List<RuleDataValue> ruleDataValues )
     {
         List<Date> dates = new ArrayList<>();
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleDataValueHistory.java b/src/main/java/org/hisp/dhis/rules/models/RuleDataValueHistory.java
new file mode 100644
index 00000000..cbde5de6
--- /dev/null
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleDataValueHistory.java
@@ -0,0 +1,31 @@
+package org.hisp.dhis.rules.models;
+
+import java.util.Date;
+
+public class RuleDataValueHistory {
+    private final String value;
+    private final Date eventDate;
+    private final Date createdDate;
+    private final String programStage;
+    public RuleDataValueHistory( String value, Date eventDate, Date createdDate, String programStage) {
+        this.value = value;
+        this.eventDate = eventDate;
+        this.createdDate = createdDate;
+        this.programStage = programStage;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public Date getEventDate() {
+        return eventDate;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public String getProgramStage() {
+        return programStage;}
+}
\ No newline at end of file
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleEvent.java b/src/main/java/org/hisp/dhis/rules/models/RuleEvent.java
index 05ac9540..92c99581 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleEvent.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleEvent.java
@@ -22,6 +22,7 @@ public static RuleEvent create(
         @Nonnull String programStage,
         @Nonnull Status status,
         @Nonnull Date eventDate,
+        @Nonnull Date createdDate,
         @Nonnull Date dueDate,
         @Nonnull String organisationUnit,
         @Nullable String organisationUnitCode,
@@ -35,6 +36,7 @@ public static RuleEvent create(
             .programStageName( programStageName )
             .status( status )
             .eventDate( eventDate )
+            .createdDate( createdDate )
             .dueDate( dueDate )
             .organisationUnit( organisationUnit )
             .organisationUnitCode( organisationUnitCode )
@@ -63,6 +65,9 @@ public static Builder builder()
     @Nonnull
     public abstract Date eventDate();
 
+    @Nonnull
+    public abstract Date createdDate();
+
     @Nullable
     public abstract Date dueDate();
 
@@ -98,6 +103,8 @@ public static abstract class Builder
 
         public abstract Builder dueDate( Date dueDate );
 
+        public abstract Builder createdDate( Date createdDate );
+
         public abstract Builder completedDate( Date completedDate );
 
         public abstract Builder organisationUnit( String organisationUnit );
@@ -117,7 +124,11 @@ private static class EventDateComparator
         @Override
         public int compare( RuleEvent first, RuleEvent second )
         {
-            return second.eventDate().compareTo( first.eventDate() );
+            int compare = second.eventDate().compareTo(first.eventDate());
+            if (compare == 0){
+                return second.createdDate().compareTo(first.createdDate());
+            }
+            return compare;
         }
     }
 
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariable.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariable.java
index dbfdf457..8582faa6 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariable.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariable.java
@@ -25,7 +25,7 @@ public abstract class RuleVariable
     public abstract List<Option> options();
 
     public abstract Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues );
 
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariableAttribute.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariableAttribute.java
index caa12eab..cae1f873 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariableAttribute.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariableAttribute.java
@@ -34,7 +34,7 @@ public static RuleVariableAttribute create(@Nonnull String name,
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariableCalculatedValue.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariableCalculatedValue.java
index 2fbd016d..4ba0d37e 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariableCalculatedValue.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariableCalculatedValue.java
@@ -61,7 +61,7 @@ public static RuleVariableCalculatedValue create(@Nonnull String name,
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariableCurrentEvent.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariableCurrentEvent.java
index e4290b54..58c722a0 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariableCurrentEvent.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariableCurrentEvent.java
@@ -27,7 +27,7 @@ public static RuleVariableCurrentEvent create(@Nonnull String name,
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestEvent.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestEvent.java
index b05db50b..a213e70b 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestEvent.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestEvent.java
@@ -12,6 +12,7 @@
 import java.util.Map;
 
 import static org.hisp.dhis.rules.Utils.getLastUpdateDate;
+import static org.hisp.dhis.rules.Utils.getLastUpdateDateForHistory;
 
 @AutoValue
 public abstract class RuleVariableNewestEvent
@@ -27,12 +28,12 @@ public static RuleVariableNewestEvent create(@Nonnull String name,
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
         Map<String, RuleVariableValue> valueMap = new HashMap();
-        List<RuleDataValue> ruleDataValues = allEventValues.get( this.dataElement() );
+        List<RuleDataValueHistory> ruleDataValues = allEventValues.get( this.dataElement() );
 
         if ( ruleDataValues == null || ruleDataValues.isEmpty() )
         {
@@ -42,12 +43,12 @@ public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder
         {
             RuleVariableValue variableValue;
 
-            RuleDataValue value = ruleDataValues.get( 0 );
+            RuleDataValueHistory value = ruleDataValues.get( 0 );
 
-            String optionValue = this.useCodeForOptionSet() ? value.value() : getOptionName( value.value() );
+            String optionValue = this.useCodeForOptionSet() ? value.getValue() : getOptionName( value.getValue() );
 
             variableValue = RuleVariableValue.create( optionValue,
-                this.dataElementType(), Utils.values( ruleDataValues ), getLastUpdateDate( ruleDataValues ) );
+                this.dataElementType(), Utils.valuesForHistory( ruleDataValues ), getLastUpdateDateForHistory( ruleDataValues ) );
 
 
             valueMap.put( this.name(), variableValue );
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestStageEvent.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestStageEvent.java
index 6e1c716d..386640c7 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestStageEvent.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariableNewestStageEvent.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 
 import static org.hisp.dhis.rules.Utils.getLastUpdateDate;
+import static org.hisp.dhis.rules.Utils.getLastUpdateDateForHistory;
 
 @AutoValue
 public abstract class RuleVariableNewestStageEvent
@@ -32,21 +33,21 @@ public static RuleVariableNewestStageEvent create(@Nonnull String name, @Nonnull
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
         Map<String, RuleVariableValue> valueMap = new HashMap();
-        List<RuleDataValue> stageRuleDataValues = new ArrayList<>();
-        List<RuleDataValue> sourceRuleDataValues = allEventValues.get( this.dataElement() );
+        List<RuleDataValueHistory> stageRuleDataValues = new ArrayList<>();
+        List<RuleDataValueHistory> sourceRuleDataValues = allEventValues.get( this.dataElement() );
         if ( sourceRuleDataValues != null && !sourceRuleDataValues.isEmpty() )
         {
 
             // filter data values based on program stage
             for ( int i = 0; i < sourceRuleDataValues.size(); i++ )
             {
-                RuleDataValue ruleDataValue = sourceRuleDataValues.get( i );
-                if ( this.programStage().equals( ruleDataValue.programStage() ) )
+                RuleDataValueHistory ruleDataValue = sourceRuleDataValues.get( i );
+                if ( this.programStage().equals( ruleDataValue.getProgramStage() ) )
                 {
                     stageRuleDataValues.add( ruleDataValue );
                 }
@@ -61,13 +62,13 @@ public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder
         {
             RuleVariableValue variableValue;
 
-            RuleDataValue value = stageRuleDataValues.get( 0 );
+            RuleDataValueHistory value = stageRuleDataValues.get( 0 );
 
-            String optionValue = this.useCodeForOptionSet() ? value.value() : getOptionName( value.value() );
+            String optionValue = this.useCodeForOptionSet() ? value.getValue() : getOptionName( value.getValue() );
 
             variableValue = RuleVariableValue.create( optionValue,
-                        this.dataElementType(), Utils.values( stageRuleDataValues ),
-                        getLastUpdateDate( stageRuleDataValues ) );
+                        this.dataElementType(), Utils.valuesForHistory( stageRuleDataValues ),
+                        getLastUpdateDateForHistory( stageRuleDataValues ) );
 
             valueMap.put( this.name(), variableValue );
         }
diff --git a/src/main/java/org/hisp/dhis/rules/models/RuleVariablePreviousEvent.java b/src/main/java/org/hisp/dhis/rules/models/RuleVariablePreviousEvent.java
index 6c6f1598..af4107fe 100644
--- a/src/main/java/org/hisp/dhis/rules/models/RuleVariablePreviousEvent.java
+++ b/src/main/java/org/hisp/dhis/rules/models/RuleVariablePreviousEvent.java
@@ -27,26 +27,30 @@ public static RuleVariablePreviousEvent create(@Nonnull String name,
 
     @Override
     public Map<String, RuleVariableValue> createValues( RuleVariableValueMapBuilder builder,
-        Map<String, List<RuleDataValue>> allEventValues,
+        Map<String, List<RuleDataValueHistory>> allEventValues,
         Map<String, RuleAttributeValue> currentEnrollmentValues,
         Map<String, RuleDataValue> currentEventValues )
     {
         Map<String, RuleVariableValue> valueMap = new HashMap();
 
         RuleVariableValue variableValue = null;
-        List<RuleDataValue> ruleDataValues = allEventValues.get( this.dataElement() );
+        List<RuleDataValueHistory> ruleDataValues = allEventValues.get( this.dataElement() );
         if ( builder.ruleEvent != null && ruleDataValues != null && !ruleDataValues.isEmpty() )
         {
-            for ( RuleDataValue ruleDataValue : ruleDataValues )
+            for ( RuleDataValueHistory ruleDataValue : ruleDataValues )
             {
                 // We found preceding value to the current currentEventValues,
                 // which is assumed to be best candidate.
-                if ( builder.ruleEvent.eventDate().compareTo( ruleDataValue.eventDate() ) > 0 )
+                if ( builder.ruleEvent.eventDate().compareTo( ruleDataValue.getEventDate() ) > 0
+                    || (
+                        builder.ruleEvent.eventDate().compareTo( ruleDataValue.getEventDate() ) == 0 &&
+                        builder.ruleEvent.createdDate().compareTo( ruleDataValue.getCreatedDate() ) > 0
+                        ))
                 {
-                    String optionValue = this.useCodeForOptionSet() ? ruleDataValue.value() : getOptionName( ruleDataValue.value() );
+                    String optionValue = this.useCodeForOptionSet() ? ruleDataValue.getValue() : getOptionName( ruleDataValue.getValue() );
 
                     variableValue = RuleVariableValue.create( optionValue, this.dataElementType(),
-                        Utils.values( ruleDataValues ),
+                        Utils.valuesForHistory( ruleDataValues ),
                         getLastUpdateDateForPrevious( ruleDataValues, builder.ruleEvent ) );
                     break;
                 }
diff --git a/src/test/java/org/hisp/dhis/rules/ConstantsValueTest.java b/src/test/java/org/hisp/dhis/rules/ConstantsValueTest.java
index 5a770e6f..c4458392 100644
--- a/src/test/java/org/hisp/dhis/rules/ConstantsValueTest.java
+++ b/src/test/java/org/hisp/dhis/rules/ConstantsValueTest.java
@@ -189,6 +189,7 @@ public void assignConstantValueFromAssignActionInEvent()
             .programStageName( "" )
             .status( RuleEvent.Status.ACTIVE )
             .eventDate( new Date() )
+            .createdDate( new Date() )
             .dueDate( new Date() )
             .organisationUnit( "" )
             .organisationUnitCode( "" )
diff --git a/src/test/java/org/hisp/dhis/rules/ProgramRuleVariableTest.java b/src/test/java/org/hisp/dhis/rules/ProgramRuleVariableTest.java
index 4c18fadc..c53897c4 100644
--- a/src/test/java/org/hisp/dhis/rules/ProgramRuleVariableTest.java
+++ b/src/test/java/org/hisp/dhis/rules/ProgramRuleVariableTest.java
@@ -326,6 +326,7 @@ private List<RuleEffect> callEventRuleEngine( Rule rule )
             .programStageName( PROGRAM_STAGE_NAME )
             .status( RULE_EVENT_STATUS )
             .eventDate( EVENT_DATE )
+            .createdDate( new Date() )
             .dueDate( DUE_DATE )
             .organisationUnit( ORGANISATION_UNIT )
             .organisationUnitCode( ORGANISATION_UNIT_CODE )
diff --git a/src/test/java/org/hisp/dhis/rules/RuleEngineEffectTypesTest.java b/src/test/java/org/hisp/dhis/rules/RuleEngineEffectTypesTest.java
index efb67e28..862308fa 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleEngineEffectTypesTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleEngineEffectTypesTest.java
@@ -48,6 +48,7 @@ private RuleEvent getTestRuleEvent( RuleEvent.Status status )
             .programStageName( "" )
             .status( status )
             .eventDate( new Date() )
+            .createdDate( new Date() )
             .dueDate( new Date() )
             .organisationUnit( "" )
             .organisationUnitCode( "" )
diff --git a/src/test/java/org/hisp/dhis/rules/RuleEngineFunctionTest.java b/src/test/java/org/hisp/dhis/rules/RuleEngineFunctionTest.java
index 98676e66..279a436d 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleEngineFunctionTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleEngineFunctionTest.java
@@ -84,12 +84,12 @@ public void evaluateFailingRuleInMultipleContext()
             List.of(),
             "" );
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "",
             null );
 
         RuleEvent ruleNotFailingEvent = RuleEvent.create( "test_not_failing_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, yesterday, yesterday, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, yesterday, new Date(), yesterday, "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "",
             null );
 
@@ -132,7 +132,7 @@ public void evaluateHasValueFunctionMustReturnTrueIfValueSpecified()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                 new Date(), "test_program_stage", "test_data_element", "test_value" ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -159,7 +159,7 @@ public void optionSetNameShouldBeUsed()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                         new Date(), "test_program_stage", "test_data_element", option1.getCode() ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -186,7 +186,7 @@ public void optionSetCodeShouldBeUsed()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                         new Date(), "test_program_stage", "test_data_element", option2.getCode() ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -209,7 +209,7 @@ public void evaluateHasValueFunctionWithStringValue()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                 new Date(), "test_program_stage", "test_data_element", "test_value" ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -231,7 +231,7 @@ public void evaluateHasValueFunctionMustReturnTrueIfNoValueSpecified()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(),
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(),
             "test_program_stage_name", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -253,7 +253,7 @@ public void evaluateEnvironmentVariableProgramStageName()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage_id",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(),
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(),
             "test_program_stage_name", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -277,7 +277,7 @@ public void evaluateDaysBetweenMustReturnCorrectDiff()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2017-01-01" ),
                 RuleDataValue
                     .create( new Date(), "test_program_stage", "test_data_element_two", "2017-02-01" ) ), "", null);
@@ -303,7 +303,7 @@ public void evaluateDaysBetweenWithSingleQuotedDateMustReturnCorrectDiff()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2017-01-01" ),
                 RuleDataValue
                     .create( new Date(), "test_program_stage", "test_data_element_two", "2017-02-01" ) ), "", null);
@@ -340,7 +340,7 @@ public void evaluateD2InOrgUnitGroup()
             .build();
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "location1", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "location1", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "OU_GROUP_ID" ) ),
             "", null);
 
@@ -378,7 +378,7 @@ public void evaluateD2InOrgUnitGroupWithStringValue()
             .build();
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "location1", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "location1", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "OU_GROUP_ID" ) ),
             "", null);
 
@@ -415,7 +415,7 @@ public void evaluateD2HasUserRole()
             .build();
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "location1", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "location1", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "role1" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
@@ -452,7 +452,7 @@ public void evaluateD2HasUserRoleWithStringValue()
             .build();
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "location1", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "location1", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "role1" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
@@ -477,7 +477,7 @@ public void evaluateD2AddDays()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2017-01-01" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "2" ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
@@ -487,7 +487,7 @@ RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
         assertThat( ruleEffects.get( 0 ).data() ).isEqualTo( "2017-01-03" );
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2017-01-03" ),
                 RuleDataValue
                     .create( new Date(), "test_program_stage", "test_data_element_two", "-2" ) ), "", null);
@@ -512,13 +512,13 @@ public void evaluateD2CountIfValue()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3 ) );
@@ -545,13 +545,13 @@ public void evaluateD2CountIfValueWithStringValue()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3 ) );
@@ -580,17 +580,17 @@ public void evaluateD2Count()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         RuleEvent ruleEvent4 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3, ruleEvent4 ) );
@@ -616,10 +616,10 @@ public void evaluateLogicalAnd() throws Exception
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                         RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                         RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2 ) );
@@ -645,10 +645,10 @@ public void evaluateLogicalOr() throws Exception
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                         RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                         RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2 ) );
@@ -678,17 +678,17 @@ public void evaluateD2CountWithStringValue()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         RuleEvent ruleEvent4 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3, ruleEvent4 ) );
@@ -714,7 +714,7 @@ public void evaluateD2Round()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2.6" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -738,7 +738,7 @@ public void evaluateD2Modulus()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2.6" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -762,7 +762,7 @@ public void evaluateD2SubString()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "ABCD" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -788,7 +788,7 @@ public void evaluateD2WeeksBetween()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2018-01-01" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "2018-02-01" ) ), "", null);
 
@@ -815,7 +815,7 @@ public void evaluateD2MonthsBetween()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2018-01-01" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "2018-09-01" ) ), "", null);
 
@@ -844,7 +844,7 @@ public void evaluateD2YearsBetween()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "2016-01-01" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "2018-09-01" ) ), "", null);
 
@@ -873,7 +873,7 @@ public void evaluateD2Zpvc()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
 
@@ -894,7 +894,7 @@ public void evaluateD2Zing()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.<RuleVariable>asList() );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
 
@@ -915,7 +915,7 @@ public void evaluateD2Oizp()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.<RuleVariable>asList() );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.<RuleDataValue>asList(), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
 
@@ -938,15 +938,15 @@ public void evaluateD2CountIfZeroPos()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "0" ) ), "", null);
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "1" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "-3" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.events( Arrays.asList( ruleEvent1, ruleEvent2 ) ).build()
@@ -972,15 +972,15 @@ public void evaluateD2CountIfZeroPosWithStringValue()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "0" ) ), "", null);
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "1" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "-3" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.events( Arrays.asList( ruleEvent1, ruleEvent2 ) ).build()
@@ -1005,7 +1005,7 @@ public void evaluateD2Left()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "yyyy-mm-dd" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -1029,7 +1029,7 @@ public void evaluateD2Right()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "yyyy-mm-dd" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -1053,7 +1053,7 @@ public void evaluateD2Concatenate()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "weeks" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -1077,7 +1077,7 @@ public void evaluateD2ValidatePattern()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "44455545454" ) ),
             "", null);
 
@@ -1088,7 +1088,7 @@ RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
         assertEquals( "true", ruleEffects.get( 0 ).data() );
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "444887777" ) ), "", null);
 
         List<RuleEffect> ruleEffects2 = ruleEngineBuilder.build().evaluate( ruleEvent2 ).call();
@@ -1112,7 +1112,7 @@ public void evaluateD2Length()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "testString" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.build().evaluate( ruleEvent ).call();
@@ -1136,7 +1136,7 @@ public void evaluateD2Split()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue
                     .create( new Date(), "test_program_stage", "test_data_element_one", "test-String-for-split" ) ),
             "", null);
@@ -1169,7 +1169,7 @@ public void evaluateNestedFunctionCalls()
             Arrays.asList( ruleVariableOne, ruleVariableTwo, ruleVariableThree ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "19.9" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "0.9" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_three", "10.6" ) ), "", null);
@@ -1200,7 +1200,7 @@ public void evaluateD2ZScoreWFA()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "4.5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1230,7 +1230,7 @@ public void evaluateD2ZScoreHFAGirl()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "66.3" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "1" ) ), "", null);
 
@@ -1260,7 +1260,7 @@ public void evaluateD2ZScoreHFABoy()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "68.7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1290,7 +1290,7 @@ public void evaluateD2ZScoreWFHBoy()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "3" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1320,7 +1320,7 @@ public void evaluateD2ZScoreWFHGirl()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "12.5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "1" ) ), "", null);
 
@@ -1349,17 +1349,17 @@ public void evaluateD2MaxValue()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1390,17 +1390,17 @@ public void evaluateD2MaxValueWithStringValue()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1429,17 +1429,17 @@ public void testMinValue()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1469,17 +1469,17 @@ public void testMinValueWithStringValue()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -1514,16 +1514,16 @@ public void evaluateLastEventDate()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, dayBeforeYesterday, new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dayBeforeYesterday, new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( dayBeforeYesterday, "test_program_stage1", "test_data_element_one", "value1" ) ),
             "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, yesterday, new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, yesterday, new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( yesterday, "test_program_stage2", "test_data_element_one", "value2" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, dayAfterTomorrow, dayAfterTomorrow, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dayAfterTomorrow, new Date(), dayAfterTomorrow, "", null, Arrays.asList(
                 RuleDataValue.create( dayAfterTomorrow, "test_program_stage3", "test_data_element_one", "value3" ) ),
             "", null);
 
diff --git a/src/test/java/org/hisp/dhis/rules/RuleEngineTest.java b/src/test/java/org/hisp/dhis/rules/RuleEngineTest.java
index df72e448..99c427df 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleEngineTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleEngineTest.java
@@ -105,7 +105,7 @@ public void evaluateShouldThrowOnNullEvent()
     public void evaluateShouldThrowIfEventIsAlreadyInContext()
     {
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_programstage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
 
         List<RuleEvent> ruleEvents = new ArrayList<>();
         ruleEvents.add( ruleEvent );
diff --git a/src/test/java/org/hisp/dhis/rules/RuleEngineValueTypesTest.java b/src/test/java/org/hisp/dhis/rules/RuleEngineValueTypesTest.java
index fcddb38f..719630da 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleEngineValueTypesTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleEngineValueTypesTest.java
@@ -38,7 +38,7 @@ public void booleanVariableWithoutValueMustFallbackToDefaultBooleanValue()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
         assertThat( ruleEffects.size() ).isEqualTo( 1 );
@@ -59,7 +59,7 @@ public void numericVariableWithoutValueMustFallbackToDefaultNumericValue()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
         assertThat( ruleEffects.size() ).isEqualTo( 1 );
@@ -80,7 +80,7 @@ public void textVariableWithoutValueMustFallbackToDefaultTextValue()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
         assertThat( ruleEffects.size() ).isEqualTo( 1 );
diff --git a/src/test/java/org/hisp/dhis/rules/RuleEngineVariableNameTest.java b/src/test/java/org/hisp/dhis/rules/RuleEngineVariableNameTest.java
index 3166c5c9..0e24e718 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleEngineVariableNameTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleEngineVariableNameTest.java
@@ -95,7 +95,7 @@ public void evaluateD2Round()
             ruleVariables );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element1", "2.6" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element2", "2.6" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element3", "2.6" ),
@@ -146,7 +146,7 @@ public void evaluateHasValueFunctionMustReturnTrueIfVariableIsComposedUIDs()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                 new Date(), "test_program_stage", "test_data_element", "test_value" ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -168,7 +168,7 @@ public void evaluateHasValueFunctionMustReturnTrueIfVariableIsVariableName()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList( RuleDataValue.create(
                 new Date(), "test_program_stage", "test_data_element", "test_value" ) ), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
 
@@ -191,13 +191,13 @@ public void evaluateD2CountIfValueIsVariableName()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3 ) );
@@ -223,13 +223,13 @@ public void evaluateD2CountIfValueIsComposedUid()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3 ) );
@@ -258,17 +258,17 @@ public void evaluateD2CountIfVariableName()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         RuleEvent ruleEvent4 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3, ruleEvent4 ) );
@@ -297,17 +297,17 @@ public void evaluateD2CountIfVariableNameIfComposedUid()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition2" ) ), "", null);
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "condition" ) ), "", null);
 
         RuleEvent ruleEvent4 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "condition" ) ), "", null);
 
         ruleEngineBuilder.events( Arrays.asList( ruleEvent2, ruleEvent3, ruleEvent4 ) );
@@ -333,15 +333,15 @@ public void evaluateD2CountIfZeroPosIfVariableName()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "0" ) ), "", null);
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "1" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "-3" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.events( Arrays.asList( ruleEvent1, ruleEvent2 ) ).build()
@@ -366,15 +366,15 @@ public void evaluateD2CountIfZeroPosIfComposedUid()
         RuleEngine.Builder ruleEngineBuilder = getRuleEngineBuilder( rule, Arrays.asList( ruleVariableOne ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "0" ) ), "", null);
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "1" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event1", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "-3" ) ), "", null);
 
         List<RuleEffect> ruleEffects = ruleEngineBuilder.events( Arrays.asList( ruleEvent1, ruleEvent2 ) ).build()
@@ -404,17 +404,17 @@ public void evaluateD2MaxValueIfVariableName()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -444,17 +444,17 @@ public void evaluateD2MaxValueIfComposedUid()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -483,17 +483,17 @@ public void testMinValueIfVariableName()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
@@ -523,17 +523,17 @@ public void testMinValueIfComposedUid()
             Arrays.asList( ruleVariableOne, ruleVariableTwo ) );
 
         RuleEvent ruleEvent1 = RuleEvent.create( "test_event1", "test_program_stage1",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "5" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent2 = RuleEvent.create( "test_event2", "test_program_stage2",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "7" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
         RuleEvent ruleEvent3 = RuleEvent.create( "test_event3", "test_program_stage3",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_one", "8" ),
                 RuleDataValue.create( new Date(), "test_program_stage", "test_data_element_two", "male" ) ), "", null);
 
diff --git a/src/test/java/org/hisp/dhis/rules/RuleVariablePreviousEventTest.java b/src/test/java/org/hisp/dhis/rules/RuleVariablePreviousEventTest.java
new file mode 100644
index 00000000..a3b66f63
--- /dev/null
+++ b/src/test/java/org/hisp/dhis/rules/RuleVariablePreviousEventTest.java
@@ -0,0 +1,160 @@
+package org.hisp.dhis.rules;
+
+import org.hisp.dhis.rules.models.RuleDataValue;
+import org.hisp.dhis.rules.models.RuleDataValueHistory;
+import org.hisp.dhis.rules.models.RuleEvent;
+import org.hisp.dhis.rules.models.RuleValueType;
+import org.hisp.dhis.rules.models.RuleVariablePreviousEvent;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import static org.hisp.dhis.rules.models.RuleEvent.Status.ACTIVE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+@RunWith( JUnit4.class )
+public class RuleVariablePreviousEventTest {
+    private final LocalDate today = LocalDate.now();
+    private final LocalDate yesterday = today.minusDays(1);
+    private final LocalDate dayBeforeYesterday = yesterday.minusDays(1);
+    private final Date todayInstant = Date.from(today.atStartOfDay().toInstant(ZoneOffset.UTC));
+    private final Date yesterdayInstant = Date.from(yesterday.atStartOfDay().toInstant(ZoneOffset.UTC));
+    private final Date dayBeforeYesterdayInstant = Date.from(dayBeforeYesterday.atStartOfDay().toInstant(ZoneOffset.UTC));
+    private final Date tomorrow = Date.from(today.plusDays(1).atStartOfDay().toInstant(ZoneOffset.UTC));
+    private final Date todayMorning = Date.from(today.atTime(10, 0).toInstant(ZoneOffset.UTC));
+    private final Date todayAfternoon = Date.from(today.atTime(14, 0).toInstant(ZoneOffset.UTC));
+
+    private final RuleVariablePreviousEvent ruleVariablePreviousEvent =
+            RuleVariablePreviousEvent.create("previous value", "data_element", RuleValueType.NUMERIC, true, Collections.emptyList());
+
+    @Test
+    public void shouldCreateEmptyRuleVariableValueWhenNoDataValuesArePresent() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(tomorrow, tomorrow)), Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertNull(ruleVariableValue.value());
+        assertNull(ruleVariableValue.eventDate());
+        assertEquals(Collections.emptyList(), ruleVariableValue.candidates());
+    }
+
+    @Test
+    public void shouldCreateTodayRuleVariableValueWhenEventDateIsTomorrow() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(tomorrow, tomorrow)), allEventsDataValues(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertEquals(todayDataValue().getValue(), ruleVariableValue.value());
+        assertEquals(today.toString(), ruleVariableValue.eventDate());
+        assertEquals(new HashSet<>(Arrays.asList("1", "2", "3", "4", "5")), new HashSet<>(ruleVariableValue.candidates()));
+    }
+
+    @Test
+    public void shouldCreateYesterdayAfternoonRuleVariableValueWhenEventDateIsToday() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(todayInstant, todayInstant)), allEventsDataValues(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertEquals(yesterdayDataValueCreatedThisAfternoon().getValue(), ruleVariableValue.value());
+        assertEquals(yesterday.toString(), ruleVariableValue.eventDate());
+        assertEquals(new HashSet<>(Arrays.asList("1", "2", "3", "4", "5")), new HashSet<>(ruleVariableValue.candidates()));
+    }
+
+    @Test
+    public void shouldCreateYesterdayRuleVariableValueCreateTodayMorningWhenEventDateIsYesterdayAndItWasCreatedTodayAfternoon() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(yesterdayInstant, todayAfternoon)), allEventsDataValues(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertEquals(yesterdayDataValueCreatedThisMorning().getValue(), ruleVariableValue.value());
+        assertEquals(yesterday.toString(), ruleVariableValue.eventDate());
+        assertEquals(new HashSet<>(Arrays.asList("1", "2", "3", "4", "5")), new HashSet<>(ruleVariableValue.candidates()));
+    }
+
+    @Test
+    public void shouldCreateDayBeforeYesterdayRuleVariableValueWhenEventDateIsYesterdayAndItWasCreatedYesterday() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(yesterdayInstant, yesterdayInstant)), allEventsDataValues(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertEquals(dayBeforeYesterdayDataValue().getValue(), ruleVariableValue.value());
+        assertEquals(dayBeforeYesterday.toString(), ruleVariableValue.eventDate());
+        assertEquals(new HashSet<>(Arrays.asList("1", "2", "3", "4", "5")), new HashSet<>(ruleVariableValue.candidates()));
+    }
+
+    @Test
+    public void shouldGetNoValueWhenThereIsNoPreviousDataValue() {
+        RuleVariableValue ruleVariableValue = ruleVariablePreviousEvent.createValues(RuleVariableValueMapBuilder.target(event(dayBeforeYesterdayInstant, yesterdayInstant)), allEventsDataValues(), Collections.emptyMap(), Collections.emptyMap()).get("previous value");
+
+        assertEquals(RuleValueType.NUMERIC, ruleVariableValue.type());
+        assertNull(ruleVariableValue.value());
+        assertNull(ruleVariableValue.eventDate());
+        assertEquals(Collections.emptyList(), ruleVariableValue.candidates());
+    }
+
+    private RuleEvent event(Date eventDate, Date createdDate) {
+        return RuleEvent.create(
+                "test_event",
+                "test_program_stage",
+                ACTIVE,
+                eventDate,
+                createdDate,
+                new Date(),
+                "",
+                "",
+                Arrays.asList(
+                        RuleDataValue.create(eventDate, "test_program_stage","data_element", "1"),
+                        RuleDataValue.create(eventDate, "test_program_stage","data_element", "2"),
+                        RuleDataValue.create(eventDate, "test_program_stage","data_element", "3"),
+                        RuleDataValue.create(eventDate, "test_program_stage","data_element", "4"),
+                        RuleDataValue.create(eventDate, "test_program_stage","data_element", "5")
+                ),
+                "test_program_stage_name",
+                new Date()
+        );
+    }
+
+    private Map<String, List<RuleDataValueHistory>> allEventsDataValues() {
+        List<RuleDataValueHistory> ruleDataValues = new ArrayList<>(
+                Arrays.asList(
+                        todayDataValue(),
+                        yesterdayDataValueCreatedThisMorning(),
+                        yesterdayDataValueCreatedThisAfternoon(),
+                        tomorrowDataValue(),
+                        dayBeforeYesterdayDataValue()
+                )
+        );
+
+        ruleDataValues.sort(Comparator.comparing(RuleDataValueHistory::getEventDate)
+                .thenComparing(RuleDataValueHistory::getCreatedDate)
+                .reversed());
+
+        return Collections.singletonMap("data_element", ruleDataValues);
+    }
+
+    private RuleDataValueHistory todayDataValue() {
+        return new RuleDataValueHistory("1", todayInstant, todayInstant, "");
+    }
+
+    private RuleDataValueHistory yesterdayDataValueCreatedThisMorning() {
+        return new RuleDataValueHistory("2", yesterdayInstant, todayMorning, "");
+    }
+
+    private RuleDataValueHistory yesterdayDataValueCreatedThisAfternoon() {
+        return new RuleDataValueHistory("3", yesterdayInstant, todayAfternoon, "");
+    }
+
+    private RuleDataValueHistory dayBeforeYesterdayDataValue() {
+        return new RuleDataValueHistory("5", dayBeforeYesterdayInstant, todayAfternoon, "");
+    }
+
+    private RuleDataValueHistory tomorrowDataValue() {
+        return new RuleDataValueHistory("4", tomorrow, tomorrow, "");
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/hisp/dhis/rules/RuleVariableValueMapBuilderTest.java b/src/test/java/org/hisp/dhis/rules/RuleVariableValueMapBuilderTest.java
index c0af4368..d83dc9dd 100644
--- a/src/test/java/org/hisp/dhis/rules/RuleVariableValueMapBuilderTest.java
+++ b/src/test/java/org/hisp/dhis/rules/RuleVariableValueMapBuilderTest.java
@@ -77,7 +77,7 @@ public void currentEventVariableShouldContainNullValueForEnrollmentEvaluation()
                         RuleAttributeValue.create( "test_attribute_one", "test_attribute_value_one" ),
                         RuleAttributeValue.create( "test_attribute_two", "test_attribute_value_two" ) ), "" );
         RuleEvent contextEventOne = RuleEvent.create( "test_context_event_one", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                         RuleDataValue.create( eventDate, "test_program_stage",
                                 "test_dataelement_one", "test_context_value_one" ),
                         RuleDataValue.create( eventDate, "test_program_stage",
@@ -107,20 +107,20 @@ public void currentEventVariableShouldContainValuesFromCurrentEvent()
 
         // values from context ruleEvents should be ignored
         RuleEvent contextEventOne = RuleEvent.create( "test_context_event_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_one", "test_context_value_one" ),
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_two", "test_context_value_two" ) ), "", null);
         RuleEvent contextEventTwo = RuleEvent.create( "test_context_event_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_one", "test_context_value_three" ),
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_two", "test_context_value_four" ) ), "", null);
         // values from current ruleEvent should be propagated to the variable values
         RuleEvent currentEvent = RuleEvent.create( "test_event_uid", "test_program_stage",
-            RuleEvent.Status.ACTIVE, eventDate, dueDate, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, eventDate, new Date(), dueDate, "", null, Arrays.asList(
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_one", "test_value_one" ),
                 RuleDataValue.create( eventDate, "test_program_stage",
@@ -175,19 +175,19 @@ public void newestEventProgramVariableShouldContainValueFromNewestContextEvent()
         Date currentEventDueDate = null;
 
         RuleEvent oldestRuleEvent = RuleEvent.create( "test_event_uid_oldest", "test_program_stage",
-            RuleEvent.Status.ACTIVE, oldestEventDate, oldestEventDate, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, oldestEventDate, new Date(), oldestEventDate, "", null, Arrays.asList(
                 RuleDataValue.create( oldestEventDate, "test_program_stage",
                     "test_dataelement_one", "test_value_one_oldest" ),
                 RuleDataValue.create( oldestEventDate, "test_program_stage",
                     "test_dataelement_two", "test_value_two_oldest" ) ), "", null);
         RuleEvent newestRuleEvent = RuleEvent.create( "test_event_uid_newest", "test_program_stage",
-            RuleEvent.Status.ACTIVE, newestEventDate, newestEventDate, "", null, Arrays.asList(
-                RuleDataValue.create( newestEventDate, "test_program_stage",
+            RuleEvent.Status.ACTIVE, newestEventDate, new Date(), newestEventDate, "", null, Arrays.asList(
+                RuleDataValue.create( newestEventDate,"test_program_stage",
                     "test_dataelement_one", "test_value_one_newest" ),
                 RuleDataValue.create( newestEventDate, "test_program_stage",
                     "test_dataelement_two", "test_value_two_newest" ) ), "", null);
         RuleEvent currentEvent = RuleEvent.create( "test_event_uid_current", "test_program_stage",
-            RuleEvent.Status.ACTIVE, currentEventDate, currentEventDueDate, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, currentEventDate, new Date(), currentEventDueDate, "", null, Arrays.asList(
                 RuleDataValue.create( currentEventDate, "test_program_stage",
                     "test_dataelement_one", "test_value_one_current" ),
                 RuleDataValue.create( currentEventDate, "test_program_stage",
@@ -239,19 +239,19 @@ public void newestEventProgramVariableShouldReturnValuesFromCurrentEventWhenIfNe
         Date dateEventDueCurrent = dateFormat.parse( "2016-01-01" );
 
         RuleEvent firstRuleEvent = RuleEvent.create( "test_event_uid_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventOne, dateEventOne, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventOne, new Date(), dateEventOne, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventOne, "test_program_stage",
                     "test_dataelement_one", "test_value_dataelement_one_first" ),
                 RuleDataValue.create( dateEventOne, "test_program_stage",
                     "test_dataelement_two", "test_value_dataelement_two_first" ) ), "", null);
         RuleEvent secondRuleEvent = RuleEvent.create( "test_event_uid_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventTwo, dateEventTwo, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventTwo, new Date(), dateEventTwo, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventTwo, "test_program_stage",
                     "test_dataelement_one", "test_value_dataelement_one_second" ),
                 RuleDataValue.create( dateEventTwo, "test_program_stage",
                     "test_dataelement_two", "test_value_dataelement_two_second" ) ), "", null);
         RuleEvent currentEvent = RuleEvent.create( "test_event_uid_current", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventCurrent, dateEventDueCurrent, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventCurrent, new Date(), dateEventDueCurrent, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventCurrent, "test_program_stage",
                     "test_dataelement_one", "test_value_dataelement_one_current" ),
                 RuleDataValue.create( dateEventCurrent, "test_program_stage",
@@ -307,19 +307,19 @@ public void newestEventProgramStageVariableShouldContainValueFromNewestContextEv
         Date dateEventDueCurrent = dateFormat.parse( "2011-02-03" );
 
         RuleEvent eventOne = RuleEvent.create( "test_event_uid_one", "test_program_stage_one",
-            RuleEvent.Status.ACTIVE, dateEventOne, dateEventOne, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventOne, new Date(), dateEventOne, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventOne, "test_program_stage_one",
                     "test_dataelement", "test_value_one" ) ), "", null);
         RuleEvent eventTwo = RuleEvent.create( "test_event_uid_two", "test_program_stage_two",
-            RuleEvent.Status.ACTIVE, dateEventTwo, dateEventTwo, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventTwo, new Date(), dateEventTwo, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventTwo, "test_program_stage_two",
                     "test_dataelement", "test_value_two" ) ), "", null);
         RuleEvent eventThree = RuleEvent.create( "test_event_uid_three", "test_program_stage_two",
-            RuleEvent.Status.ACTIVE, dateEventThree, dateEventThree, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventThree, new Date(), dateEventThree, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventThree, "test_program_stage_two",
                     "test_dataelement", "test_value_three" ) ), "", null);
         RuleEvent eventCurrent = RuleEvent.create( "test_event_uid_current", "test_program_stage_one",
-            RuleEvent.Status.ACTIVE, dateEventCurrent, dateEventDueCurrent, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventCurrent, new Date(), dateEventDueCurrent, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventCurrent, "test_program_stage_one",
                     "test_dataelement", "test_value_current" ) ), "", null);
 
@@ -363,11 +363,11 @@ public void newestEventProgramStageVariableShouldNotContainAnyValues()
         Date dateEventTwo = dateFormat.parse( "2015-02-03" );
 
         RuleEvent ruleEventOne = RuleEvent.create( "test_event_uid_one", "test_program_stage_two",
-            RuleEvent.Status.ACTIVE, dateEventOne, dateEventOne, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventOne, new Date(), dateEventOne, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventOne, "test_program_stage_two",
                     "test_dataelement", "test_value_one" ) ), "", null);
         RuleEvent ruleEventTwo = RuleEvent.create( "test_event_uid_two", "test_program_stage_two",
-            RuleEvent.Status.ACTIVE, dateEventTwo, dateEventTwo, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventTwo, new Date(), dateEventTwo, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventTwo, "test_program_stage_two",
                     "test_dataelement", "test_value_two" ) ), "", null);
 
@@ -411,19 +411,19 @@ public void previousEventVariableShouldContainValuesFromPreviousEvent()
         Date dateEventCurrent = dateFormat.parse( "2014-05-03" );
 
         RuleEvent ruleEventOne = RuleEvent.create( "test_event_uid_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventOne, dateEventOne, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventOne, new Date(), dateEventOne, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventOne, "test_program_stage_one",
                     "test_dataelement", "test_value_one" ) ), "", null);
         RuleEvent ruleEventTwo = RuleEvent.create( "test_event_uid_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventTwo, dateEventTwo, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventTwo, new Date(), dateEventTwo, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventTwo, "test_program_stage_two",
                     "test_dataelement", "test_value_two" ) ), "", null);
         RuleEvent ruleEventThree = RuleEvent.create( "test_event_uid_three", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventThree, dateEventThree, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventThree, new Date(), dateEventThree, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventThree, "test_program_stage_two",
                     "test_dataelement", "test_value_three" ) ), "", null);
         RuleEvent ruleEventCurrent = RuleEvent.create( "test_event_uid_current", "test_program_stage",
-            RuleEvent.Status.ACTIVE, dateEventCurrent, dateEventCurrent, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, dateEventCurrent, new Date(), dateEventCurrent, "", null, Arrays.asList(
                 RuleDataValue.create( dateEventCurrent, "test_program_stage_one",
                     "test_dataelement", "test_value_current" ) ), "", null);
 
@@ -477,13 +477,13 @@ public void attributeVariableShouldContainValuesFromContextEnrollment()
 
         // values from context ruleEvents should be ignored
         RuleEvent contextEvent = RuleEvent.create( "test_context_event_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, eventDate, new Date(), "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, eventDate, new Date(), new Date(), "", null, Arrays.asList(
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_one", "test_context_value_one" ),
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_two", "test_context_value_two" ) ), "", null);
         RuleEvent currentEvent = RuleEvent.create( "test_event_uid", "test_program_stage",
-            RuleEvent.Status.ACTIVE, eventDate, eventDate, "", null, Arrays.asList(
+            RuleEvent.Status.ACTIVE, eventDate, new Date(), eventDate, "", null, Arrays.asList(
                 RuleDataValue.create( eventDate, "test_program_stage",
                     "test_dataelement_one", "test_value_one" ),
                 RuleDataValue.create( eventDate, "test_program_stage",
@@ -562,9 +562,9 @@ public void ruleEnrollmentValuesShouldBePropagatedToMapCorrectly()
                 RuleAttributeValue.create( "test_attribute_three", "test_attribute_value_three" ) ), "" );
 
         RuleEvent ruleEventOne = RuleEvent.create( "test_event_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
         RuleEvent ruleEventTwo = RuleEvent.create( "test_event_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null);
 
         Map<String, RuleVariableValue> valueMap = RuleVariableValueMapBuilder.target( ruleEnrollment )
             .ruleVariables( Arrays.asList( ruleVariableOne, ruleVariableTwo, ruleVariableThree ) )
@@ -630,10 +630,10 @@ public void MultipleMapBuilderShoulCreateCorrectMapForEnrollmentAndEvents()
         Date eventTwoDueDate = LocalDate.now().minusDays( 4 ).toDate();
 
         RuleEvent ruleEventOne = RuleEvent.create( "test_event_one", "test_program_stage",
-            RuleEvent.Status.ACTIVE, eventOneDate, eventOneDueDate, "", null, new ArrayList<RuleDataValue>(), "",
+            RuleEvent.Status.ACTIVE, eventOneDate, new Date(), eventOneDueDate, "", null, new ArrayList<RuleDataValue>(), "",
             null );
         RuleEvent ruleEventTwo = RuleEvent.create( "test_event_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, eventTwoDate, eventTwoDueDate, "", null, new ArrayList<RuleDataValue>(), "",
+            RuleEvent.Status.ACTIVE, eventTwoDate, new Date(), eventTwoDueDate, "", null, new ArrayList<RuleDataValue>(), "",
             null );
 
         RuleVariableValueMap ruleVariableValueMap = RuleVariableValueMapBuilder.target( ruleEnrollment )
@@ -765,7 +765,7 @@ public void MultipleMapBuilderShoulCreateCorrectMapForEnrollmentAndEvents()
     public void buildShouldThrowOnDuplicateEvent()
     {
         RuleEvent ruleEvent = RuleEvent.create( "test_event_two", "test_program_stage",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null );
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null, new ArrayList<RuleDataValue>(), "", null );
 
         RuleVariableValueMapBuilder.target( ruleEvent )
             .ruleVariables( new ArrayList<RuleVariable>() )
diff --git a/src/test/java/org/hisp/dhis/rules/VariableValueTypeTest.java b/src/test/java/org/hisp/dhis/rules/VariableValueTypeTest.java
index 26f28c51..315360c0 100644
--- a/src/test/java/org/hisp/dhis/rules/VariableValueTypeTest.java
+++ b/src/test/java/org/hisp/dhis/rules/VariableValueTypeTest.java
@@ -68,7 +68,7 @@ public void testNumericVariablesAreComparedCorrectly()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable, ruleVariable2 ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null,
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null,
                 Arrays.asList(RuleDataValue.create(new Date(), "", "test_data_element", "30"),
                         RuleDataValue.create(new Date(), "", "test_data_element2", "4")), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
@@ -93,7 +93,7 @@ public void testTextVariablesAreComparedCorrectly()
         RuleEngine ruleEngine = getRuleEngine( rule, Arrays.asList( ruleVariable, ruleVariable2 ) );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event", "test_program_stage",
-                RuleEvent.Status.ACTIVE, new Date(), new Date(), "", null,
+                RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", null,
                 Arrays.asList(RuleDataValue.create(new Date(), "", "test_data_element", "30"),
                         RuleDataValue.create(new Date(), "", "test_data_element2", "4")), "", null);
         List<RuleEffect> ruleEffects = ruleEngine.evaluate( ruleEvent ).call();
diff --git a/src/test/java/org/hisp/dhis/rules/models/CalculatedValueTest.java b/src/test/java/org/hisp/dhis/rules/models/CalculatedValueTest.java
index eebae2f4..157e2185 100644
--- a/src/test/java/org/hisp/dhis/rules/models/CalculatedValueTest.java
+++ b/src/test/java/org/hisp/dhis/rules/models/CalculatedValueTest.java
@@ -73,6 +73,7 @@ public void evaluateTenThousandRulesTest()
             .programStageName( "" )
             .status( RuleEvent.Status.ACTIVE )
             .eventDate( new Date() )
+            .createdDate( new Date() )
             .dueDate( new Date() )
             .organisationUnit( "" )
             .organisationUnitCode( "" )
@@ -116,6 +117,7 @@ public void sendMessageMustGetValueFromAssignAction()
             .programStageName( "" )
             .status( RuleEvent.Status.ACTIVE )
             .eventDate( new Date() )
+            .createdDate( new Date() )
             .dueDate( new Date() )
             .organisationUnit( "" )
             .organisationUnitCode( "" )
@@ -181,6 +183,7 @@ public void sendMessageMustGetValueFromAssignActionInSingleExecution()
             .programStageName( "" )
             .status( RuleEvent.Status.ACTIVE )
             .eventDate( new Date() )
+            .createdDate( new Date() )
             .dueDate( new Date() )
             .organisationUnit( "" )
             .organisationUnitCode( "" )
diff --git a/src/test/java/org/hisp/dhis/rules/models/RuleEventTest.java b/src/test/java/org/hisp/dhis/rules/models/RuleEventTest.java
index 9824a0bd..afbc08ca 100644
--- a/src/test/java/org/hisp/dhis/rules/models/RuleEventTest.java
+++ b/src/test/java/org/hisp/dhis/rules/models/RuleEventTest.java
@@ -25,14 +25,14 @@ public class RuleEventTest
     @Test( expected = IllegalStateException.class )
     public void createShouldThrowExceptionIfEventIsNull()
     {
-        RuleEvent.create( null, "test_programstage", RuleEvent.Status.ACTIVE,
+        RuleEvent.create( null, "test_programstage", RuleEvent.Status.ACTIVE, new Date(),
             new Date(), new Date(), null, null, Arrays.<RuleDataValue>asList(), "", null);
     }
 
     @Test( expected = IllegalStateException.class )
     public void createShouldThrowExceptionIfProgramStageIsNull()
     {
-        RuleEvent.create( "test_event", null, RuleEvent.Status.ACTIVE,
+        RuleEvent.create( "test_event", null, RuleEvent.Status.ACTIVE, new Date(),
             new Date(), new Date(), null, null, Arrays.<RuleDataValue>asList(), "", null);
     }
 
@@ -40,20 +40,20 @@ public void createShouldThrowExceptionIfProgramStageIsNull()
     public void createShouldThrowExceptionIfStatusIsNull()
     {
         RuleEvent.create( "test_event", "test_programstage", null,
-            new Date(), new Date(), null, null, Arrays.<RuleDataValue>asList(), "", null);
+            new Date(), new Date(), new Date(), null, null, Arrays.<RuleDataValue>asList(), "", null);
     }
 
     @Test( expected = IllegalStateException.class )
     public void createShouldThrowExceptionIfEventDateIsNull()
     {
-        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE,
+        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE, new Date(),
             null, new Date(), null, null, Arrays.<RuleDataValue>asList(), "", null);
     }
 
     @Test( expected = IllegalStateException.class )
     public void createShouldThrowExceptionIfDueDateIsNull()
     {
-        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE,
+        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE, new Date(),
             new Date(), null, null, null, Arrays.<RuleDataValue>asList(), "", null);
 
     }
@@ -61,7 +61,7 @@ public void createShouldThrowExceptionIfDueDateIsNull()
     @Test( expected = NullPointerException.class )
     public void createShouldThrowExceptionIfListOfDataValuesIsNull()
     {
-        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE, new Date(), new Date(),
+        RuleEvent.create( "test_event", "test_programstage", RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(),
             null, null, null, "", null);
 
     }
@@ -75,7 +75,7 @@ public void createShouldPropagateImmutableList()
         ruleDataValues.add( ruleDataValue );
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event_uid", "test_stage_uid",
-            RuleEvent.Status.ACTIVE, new Date(), new Date(), "", "", ruleDataValues, "", null);
+            RuleEvent.Status.ACTIVE, new Date(), new Date(), new Date(), "", "", ruleDataValues, "", null);
 
         // add another data value
         ruleDataValues.add( ruleDataValue );
@@ -98,7 +98,7 @@ public void createShouldPropagateValuesCorrectly()
         Date dueDate = new Date();
 
         RuleEvent ruleEvent = RuleEvent.create( "test_event_uid", "test_stage_uid",
-            RuleEvent.Status.ACTIVE, eventDate, dueDate, "", "", ruleDataValues, "", null);
+            RuleEvent.Status.ACTIVE, new Date(), eventDate, dueDate, "", "", ruleDataValues, "", null);
 
         assertThat( ruleEvent.event() ).isEqualTo( "test_event_uid" );
         assertThat( ruleEvent.status() ).isEqualTo( RuleEvent.Status.ACTIVE );
@@ -117,15 +117,19 @@ public void eventDateComparatorTest()
         SimpleDateFormat dateFormat = new SimpleDateFormat( DATE_PATTERN, Locale.US );
         List<RuleEvent> ruleEvents = Arrays.asList(
             RuleEvent.create( "test_event_one", "test_program_stage_one", RuleEvent.Status.ACTIVE,
-                dateFormat.parse( "2014-02-11" ), dateFormat.parse( "2014-02-11" ), "", null,
+                dateFormat.parse( "2014-02-11" ), new Date(), dateFormat.parse( "2014-02-11" ), "", null,
                 new ArrayList<RuleDataValue>(), "", null),
+                RuleEvent.create( "test_event_three", "test_program_stage_three", RuleEvent.Status.ACTIVE,
+                        dateFormat.parse( "2017-03-22" ), dateFormat.parse( "2018-03-22" ), dateFormat.parse( "2017-03-22" ), "", null,
+                        new ArrayList<RuleDataValue>(), "", null),
             RuleEvent.create( "test_event_two", "test_program_stage_two", RuleEvent.Status.ACTIVE,
-                dateFormat.parse( "2017-03-22" ), dateFormat.parse( "2017-03-22" ), "", null,
+                dateFormat.parse( "2017-03-22" ), dateFormat.parse( "2015-03-22" ), dateFormat.parse( "2017-03-22" ), "", null,
                 new ArrayList<RuleDataValue>(), "", null) );
 
         Collections.sort( ruleEvents, RuleEvent.EVENT_DATE_COMPARATOR );
 
-        assertThat( ruleEvents.get( 0 ).event() ).isEqualTo( "test_event_two" );
-        assertThat( ruleEvents.get( 1 ).event() ).isEqualTo( "test_event_one" );
+        assertThat( ruleEvents.get( 0 ).event() ).isEqualTo( "test_event_three" );
+        assertThat( ruleEvents.get( 1 ).event() ).isEqualTo( "test_event_two" );
+        assertThat( ruleEvents.get( 2 ).event() ).isEqualTo( "test_event_one" );
     }
 }
diff --git a/src/test/java/org/hisp/dhis/rules/models/RuleVariablePreviousEventTest.java b/src/test/java/org/hisp/dhis/rules/models/RuleVariablePreviousEventTest.java
deleted file mode 100644
index e062fd65..00000000
--- a/src/test/java/org/hisp/dhis/rules/models/RuleVariablePreviousEventTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.hisp.dhis.rules.models;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.util.ArrayList;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-@RunWith( JUnit4.class )
-public class RuleVariablePreviousEventTest
-{
-
-    @Test( expected = NullPointerException.class )
-    public void createShouldThrowOnNullName()
-    {
-        RuleVariablePreviousEvent.create( null, "test_dataelement", RuleValueType.TEXT, true, new ArrayList<>());
-    }
-
-    @Test( expected = NullPointerException.class )
-    public void createShouldThrowOnNullDataElement()
-    {
-        RuleVariablePreviousEvent.create( "test_variable", null, RuleValueType.TEXT, true, new ArrayList<>());
-    }
-
-    @Test( expected = NullPointerException.class )
-    public void createShouldThrowOnNullDataElementType()
-    {
-        RuleVariablePreviousEvent.create( "test_variable", "test_dataelement", null, true, new ArrayList<>());
-    }
-
-    @Test
-    public void createShouldPropagatePropertiesCorrectly()
-    {
-        RuleVariablePreviousEvent ruleVariablePreviousEvent = RuleVariablePreviousEvent.create(
-            "test_variable", "test_dataelement", RuleValueType.NUMERIC, true, new ArrayList<>());
-
-        assertThat( ruleVariablePreviousEvent.name() ).isEqualTo( "test_variable" );
-        assertThat( ruleVariablePreviousEvent.dataElement() ).isEqualTo( "test_dataelement" );
-        assertThat( ruleVariablePreviousEvent.dataElementType() ).isEqualTo( RuleValueType.NUMERIC );
-    }
-}
diff --git a/src/test/java/org/hisp/dhis/rules/util/MockRuleEvent.java b/src/test/java/org/hisp/dhis/rules/util/MockRuleEvent.java
index 49ee9823..b5e7ac77 100644
--- a/src/test/java/org/hisp/dhis/rules/util/MockRuleEvent.java
+++ b/src/test/java/org/hisp/dhis/rules/util/MockRuleEvent.java
@@ -39,6 +39,12 @@ public Date eventDate() {
         return null;
     }
 
+    @Nonnull
+    @Override
+    public Date createdDate() {
+        return null;
+    }
+
     @Nullable
     @Override
     public Date dueDate() {
diff --git a/src/test/java/org/hisp/dhis/rules/util/MockRuleVariable.java b/src/test/java/org/hisp/dhis/rules/util/MockRuleVariable.java
index a3ae5c91..ec6fa651 100644
--- a/src/test/java/org/hisp/dhis/rules/util/MockRuleVariable.java
+++ b/src/test/java/org/hisp/dhis/rules/util/MockRuleVariable.java
@@ -5,6 +5,7 @@
 import org.hisp.dhis.rules.RuleVariableValueMapBuilder;
 import org.hisp.dhis.rules.models.RuleAttributeValue;
 import org.hisp.dhis.rules.models.RuleDataValue;
+import org.hisp.dhis.rules.models.RuleDataValueHistory;
 import org.hisp.dhis.rules.models.RuleVariable;
 
 import javax.annotation.Nonnull;
@@ -31,7 +32,7 @@ public List<Option> options() {
     }
 
     @Override
-    public Map<String, RuleVariableValue> createValues(RuleVariableValueMapBuilder builder, Map<String, List<RuleDataValue>> allEventValues, Map<String, RuleAttributeValue> currentEnrollmentValues, Map<String, RuleDataValue> currentEventValues) {
+    public Map<String, RuleVariableValue> createValues(RuleVariableValueMapBuilder builder, Map<String, List<RuleDataValueHistory>> allEventValues, Map<String, RuleAttributeValue> currentEnrollmentValues, Map<String, RuleDataValue> currentEventValues) {
         return Map.of();
     }
 }

From 378332cc6d46fdc92129fd71a277f8f5a6d1c9fe Mon Sep 17 00:00:00 2001
From: Enrico <enrico@dhis2.org>
Date: Wed, 16 Oct 2024 09:56:34 +0200
Subject: [PATCH 3/3] Bump version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0d7f136d..edf29873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.hisp.dhis.rules</groupId>
     <artifactId>rule-engine</artifactId>
-    <version>2.1.8.1-SNAPSHOT</version>
+    <version>2.1.8.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>rule-engine</name>