Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

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.java
index 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.UpdateTimestamp
protected 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.groovy
index 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 ManagerContainer
globalRuleset.id == rulesetId
globalRuleset.version > 0
globalRuleset.createdOn.time < System.currentTimeMillis()
- globalRuleset.lastModified.time >= lastModified.time
+ globalRuleset.lastModified.time > lastModified.time
globalRuleset.name == "Renamed test global definition"
globalRuleset.rules == "SomeRulesCodeModified"
@@ -187,7 +187,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
realmRuleset.id == rulesetId
realmRuleset.version == 1
realmRuleset.createdOn.time < System.currentTimeMillis()
- lastModified.time < System.currentTimeMillis()
+ realmRuleset.lastModified.time > lastModified.time
realmRuleset.name == "Renamed test realm definition"
realmRuleset.rules == "SomeRulesCodeModified"
realmRuleset.realm == keycloakTestSetup.realmMaster.name
@@ -293,7 +293,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
assetRuleset.id == rulesetId
assetRuleset.version == 1
assetRuleset.createdOn.time < System.currentTimeMillis()
- lastModified.time < System.currentTimeMillis()
+ assetRuleset.lastModified.time > lastModified.time
assetRuleset.name == "Renamed test asset definition"
assetRuleset.rules == "SomeRulesCodeModified"
assetRuleset.assetId == managerTestSetup.smartOfficeId
@@ -484,7 +484,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
realmRuleset.id == rulesetId
realmRuleset.version == 1
realmRuleset.createdOn.time < System.currentTimeMillis()
- lastModified.time < System.currentTimeMillis()
+ realmRuleset.lastModified.time > lastModified.time
realmRuleset.name == "Renamed test realm definition"
realmRuleset.rules == "SomeRulesCodeModified"
realmRuleset.realm == keycloakTestSetup.realmMaster.name
@@ -583,7 +583,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
assetRuleset.id == rulesetId
assetRuleset.version == 1
assetRuleset.createdOn.time < System.currentTimeMillis()
- lastModified.time < System.currentTimeMillis()
+ assetRuleset.lastModified.time > lastModified.time
assetRuleset.name == "Renamed test asset definition"
assetRuleset.rules == "SomeRulesCodeModified"
assetRuleset.assetId == managerTestSetup.smartOfficeId
@@ -942,7 +942,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
assetRuleset.id == rulesetId
assetRuleset.version == 1
assetRuleset.createdOn.time < System.currentTimeMillis()
- lastModified.time < System.currentTimeMillis()
+ assetRuleset.lastModified.time > lastModified.time
assetRuleset.name == "Renamed test asset definition"
assetRuleset.rules == "SomeRulesCodeModified"
assetRuleset.assetId == managerTestSetup.apartment1Id