100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Bug fix for rules validity (#807)
Jérôme Vervier9b65262ce98f
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex 5152ad678..d36f7fa36 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -19,21 +19,21 @@*/package org.openremote.manager.rules;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.hibernate.Session;import org.hibernate.jdbc.AbstractReturningWork;-import org.openremote.model.Container;-import org.openremote.model.ContainerService;import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;-import org.openremote.model.attribute.MetaMap;+import org.openremote.model.Container;+import org.openremote.model.ContainerService;import org.openremote.model.query.RulesetQuery;import org.openremote.model.rules.AssetRuleset;import org.openremote.model.rules.GlobalRuleset;-import org.openremote.model.rules.Ruleset;import org.openremote.model.rules.RealmRuleset;+import org.openremote.model.rules.Ruleset;import org.openremote.model.util.ValueUtil;import java.sql.Connection;@@ -290,7 +290,7 @@ public class RulesetStorageService implements ContainerService {ruleset.setLastModified(rs.getTimestamp("LAST_MODIFIED"));ruleset.setCreatedOn(rs.getTimestamp("CREATED_ON"));if (rs.getString("META") != null) {- ruleset.setMeta(ValueUtil.parse(rs.getString("META"), MetaMap.class).orElse(null));+ ruleset.setMeta(ValueUtil.parse(rs.getString("META"), ObjectNode.class).orElse(null));}if (query.fullyPopulate) {ruleset.setRules(rs.getString("RULES"));diff --git a/model/src/main/java/org/openremote/model/attribute/MetaMap.java b/model/src/main/java/org/openremote/model/attribute/MetaMap.javaindex a9cf76c76..f84b2b8c7 100644--- a/model/src/main/java/org/openremote/model/attribute/MetaMap.java+++ b/model/src/main/java/org/openremote/model/attribute/MetaMap.java@@ -22,6 +22,7 @@ package org.openremote.model.attribute;import com.fasterxml.jackson.core.JsonParser;import com.fasterxml.jackson.core.JsonToken;import com.fasterxml.jackson.databind.DeserializationContext;+import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.fasterxml.jackson.databind.deser.std.StdDeserializer;import com.fasterxml.jackson.databind.exc.InvalidFormatException;@@ -66,7 +67,7 @@ public class MetaMap extends NamedMap<MetaItem<?>> {Optional<ValueDescriptor<?>> valueDescriptor = ValueUtil.getMetaItemDescriptor(metaItemName).map(MetaItemDescriptor::getType);- Class valueType = valueDescriptor.map(ValueDescriptor::getType).orElseGet(() -> (Class) Object.class);+ Class valueType = valueDescriptor.map(ValueDescriptor::getType).orElseGet(() -> (Class) JsonNode.class);metaItem.setValue(jp.readValueAs(valueType));// Get the value descriptor from the value if it isn't known@@ -114,11 +115,6 @@ public class MetaMap extends NamedMap<MetaItem<?>> {return metaItem;}- public <T> void set(MetaItemDescriptor<T> descriptor, T value) {- MetaItem<T> metaItem = get(descriptor).orElse(new MetaItem<>(descriptor, null));- metaItem.setValue(value);- }-/*** Need to declare equals here as {@link com.vladmihalcea.hibernate.type.json.internal.JsonTypeDescriptor} uses* {@link Class#getDeclaredMethod} to find it...diff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.javaindex aa1326770..819eba088 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -19,6 +19,7 @@*/package org.openremote.model.rules;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.hibernate.annotations.Formula;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;@@ -130,7 +131,7 @@ public class AssetRuleset extends Ruleset {}@Override- public AssetRuleset setMeta(MetaMap meta) {+ public AssetRuleset setMeta(ObjectNode meta) {super.setMeta(meta);return this;}diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.javaindex 53d30b92a..911f68435 100644--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java@@ -19,6 +19,7 @@*/package org.openremote.model.rules;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;@@ -91,7 +92,7 @@ public class GlobalRuleset extends Ruleset {}@Override- public GlobalRuleset setMeta(MetaMap meta) {+ public GlobalRuleset setMeta(ObjectNode meta) {super.setMeta(meta);return this;}diff --git a/model/src/main/java/org/openremote/model/rules/RealmRuleset.java b/model/src/main/java/org/openremote/model/rules/RealmRuleset.javaindex 2fcabebac..922dad1b2 100644--- a/model/src/main/java/org/openremote/model/rules/RealmRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/RealmRuleset.java@@ -19,6 +19,7 @@*/package org.openremote.model.rules;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.model.attribute.MetaMap;import org.openremote.model.calendar.CalendarEvent;@@ -117,7 +118,7 @@ public class RealmRuleset extends Ruleset {}@Override- public RealmRuleset setMeta(MetaMap meta) {+ public RealmRuleset setMeta(ObjectNode meta) {super.setMeta(meta);return this;}diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.javaindex 2ba4f0409..665f347f0 100644--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java@@ -22,16 +22,16 @@ package org.openremote.model.rules;import com.fasterxml.jackson.annotation.JsonIgnore;import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;-import org.openremote.model.attribute.MetaItem;-import org.openremote.model.attribute.MetaMap;+import com.fasterxml.jackson.databind.node.BooleanNode;+import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.model.calendar.CalendarEvent;-import org.openremote.model.value.MetaItemDescriptor;-import org.openremote.model.value.ValueType;+import org.openremote.model.util.ValueUtil;import javax.persistence.*;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;import java.util.Date;+import java.util.Optional;import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;@@ -51,7 +51,10 @@ import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;})public abstract class Ruleset {- public static final MetaItemDescriptor<Boolean> SHOW_ON_LIST = new MetaItemDescriptor<>("showOnList", ValueType.BOOLEAN);+ public static final String SHOW_ON_LIST = "showOnList";+ public static final String CONTINUE_ON_ERROR = "continueOnError";+ public static final String VALIDITY = "validity";+ public static final String TRIGGER_ON_PREDICTED_DATA = "triggerOnPredictedData";public enum Lang {JAVASCRIPT,@@ -96,7 +99,7 @@ public abstract class Ruleset {@Column(name = "META", columnDefinition = "jsonb")@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_VALUE_TYPE)- protected MetaMap meta;+ protected ObjectNode meta;@Transientprotected RulesetStatus status;@@ -104,10 +107,6 @@ public abstract class Ruleset {@Transientprotected String error;- public static final MetaItemDescriptor<Boolean> CONTINUE_ON_ERROR = new MetaItemDescriptor<>("continueOnError", ValueType.BOOLEAN);- public static final MetaItemDescriptor<CalendarEvent> VALIDITY = new MetaItemDescriptor<>("validity", ValueType.CALENDAR_EVENT);- public static final MetaItemDescriptor<Boolean> TRIGGER_ON_PREDICTED_DATA = new MetaItemDescriptor<>("triggerOnPredictedData", ValueType.BOOLEAN);-protected Ruleset() {}@@ -201,14 +200,14 @@ public abstract class Ruleset {return this;}- public MetaMap getMeta() {+ public ObjectNode getMeta() {if (meta == null) {- meta = new MetaMap();+ meta = ValueUtil.createJsonObject();}return meta;}- public Ruleset setMeta(MetaMap meta) {+ public Ruleset setMeta(ObjectNode meta) {this.meta = meta;return this;}@@ -232,31 +231,40 @@ public abstract class Ruleset {}public boolean isContinueOnError() {- return getMeta().get(CONTINUE_ON_ERROR).flatMap(MetaItem::getValue).orElse(false);+ return Optional.ofNullable(getMeta().get(CONTINUE_ON_ERROR)).map(node -> node.asBoolean(false)).orElse(false);}public Ruleset setContinueOnError(boolean continueOnError) {- getMeta().set(CONTINUE_ON_ERROR, continueOnError);+ getMeta().set(CONTINUE_ON_ERROR, BooleanNode.valueOf(continueOnError));return this;}@JsonIgnorepublic CalendarEvent getValidity() {- return getMeta().get(VALIDITY).flatMap(MetaItem::getValue).orElse(null);+ return Optional.ofNullable(getMeta().get(VALIDITY)).map(node -> ValueUtil.convert(node, CalendarEvent.class)).orElse(null);}@JsonIgnorepublic Ruleset setValidity(CalendarEvent calendarEvent) {- getMeta().set(VALIDITY, calendarEvent);+ getMeta().set(VALIDITY, ValueUtil.getValue(calendarEvent, ObjectNode.class, true).orElse(null));return this;}public boolean isTriggerOnPredictedData() {- return getMeta().get(TRIGGER_ON_PREDICTED_DATA).flatMap(MetaItem::getValue).orElse(false);+ return Optional.ofNullable(getMeta().get(TRIGGER_ON_PREDICTED_DATA)).map(node -> node.asBoolean(false)).orElse(false);}public Ruleset setTriggerOnPredictedData(boolean triggerOnPredictedData) {- getMeta().set(TRIGGER_ON_PREDICTED_DATA, triggerOnPredictedData);+ getMeta().set(TRIGGER_ON_PREDICTED_DATA, BooleanNode.valueOf(triggerOnPredictedData));+ return this;+ }++ public boolean isShowOnList() {+ return Optional.ofNullable(getMeta().get(SHOW_ON_LIST)).map(node -> node.asBoolean(false)).orElse(false);+ }++ public Ruleset setShowOnList(boolean showOn) {+ getMeta().set(SHOW_ON_LIST, BooleanNode.valueOf(showOn));return this;}}diff --git a/model/src/main/java/org/openremote/model/util/ValueUtil.java b/model/src/main/java/org/openremote/model/util/ValueUtil.javaindex 2c360a5b1..8e72d7fe5 100644--- a/model/src/main/java/org/openremote/model/util/ValueUtil.java+++ b/model/src/main/java/org/openremote/model/util/ValueUtil.java@@ -581,6 +581,7 @@ public class ValueUtil {public static Optional<MetaItemDescriptor<?>> getMetaItemDescriptor(String name) {if (TextUtil.isNullOrEmpty(name)) return Optional.empty();+return metaItemDescriptors.stream().filter(mid -> mid.getName().equals(name)).findFirst();}@@ -636,27 +637,7 @@ public class ValueUtil {else if (valueClass == BigInteger.class) valueDescriptor = ValueType.BIG_INTEGER;else if (valueClass == BigDecimal.class) valueDescriptor = ValueType.BIG_NUMBER;else if (valueClass == Byte.class) valueDescriptor = ValueType.BYTE;- else if (Map.class.isAssignableFrom(valueClass)) {- Object firstElem = findFirstNonNullEntry((Map<?,?>)value);-- if (firstElem == null) valueDescriptor = ValueType.JSON_OBJECT;- else {- boolean elemIsArray = firstElem.getClass().isArray();- Class<?> elemClass = elemIsArray ? firstElem.getClass() : firstElem.getClass().getComponentType();- if (elemIsArray) {- valueDescriptor = elemClass == String.class ? ValueType.MULTIVALUED_TEXT_MAP : ValueType.JSON_OBJECT;- } else {- if (elemClass == String.class)- valueDescriptor = ValueType.TEXT_MAP;- else if (elemClass == Double.class || elemClass == Float.class)- valueDescriptor = ValueType.NUMBER_MAP;- else if (elemClass == Integer.class)- valueDescriptor = ValueType.TEXT_MAP;- else if (elemClass == Boolean.class)- valueDescriptor = ValueType.BOOLEAN_MAP;- }- }- }+ else if (Map.class.isAssignableFrom(valueClass)) valueDescriptor = ValueType.JSON_OBJECT;return isArray ? valueDescriptor.asArray() : valueDescriptor;}diff --git a/profile/dev-ui.yml b/profile/dev-ui.ymlindex f0d4edfd7..60bd50461 100644--- a/profile/dev-ui.yml+++ b/profile/dev-ui.yml@@ -45,6 +45,9 @@ services:file: deploy.ymlservice: managerimage: openremote/manager:${MANAGER_VERSION:-develop}+ build:+ context: ../manager/build/install/manager/+ dockerfile: Dockerfiledepends_on:postgresql:condition: service_healthydiff --git a/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java b/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.javaindex 970df468d..af3a9a3be 100644--- a/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java+++ b/setup/src/main/java/org/openremote/setup/demo/RulesDemoSetup.java@@ -22,16 +22,13 @@ package org.openremote.setup.demo;import org.apache.commons.io.IOUtils;import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Container;-import org.openremote.model.attribute.MetaItem;-import org.openremote.model.rules.Ruleset;import org.openremote.model.rules.RealmRuleset;+import org.openremote.model.rules.Ruleset;import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.util.logging.Logger;-import static org.openremote.model.rules.Ruleset.SHOW_ON_LIST;-public class RulesDemoSetup extends ManagerSetup {private static final Logger LOG = Logger.getLogger(RulesDemoSetup.class.getName());@@ -57,9 +54,7 @@ public class RulesDemoSetup extends ManagerSetup {String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);Ruleset ruleset = new RealmRuleset(keycloakDemoSetup.realmCity.getName(), "De Kuip", Ruleset.Lang.JSON, rules- ).setAccessPublicRead(true);- ruleset.getMeta().addOrReplace(- new MetaItem<>(SHOW_ON_LIST));+ ).setAccessPublicRead(true).setShowOnList(true);realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();}@@ -67,9 +62,7 @@ public class RulesDemoSetup extends ManagerSetup {String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);Ruleset ruleset = new RealmRuleset(keycloakDemoSetup.realmCity.getName(), "Euromast", Ruleset.Lang.JSON, rules- ).setAccessPublicRead(true);- ruleset.getMeta().addOrReplace(- new MetaItem<>(SHOW_ON_LIST));+ ).setAccessPublicRead(true).setShowOnList(true);realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();}@@ -77,9 +70,7 @@ public class RulesDemoSetup extends ManagerSetup {String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);Ruleset ruleset = new RealmRuleset(keycloakDemoSetup.realmCity.getName(), "Markthal", Ruleset.Lang.JSON, rules- ).setAccessPublicRead(true);- ruleset.getMeta().addOrReplace(- new MetaItem<>(SHOW_ON_LIST));+ ).setAccessPublicRead(true).setShowOnList(true);realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();}diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex de8805b13..e6fbbb6c6 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -238,7 +238,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer"Throw Failure Exception",GROOVY,getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text)- ruleset.getMeta().add(new MetaItem<>(Ruleset.CONTINUE_ON_ERROR, true))+ .setContinueOnError(true)ruleset = rulesetStorageService.merge(ruleset)then: "the realms A rule engine should run with one deployment as error"diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovyindex 04a901e88..0f7506bc7 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy@@ -3,17 +3,14 @@ package org.openremote.test.rulesimport org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesServiceimport org.openremote.manager.rules.RulesetStorageService-import org.openremote.test.setup.KeycloakTestSetup-import org.openremote.test.setup.ManagerTestSetup-import org.openremote.model.attribute.MetaItem-import org.openremote.model.attribute.MetaMapimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRuleset-import org.openremote.model.rules.Rulesetimport org.openremote.model.rules.RealmRuleset+import org.openremote.model.rules.Ruleset+import org.openremote.test.setup.KeycloakTestSetup+import org.openremote.test.setup.ManagerTestSetupimport static org.openremote.model.rules.Ruleset.Lang.GROOVY-import static org.openremote.model.rules.Ruleset.SHOW_ON_LISTimport static org.openremote.model.rules.RulesetStatus.DEPLOYEDclass BasicRulesImport {@@ -84,7 +81,7 @@ class BasicRulesImport {"Some apartment 2 demo rules",GROOVY,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)- .setMeta(new MetaMap(Collections.singletonList(new MetaItem<>(SHOW_ON_LIST))))+ .setShowOnList(true)apartment2RulesetId = rulesetStorageService.merge(ruleset).idruleset = new AssetRuleset(diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex 5a859e1a0..dd3f77a51 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -5,9 +5,7 @@ import org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.setup.SetupServiceimport org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetup-import org.openremote.model.attribute.MetaItemimport org.openremote.model.rules.*-import org.openremote.model.value.MetaItemTypeimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions@@ -20,7 +18,6 @@ import static org.openremote.model.Constants.*import static org.openremote.model.rules.Ruleset.Lang.GROOVYimport static org.openremote.model.rules.Ruleset.Lang.JAVASCRIPTimport static org.openremote.model.rules.Ruleset.Lang.JSON-import static org.openremote.model.rules.Ruleset.SHOW_ON_LISTclass BasicRulesetResourceTest extends Specification implements ManagerContainerTrait {@@ -89,7 +86,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerruleDefinitions.length == 1ruleDefinitions[0].name == "Some apartment 2 demo rules"ruleDefinitions[0].lang == GROOVY- ruleDefinitions[0].meta.getValue(SHOW_ON_LIST).orElse(false)+ (ruleDefinitions[0] as AssetRuleset).isShowOnList()/* ############################################## WRITE ####################################### */@@ -927,7 +924,6 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainermanagerTestSetup.apartment1Id,"Test asset definition",JAVASCRIPT, "SomeRulesCode")- assetRuleset.getMeta().add(new MetaItem<>(MetaItemType.SHOW_ON_DASHBOARD, true))rulesetResource.createAssetRuleset(null, assetRuleset)def rulesetId = rulesetResource.getAssetRulesets(null, managerTestSetup.apartment1Id, null, false)[1].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -941,7 +937,6 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerassetRuleset.name == "Test asset definition"assetRuleset.rules == "SomeRulesCode"assetRuleset.assetId == managerTestSetup.apartment1Id- assetRuleset.meta.getValue(MetaItemType.SHOW_ON_DASHBOARD).orElse(false)and: "the ruleset should reach the engine"conditions.eventually {diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex 3953baec6..2f6bc92a8 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -386,7 +386,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {Date.from(validityStart),Date.from(validityEnd),recur)- ruleset.getMeta().add(new MetaItem<Object>(Ruleset.VALIDITY ,calendarEvent))+ ruleset.setValidity(calendarEvent)ruleset = rulesetStorageService.merge(ruleset)then: "the ruleset should be redeployed and paused until 1st occurrence"diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex cccefbd57..ce90437a9 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -2,6 +2,9 @@ package org.openremote.test.rules.residenceimport com.google.firebase.messaging.Message+import net.fortuna.ical4j.model.Date+import net.fortuna.ical4j.model.Recur+import net.fortuna.ical4j.model.parameter.Valueimport org.openremote.agent.protocol.simulator.SimulatorProtocolimport org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingService@@ -10,9 +13,12 @@ import org.openremote.manager.notification.NotificationServiceimport org.openremote.manager.notification.PushNotificationHandlerimport org.openremote.manager.rules.RulesEngineimport org.openremote.manager.rules.RulesService+import org.openremote.manager.rules.RulesetDeploymentimport org.openremote.manager.rules.RulesetStorageServiceimport org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapterimport org.openremote.manager.setup.SetupService+import org.openremote.model.calendar.CalendarEvent+import org.openremote.model.rules.RulesetStatusimport org.openremote.test.setup.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRef@@ -32,6 +38,12 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions+import java.time.Clock+import java.time.Instant+import java.time.Period+import java.time.ZoneId+import java.time.ZoneOffset+import java.time.temporal.ChronoUnitimport java.util.concurrent.TimeUnitimport static org.openremote.test.setup.ManagerTestSetup.DEMO_RULE_STATES_APARTMENT_1@@ -87,7 +99,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerComanagerTestSetup.apartment1Id,"Demo Apartment - Notify Alarm Trigger",Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy").text)- rulesetStorageService.merge(ruleset)+ ruleset = rulesetStorageService.merge(ruleset)expect: "the rule engines to become available and be running"conditions.eventually {@@ -236,6 +248,98 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoassert notificationIds.size() == 2}+ when: "a validity period is added to the ruleset that enables the ruleset for the next day of the week repeating for 2 weeks"+ stopPseudoClock()+ def tomorrowMidnight = Instant.ofEpochMilli(getClockTimeOf(container)).truncatedTo(ChronoUnit.DAYS).plus(1, ChronoUnit.DAYS)+ def from = tomorrowMidnight.plus(6, ChronoUnit.HOURS)+ def to = tomorrowMidnight.plus(8, ChronoUnit.HOURS)+ def recur = new Recur(Recur.WEEKLY, 2)+ def validity = new CalendarEvent(from.atZone(ZoneOffset.UTC).toDate(), to.atZone(ZoneOffset.UTC).toDate(), recur)+ ruleset.setValidity(validity)+ rulesetStorageService.merge(ruleset)+ ruleset = rulesetStorageService.find(AssetRuleset.class, ruleset.id)++ then: "the ruleset should have saved successfully and the validity should also have been stored"+ assert ruleset != null+ assert ruleset.getValidity() != null+ assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).key == from.toEpochMilli()+ assert ruleset.getValidity().getNextOrActiveFromTo(new Date(getClockTimeOf(container))).value == to.toEpochMilli()+ assert ruleset.getValidity().getRecurrence() != null+ def recurrenceList = ruleset.getValidity().getRecurrence().getDates(new net.fortuna.ical4j.model.Date(getClockTimeOf(container)), new net.fortuna.ical4j.model.Period(new net.fortuna.ical4j.model.DateTime(new Date(getClockTimeOf(container))), new net.fortuna.ical4j.model.DateTime(tomorrowMidnight.plus(30, ChronoUnit.DAYS).toDate())), Value.DATE)+ assert recurrenceList.size() == 2++ and: "the ruleset state should be deployed and paused"+ RulesetDeployment rulesetDeployment+ conditions.eventually {+ apartment1Engine = rulesService.assetEngines.get(managerTestSetup.apartment1Id)+ assert apartment1Engine != null+ assert apartment1Engine.isRunning()+ assert apartment1Engine.deployments.size() == 1+ rulesetDeployment = apartment1Engine.deployments.get(ruleset.getId())+ assert rulesetDeployment != null+ assert rulesetDeployment.status == RulesetStatus.PAUSED+ assert apartment1Engine.pauseTimers.size() == 0+ assert apartment1Engine.unpauseTimers.size() == 1+ // Assert scheduled future delay is correct+ assert from.toEpochMilli() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000+ }++ when: "time advances to within the first valid time period"+ advancePseudoClock((from.toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ apartment1Engine.unPauseRuleset(rulesetDeployment)++ then: "the ruleset status should be un-paused"+ conditions.eventually {+ assert rulesetDeployment.status == RulesetStatus.DEPLOYED+ }++ and: "the next pause of the ruleset should be scheduled"+ assert apartment1Engine.pauseTimers.size() == 1+ assert apartment1Engine.unpauseTimers.size() == 0+ // Assert scheduled future delay is correct+ assert to.toEpochMilli() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000++ when: "time advances past the first expiry the ruleset is paused again"+ advancePseudoClock((to.toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ apartment1Engine.pauseRuleset(rulesetDeployment)++ then: "the ruleset status should be paused"+ conditions.eventually {+ assert rulesetDeployment.status == RulesetStatus.PAUSED+ }++ and: "the next unpause of the ruleset should be scheduled"+ assert apartment1Engine.pauseTimers.size() == 0+ assert apartment1Engine.unpauseTimers.size() == 1+ // Assert scheduled future delay is correct+ assert from.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.unpauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000++ when: "time advances to within the next valid time period"+ advancePseudoClock((from.plus(7, ChronoUnit.DAYS).toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ apartment1Engine.unPauseRuleset(rulesetDeployment)++ then: "the ruleset status should be un-paused"+ conditions.eventually {+ assert rulesetDeployment.status == RulesetStatus.DEPLOYED+ }++ and: "the next pause of the ruleset should be scheduled"+ assert apartment1Engine.pauseTimers.size() == 1+ assert apartment1Engine.unpauseTimers.size() == 0+ // Assert scheduled future delay is correct+ assert to.plus(7, ChronoUnit.DAYS).toEpochMilli() - getClockTimeOf(container) - apartment1Engine.pauseTimers.get(ruleset.getId()).getDelay(TimeUnit.MILLISECONDS) <= 10000++ when: "time advances past the second expiry the ruleset is paused again"+ advancePseudoClock((to.plus(7, ChronoUnit.DAYS).toEpochMilli()-getClockTimeOf(container))+10000, TimeUnit.MILLISECONDS, container)+ apartment1Engine.pauseRuleset(rulesetDeployment)++ then: "the ruleset status should be expired"+ conditions.eventually {+ assert rulesetDeployment.status == RulesetStatus.EXPIRED+ assert apartment1Engine.pauseTimers.size() == 0+ assert apartment1Engine.unpauseTimers.size() == 0+ }+cleanup: "the mock is removed"notificationService.notificationHandlerMap.put(pushNotificationHandler.getTypeName(), pushNotificationHandler)TemporaryFact.GUARANTEED_MIN_EXPIRATION_MILLIS = expirationMillis