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
Fix bug where Ruleset lastModified would not be updated on changes (#1500)
Dominique Kleevenc853661d562e
diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.javaindex 68523f01f..41ef8fedd 100644--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java@@ -81,6 +81,7 @@ public abstract class Ruleset {@Temporal(TemporalType.TIMESTAMP)@Column(name = "LAST_MODIFIED", nullable = false, columnDefinition= "TIMESTAMP WITH TIME ZONE")+ @org.hibernate.annotations.UpdateTimestampprotected Date lastModified;@NotNull(message = "{Ruleset.name.NotNull}")diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex 2d1b18913..3ca732748 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -121,7 +121,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerglobalRuleset.id == rulesetIdglobalRuleset.version > 0globalRuleset.createdOn.time < System.currentTimeMillis()- globalRuleset.lastModified.time >= lastModified.time+ globalRuleset.lastModified.time > lastModified.timeglobalRuleset.name == "Renamed test global definition"globalRuleset.rules == "SomeRulesCodeModified"@@ -187,7 +187,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerrealmRuleset.id == rulesetIdrealmRuleset.version == 1realmRuleset.createdOn.time < System.currentTimeMillis()- lastModified.time < System.currentTimeMillis()+ realmRuleset.lastModified.time > lastModified.timerealmRuleset.name == "Renamed test realm definition"realmRuleset.rules == "SomeRulesCodeModified"realmRuleset.realm == keycloakTestSetup.realmMaster.name@@ -293,7 +293,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerassetRuleset.id == rulesetIdassetRuleset.version == 1assetRuleset.createdOn.time < System.currentTimeMillis()- lastModified.time < System.currentTimeMillis()+ assetRuleset.lastModified.time > lastModified.timeassetRuleset.name == "Renamed test asset definition"assetRuleset.rules == "SomeRulesCodeModified"assetRuleset.assetId == managerTestSetup.smartOfficeId@@ -484,7 +484,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerrealmRuleset.id == rulesetIdrealmRuleset.version == 1realmRuleset.createdOn.time < System.currentTimeMillis()- lastModified.time < System.currentTimeMillis()+ realmRuleset.lastModified.time > lastModified.timerealmRuleset.name == "Renamed test realm definition"realmRuleset.rules == "SomeRulesCodeModified"realmRuleset.realm == keycloakTestSetup.realmMaster.name@@ -583,7 +583,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerassetRuleset.id == rulesetIdassetRuleset.version == 1assetRuleset.createdOn.time < System.currentTimeMillis()- lastModified.time < System.currentTimeMillis()+ assetRuleset.lastModified.time > lastModified.timeassetRuleset.name == "Renamed test asset definition"assetRuleset.rules == "SomeRulesCodeModified"assetRuleset.assetId == managerTestSetup.smartOfficeId@@ -942,7 +942,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerassetRuleset.id == rulesetIdassetRuleset.version == 1assetRuleset.createdOn.time < System.currentTimeMillis()- lastModified.time < System.currentTimeMillis()+ assetRuleset.lastModified.time > lastModified.timeassetRuleset.name == "Renamed test asset definition"assetRuleset.rules == "SomeRulesCodeModified"assetRuleset.assetId == managerTestSetup.apartment1Id