Skip to content

armgit / core

Public Imported from GitHub
0

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

JSON Rules: Fix issues with linkedUsers action target (#1223)

Rich Turnerbc4958241dc0
diff --git a/gradle.properties b/gradle.properties
index 99e4863c3..5d178ec40 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ flywaydbVersion = 9.15.1
ical4jVersion = 3.2.6
friendlyIdVersion = 1.0.1
geotoolsVersion = 19.1
-firebaseAdminVersion = 9.1.1
+firebaseAdminVersion = 9.2.0
jakartaMailVersion = 2.0.1
jaywayJsonPathVersion = 2.7.0
typescriptGeneratorVersion = 3.2.1263
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 7eac0f420..4f79f3e29 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -1060,7 +1060,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
assetId != null ? Collections.singletonList(assetId) : null);
}
- public List<UserAssetLink> findUserAssetLinks(String realm, List<String> userIds, List<String> assetIds) {
+ public List<UserAssetLink> findUserAssetLinks(String realm, Collection<String> userIds, Collection<String> assetIds) {
if (realm == null && (userIds == null || userIds.isEmpty()) && (assetIds == null || assetIds.isEmpty())) {
return Collections.emptyList();
@@ -1070,7 +1070,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
buildFindUserAssetLinksQuery(em, realm, userIds, assetIds).getResultList());
}
- protected TypedQuery<UserAssetLink> buildFindUserAssetLinksQuery(EntityManager em, String realm, List<String> userIds, List<String> assetIds) {
+ protected TypedQuery<UserAssetLink> buildFindUserAssetLinksQuery(EntityManager em, String realm, Collection<String> userIds, Collection<String> assetIds) {
StringBuilder sb = new StringBuilder();
Map<String, Object> parameters = new HashMap<>(3);
sb.append("select ua from UserAssetLink ua where 1=1");
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
index b5afe5342..560355978 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
@@ -220,6 +220,8 @@ public class NotificationService extends RouteBuilder implements ContainerServic
if (mappedTargetsList == null || mappedTargetsList.isEmpty()) {
throw new NotificationProcessingException(MISSING_TARGETS, "Notification targets must be set");
+ } else if (LOG.isLoggable(Level.FINER)) {
+ LOG.finer("Notification targets mapped from: [" + (notification.getTargets() != null ? notification.getTargets().stream().map(Object::toString).collect(Collectors.joining(",")) : "null") + "to: [" + mappedTargetsList.stream().map(Object::toString).collect(Collectors.joining(",")) + "]");
}
// Filter targets based on repeat frequency
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 550c7dcf5..5fa938415 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -24,6 +24,7 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.model.PersistenceEvent;
import org.openremote.model.asset.Asset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.geo.GeoJSONPoint;
import org.openremote.model.notification.EmailNotificationMessage;
@@ -538,7 +539,7 @@ public class JsonRulesBuilder extends RulesBuilder {
final protected Map<String, RuleState> ruleStateMap = new HashMap<>();
final protected JsonRule[] jsonRules;
final protected Ruleset jsonRuleset;
- final protected Logger LOG;
+ protected static Logger LOG;
public JsonRulesBuilder(Logger logger, Ruleset ruleset, TimerService timerService,
AssetStorageService assetStorageService, ScheduledExecutorService executorService,
@@ -766,107 +767,169 @@ public class JsonRulesBuilder extends RulesBuilder {
if (ruleAction instanceof RuleActionNotification notificationAction) {
- if (notificationAction.notification != null) {
+ if (notificationAction.notification == null || notificationAction.notification.getMessage() == null) {
+ LOG.info("Notification action has no notification and/or message set so cannot complete action: " + jsonRuleset);
+ return null;
+ }
+
+ Notification notification = ValueUtil.clone(notificationAction.notification);
+ String body;
+ boolean linkedUsersTarget = ruleAction.target != null && ruleAction.target.linkedUsers != null && ruleAction.target.linkedUsers;
+ boolean isEmail = Objects.equals(notification.getMessage().getType(), EmailNotificationMessage.TYPE);
+ boolean isPush = Objects.equals(notification.getMessage().getType(), PushNotificationMessage.TYPE);
+ boolean isHtml;
+
+ if (isEmail) {
+ EmailNotificationMessage email = (EmailNotificationMessage) notification.getMessage();
+ isHtml = !TextUtil.isNullOrEmpty(email.getHtml());
+ body = isHtml ? email.getHtml() : email.getText();
+ } else {
+ isHtml = false;
+ if (isPush) {
+ PushNotificationMessage pushNotificationMessage = (PushNotificationMessage) notification.getMessage();
+ body = pushNotificationMessage.getBody();
+ } else {
+ body = null;
+ }
+ }
- Notification notification = notificationAction.notification;
+ // Transfer the rule action target into notification targets
+ Notification.TargetType targetType = Notification.TargetType.ASSET;
+ if (ruleAction.target != null) {
+ if (ruleAction.target.users != null
+ && ruleAction.target.conditionAssets == null
+ && ruleAction.target.assets == null
+ && ruleAction.target.matchedAssets == null) {
+ targetType = Notification.TargetType.USER;
+ } else if (ruleAction.target.custom != null
+ && ruleAction.target.conditionAssets == null
+ && ruleAction.target.assets == null
+ && ruleAction.target.matchedAssets == null) {
+ targetType = Notification.TargetType.CUSTOM;
+ }
+ }
- if (notification.getMessage() != null) {
- String body = null;
+ Collection<String> targetIds;
+ boolean bodyContainsTriggeredAssetInfo = !TextUtil.isNullOrEmpty(body) && body.contains(PLACEHOLDER_TRIGGER_ASSETS);
- boolean isEmail = Objects.equals(notification.getMessage().getType(), EmailNotificationMessage.TYPE);
- boolean isPush = Objects.equals(notification.getMessage().getType(), PushNotificationMessage.TYPE);
+ if (linkedUsersTarget) {
+ targetType = Notification.TargetType.USER;
- boolean isHtml = false;
+ // Find users linked to the matched assets
+ Set<String> assetIds = useUnmatched ? ruleState.otherwiseMatchedAssetIds : ruleState.thenMatchedAssetIds;
+ List<String> userIds = assetIds == null || assetIds.isEmpty()
+ ? Collections.emptyList()
+ : usersFacade.getResults(new UserQuery().assets(assetIds.toArray(String[]::new))).toList();
- if (isEmail) {
- EmailNotificationMessage email = (EmailNotificationMessage) notification.getMessage();
- isHtml = !TextUtil.isNullOrEmpty(email.getHtml());
- body = isHtml ? email.getHtml() : email.getText();
- } else if (isPush) {
- PushNotificationMessage pushNotificationMessage = (PushNotificationMessage) notification.getMessage();
- body = pushNotificationMessage.getBody();
- }
+ if (userIds.isEmpty()) {
+ LOG.info("No users linked to matched assets for triggered rule so nothing to do: " + jsonRuleset);
+ return null;
+ }
- if (!TextUtil.isNullOrEmpty(body)) {
- if (body.contains(PLACEHOLDER_TRIGGER_ASSETS)) {
- // Need to clone the notification
- notification = ValueUtil.clone(notification);
- String triggeredAssetInfo = buildTriggeredAssetInfo(useUnmatched, ruleState, isHtml, false);
- body = body.replace(PLACEHOLDER_TRIGGER_ASSETS, triggeredAssetInfo);
-
- if (isEmail) {
- EmailNotificationMessage email = (EmailNotificationMessage) notification.getMessage();
- if (isHtml) {
- email.setHtml(body);
- } else {
- email.setText(body);
- }
- } else if (isPush) {
- PushNotificationMessage pushNotificationMessage = (PushNotificationMessage) notification.getMessage();
- pushNotificationMessage.setBody(body);
+ if (!bodyContainsTriggeredAssetInfo) {
+ // Nothing user specific in the notification body so same notification can be sent to all users
+ targetIds = userIds;
+ } else {
+ // Linked users target requires special handling when asset trigger info is included in the body, in this
+ // situation a notification is produced for each linked user with the body containing only assets that they are linked to.
+ LOG.finer(() -> "Mapped target user IDs: " + String.join(",", userIds));
+
+ // Get the user(s) asset links so we can group the matched assets by user
+ String realm = getRealm();
+ List<UserAssetLink> userAssetLinks = assetStorageService.findUserAssetLinks(realm, userIds, assetIds);
+
+ // Generate a custom notification for each linked user
+ String finalBody = body;
+ Collection<Notification> customNotifications = userIds.stream().map(userId -> {
+ // Extract asset states for matched asset IDs that are linked to this user
+ Map<String, Set<AssetState<?>>> assetStates = getMatchedAssetStates(ruleState, useUnmatched, userAssetLinks, userId);
+
+ Notification customNotification = ValueUtil.clone(notification);
+ String newBody = insertTriggeredAssetInfo(finalBody, assetStates, isHtml, false);
+
+ if (isEmail) {
+ EmailNotificationMessage email = (EmailNotificationMessage) customNotification.getMessage();
+ if (isHtml) {
+ email.setHtml(newBody);
+ } else {
+ email.setText(newBody);
}
+ } else if (isPush) {
+ PushNotificationMessage pushNotificationMessage = (PushNotificationMessage) customNotification.getMessage();
+ pushNotificationMessage.setBody(newBody);
}
- }
- }
- // Transfer the rule action target into notification targets
- Notification.TargetType targetType = Notification.TargetType.ASSET;
- if (ruleAction.target != null) {
- if (ruleAction.target.users != null
- && ruleAction.target.conditionAssets == null
- && ruleAction.target.assets == null
- && ruleAction.target.matchedAssets == null) {
- targetType = Notification.TargetType.USER;
- } else if (ruleAction.target.linkedUsers != null && ruleAction.target.linkedUsers) {
- targetType = Notification.TargetType.USER;
- } else if (ruleAction.target.custom != null
- && ruleAction.target.conditionAssets == null
- && ruleAction.target.assets == null
- && ruleAction.target.matchedAssets == null) {
- targetType = Notification.TargetType.CUSTOM;
- }
+ customNotification.setTargets(new Notification.Target(Notification.TargetType.USER, userId));
+ return customNotification;
+ }).toList();
+
+ return new RuleActionExecution(() ->
+ customNotifications.forEach(customNotification -> {
+ log(Level.FINE, "Sending custom user notification for rule action: " + rule.name + " '" + actionsName + "' action index " + index + " [Targets=" + (customNotification.getTargets() != null ? customNotification.getTargets().stream().map(Object::toString).collect(Collectors.joining(",")) : "null") + "]");
+ notificationsFacade.send(customNotification);
+ }), 0);
}
+ } else {
+ targetIds = getRuleActionTargetIds(ruleAction.target, useUnmatched, ruleState, assetsFacade, usersFacade, facts);
+ }
- Collection<String> ids = getRuleActionTargetIds(ruleAction.target, useUnmatched, ruleState, assetsFacade, usersFacade, facts);
+ if (targetIds == null) {
+ notification.setTargets((List<Notification.Target>)null);
+ } else {
+ Notification.TargetType finalTargetType = targetType;
+ notification.setTargets(targetIds.stream().map(id -> new Notification.Target(finalTargetType, id)).collect(Collectors.toList()));
+ }
- if (ids == null) {
- notification.setTargets((List<Notification.Target>)null);
- } else {
- Notification.TargetType finalTargetType = targetType;
- notification.setTargets(ids.stream().map(id -> new Notification.Target(finalTargetType, id)).collect(Collectors.toList()));
- }
+ // Inject triggered asset info if needed
+ if (bodyContainsTriggeredAssetInfo) {
+ // Extract asset states for matched asset IDs
+ Map<String, Set<AssetState<?>>> assetStates = getMatchedAssetStates(ruleState, useUnmatched, null, null);
+ body = insertTriggeredAssetInfo(body, assetStates, isHtml, false);
- log(Level.FINE, "Sending notification for rule action: " + rule.name + " '" + actionsName + "' action index " + index);
- Notification finalNotification = notification;
- return new RuleActionExecution(() -> notificationsFacade.send(finalNotification), 0);
+ if (isEmail) {
+ EmailNotificationMessage email = (EmailNotificationMessage) notification.getMessage();
+ if (isHtml) {
+ email.setHtml(body);
+ } else {
+ email.setText(body);
+ }
+ } else if (isPush) {
+ PushNotificationMessage pushNotificationMessage = (PushNotificationMessage) notification.getMessage();
+ pushNotificationMessage.setBody(body);
+ }
}
+
+ log(Level.FINE, "Sending notification for rule action: " + rule.name + " '" + actionsName + "' action index " + index + " [Targets=" + (notification.getTargets() != null ? notification.getTargets().stream().map(Object::toString).collect(Collectors.joining(",")) : "null") + "]");
+ return new RuleActionExecution(() -> notificationsFacade.send(notification), 0);
}
if (ruleAction instanceof RuleActionWebhook webhookAction) {
- Webhook webhook = webhookAction.webhook;
- if (webhook.getUrl() != null && webhook.getHttpMethod() != null) {
-
- // Replace %TRIGGER_ASSETS% with the triggered assets in JSON format.
- if (!TextUtil.isNullOrEmpty(webhook.getPayload()) && webhook.getPayload().contains(PLACEHOLDER_TRIGGER_ASSETS)) {
- String triggeredAssetInfo = buildTriggeredAssetInfo(useUnmatched, ruleState, false, true);
- webhook.setPayload(webhook.getPayload()
- .replace(('"' + PLACEHOLDER_TRIGGER_ASSETS + '"'), triggeredAssetInfo)
- .replace(PLACEHOLDER_TRIGGER_ASSETS, triggeredAssetInfo)
- );
- }
+ if (webhookAction.webhook.getUrl() == null || webhookAction.webhook.getHttpMethod() == null) {
+ LOG.info("Webhook action has no URL and/or HTTP method set so cannot complete action: " + jsonRuleset);
+ return null;
+ }
- if (webhookAction.mediaType == null) {
- Optional<Map.Entry<String, List<String>>> contentTypeHeader = webhook.getHeaders().entrySet().stream().filter((entry) -> entry.getKey().equalsIgnoreCase("content-type")).findFirst();
- String contentType = contentTypeHeader.isPresent() ? contentTypeHeader.get().getValue().get(0) : MediaType.APPLICATION_JSON;
- webhookAction.mediaType = MediaType.valueOf(contentType);
- }
+ // Clone webhook due to mutation
+ Webhook webhook = ValueUtil.clone(webhookAction.webhook);
- if(webhookAction.target == null) {
- webhookAction.target = webhooksFacade.buildTarget(webhook);
- }
+ // Replace %TRIGGER_ASSETS% with the triggered assets in JSON format.
+ if (!TextUtil.isNullOrEmpty(webhook.getPayload()) && webhook.getPayload().contains(PLACEHOLDER_TRIGGER_ASSETS)) {
+ Map<String, Set<AssetState<?>>> assetStates = getMatchedAssetStates(ruleState, useUnmatched, null, null);
+ String triggeredAssetInfoPayload = insertTriggeredAssetInfo(webhook.getPayload(), assetStates, false, true);
+ webhook.setPayload(triggeredAssetInfoPayload);
+ }
- return new RuleActionExecution(() -> webhooksFacade.send(webhook, webhookAction.mediaType, webhookAction.target), 0);
+ if (webhookAction.mediaType == null) {
+ Optional<Map.Entry<String, List<String>>> contentTypeHeader = webhook.getHeaders().entrySet().stream().filter((entry) -> entry.getKey().equalsIgnoreCase("content-type")).findFirst();
+ String contentType = contentTypeHeader.isPresent() ? contentTypeHeader.get().getValue().get(0) : MediaType.APPLICATION_JSON;
+ webhookAction.mediaType = MediaType.valueOf(contentType);
}
+
+ if(webhookAction.target == null) {
+ webhookAction.target = webhooksFacade.buildTarget(webhook);
+ }
+
+ return new RuleActionExecution(() -> webhooksFacade.send(webhook, webhookAction.mediaType, webhookAction.target), 0);
}
if (ruleAction instanceof RuleActionWriteAttribute attributeAction) {
@@ -1029,16 +1092,12 @@ public class JsonRulesBuilder extends RulesBuilder {
return null;
}
- private String buildTriggeredAssetInfo(boolean useUnmatched, RuleState ruleEvaluationResult, boolean isHtml, boolean isJson) {
+ protected Map<String, Set<AssetState<?>>> getMatchedAssetStates(RuleState ruleState, boolean useUnmatched, Collection<UserAssetLink> userAssetLinks, String userId) {
+ Set<String> assetIds = useUnmatched ? ruleState.otherwiseMatchedAssetIds : ruleState.thenMatchedAssetIds;
- Set<String> assetIds = useUnmatched ? ruleEvaluationResult.otherwiseMatchedAssetIds : ruleEvaluationResult.thenMatchedAssetIds;
-
- if (assetIds == null || assetIds.isEmpty()) {
- return "";
- }
-
- // Extract asset states for matched asset IDs
- Map<String, Set<AssetState<?>>> assetStates = ruleEvaluationResult.conditionStateMap.values().stream()
+ return assetIds == null || assetIds.isEmpty()
+ ? null
+ : ruleState.conditionStateMap.values().stream()
.filter(conditionState -> conditionState.lastEvaluationResult.matches)
.flatMap(conditionState -> {
Collection<AssetState<?>> as = useUnmatched
@@ -1046,8 +1105,22 @@ public class JsonRulesBuilder extends RulesBuilder {
: conditionState.lastEvaluationResult.matchedAssetStates;
return as.stream();
})
- .filter(assetState -> assetIds.contains(assetState.getId()))
+ // Get the asset states that are in the assetId list and optionally linked to this user
+ .filter(assetState -> assetIds.contains(assetState.getId()) && (userAssetLinks == null || userAssetLinks.stream().anyMatch(ual -> ual.getId().getAssetId().equals(assetState.getId()) && ual.getId().getUserId().equals(userId))))
.collect(Collectors.groupingBy(AssetState::getId, Collectors.toSet()));
+ }
+
+ protected String getRealm() {
+ String realm = null;
+ if (jsonRuleset instanceof RealmRuleset realmRuleset) {
+ realm = realmRuleset.getRealm();
+ } else if (jsonRuleset instanceof AssetRuleset assetRuleset) {
+ realm = assetRuleset.getRealm();
+ }
+ return realm;
+ }
+
+ protected String insertTriggeredAssetInfo(String sourceText, Map<String, Set<AssetState<?>>> assetStates, boolean isHtml, boolean isJson) {
StringBuilder sb = new StringBuilder();
if (isHtml) {
@@ -1084,7 +1157,7 @@ public class JsonRulesBuilder extends RulesBuilder {
}));
}
- return sb.toString();
+ return sourceText.replace(PLACEHOLDER_TRIGGER_ASSETS, sb.toString());
}
protected static Collection<String> getRuleActionTargetIds(RuleActionTarget target, boolean useUnmatched, RuleState ruleState, Assets assetsFacade, Users usersFacade, RulesFacts facts) {
@@ -1101,7 +1174,7 @@ public class JsonRulesBuilder extends RulesBuilder {
return triggerState != null ? triggerState.getUnmatchedAssetIds() : Collections.emptyList();
}
- if (conditionStateMap != null && (target.matchedAssets != null || (target.linkedUsers != null && target.linkedUsers))) {
+ if (conditionStateMap != null && target.matchedAssets != null) {
List<String> compareAssetIds = conditionStateMap.values().stream()
.flatMap(triggerState ->
useUnmatched ? triggerState.getUnmatchedAssetIds().stream() : triggerState.getMatchedAssetIds().stream()).toList();
@@ -1113,18 +1186,6 @@ public class JsonRulesBuilder extends RulesBuilder {
.filter(compareAssetIds::contains)
.collect(Collectors.toList());
}
-
- // Find linked users - apply any user query if it is present or create a new one
- UserQuery userQuery = target.users != null ? target.users : new UserQuery();
- if (userQuery.assets == null) {
- userQuery.assets = compareAssetIds.toArray(String[]::new);
- } else {
- List<String> assetIds = new ArrayList<>(Arrays.asList(userQuery.assets));
- assetIds.addAll(compareAssetIds);
- userQuery.assets = assetIds.toArray(String[]::new);
- }
-
- return usersFacade.getResults(userQuery).collect(Collectors.toList());
}
if (target.assets != null) {
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 f9a99d68c..68523f01f 100644
--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java
+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java
@@ -270,4 +270,20 @@ public abstract class Ruleset {
getMeta().put(SHOW_ON_LIST, showOn);
return this;
}
+
+ @Override
+ public String toString() {
+ return Ruleset.class.getSimpleName() + "{" +
+ "id=" + id +
+ ", version=" + version +
+ ", createdOn=" + createdOn +
+ ", lastModified=" + lastModified +
+ ", name='" + name + '\'' +
+ ", enabled=" + enabled +
+ ", rules='" + rules + '\'' +
+ ", lang=" + lang +
+ ", status=" + status +
+ ", error='" + error + '\'' +
+ '}';
+ }
}
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.groovy
index af0cadd20..ec5d0423d 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
@@ -375,13 +375,21 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
}
when: "the console device moves outside the home geofence again (as defined in the rule)"
- assetProcessingService.sendAttributeEvent(new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, new GeoJSONPoint(0d, 0d)), AttributeEvent.Source.CLIENT)
+ emailMessages.clear()
+ assetProcessingService.sendAttributeEvent(new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, new GeoJSONPoint(-10d, -4d)), AttributeEvent.Source.CLIENT)
then: "another notification should have been sent to the console"
conditions.eventually {
assert pushTargetsAndMessages.findAll {it.v2.title == "Test title"}.size() == 2
}
+ and: "an email notification should have been sent to [email protected] with the triggered asset in the body but only containing the triggered asset states"
+ conditions.eventually {
+ assert emailMessages.any {it.getRecipients(jakarta.mail.Message.RecipientType.TO).length == 1
+ && (it.getRecipients(jakarta.mail.Message.RecipientType.TO)[0] as InternetAddress).address == "[email protected]"
+ && MailUtil.toMailMessage(it, true).content == "<table cellpadding=\"30\"><tr><th>Asset ID</th><th>Asset Name</th><th>Attribute</th><th>Value</th></tr><tr><td>${consoleRegistration.id}</td><td>Test Console</td><td>location</td><td>" + ValueUtil.asJSON(new GeoJSONPoint(-10d, -4d)).orElse("") + "</td></tr></table>"}
+ }
+
when: "the console sends a location update with a new location but still outside the geofence"
def timestamp = assetStorageService.find(consoleRegistration.id, true).getAttribute(Asset.LOCATION).flatMap{it.getTimestamp()}.orElse(timerService.getCurrentTimeMillis())
def attributeEvent = new AttributeEvent(consoleRegistration.id, Asset.LOCATION.name, new GeoJSONPoint(10d, 10d), timestamp)