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
User connected meta item and status improvements (#942)
Rich Turner2583425993b6
diff --git a/manager/src/main/java/org/openremote/manager/app/ConfigurationService.java b/manager/src/main/java/org/openremote/manager/app/ConfigurationService.javaindex af203c621..43fe45dce 100644--- a/manager/src/main/java/org/openremote/manager/app/ConfigurationService.java+++ b/manager/src/main/java/org/openremote/manager/app/ConfigurationService.java@@ -34,6 +34,7 @@ import org.openremote.manager.web.ManagerWebService;import org.openremote.model.Container;import org.openremote.model.ContainerService;import org.openremote.model.file.FileInfo;+import org.openremote.model.util.ValueUtil;import java.io.*;import java.nio.file.Path;diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ConnectionMonitorHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ConnectionMonitorHandler.javaindex 1b75c0826..a8457fbe8 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/ConnectionMonitorHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/ConnectionMonitorHandler.java@@ -253,7 +253,7 @@ public class ConnectionMonitorHandler extends MQTTHandler {List<String> usernames = assetIdsAttrs.stream().map(assetIdAttr -> assetIdAttr.getValue().getMetaValue(USER_CONNECTED).orElse(null)).filter(Objects::nonNull).distinct()- .map(username -> User.SERVICE_ACCOUNT_PREFIX + username)+ .map(username -> username.startsWith(User.SERVICE_ACCOUNT_PREFIX) ? username : User.SERVICE_ACCOUNT_PREFIX + username).toList();// Convert usernames to userIds@@ -280,6 +280,7 @@ public class ConnectionMonitorHandler extends MQTTHandler {protected void removeSessionAttribute(String userID, AttributeRef attributeRef) {LOG.finest("Removing userID '" + userID + "' monitoring for attribute: " + attributeRef);+ updateUserConnectedStatus(userID, Collections.singletonList(attributeRef), false);userIDAttributeRefs.computeIfPresent(userID, (ID, refs) -> {refs.remove(attributeRef);return refs.isEmpty() ? null : refs;diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex ad3bddcc0..0be6de180 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -263,10 +263,12 @@ public interface ManagerIdentityProvider extends IdentityProvider {}static List<String> getUserIds(PersistenceService persistenceService, String realm, List<String> usernames) {+ List<String> CIUsernames = usernames.stream().map(String::toLowerCase).toList();+return persistenceService.doReturningTransaction(em -> {Map<String, String> usernameIdMap = em.createQuery("select u.username, u.id from User u join Realm r on r.id = u.realmId where u.username in :usernames and r.name = :realm", Tuple.class)- .setParameter("usernames", usernames)+ .setParameter("usernames", CIUsernames).setParameter("realm", realm).getResultList().stream()@@ -277,7 +279,7 @@ public interface ManagerIdentityProvider extends IdentityProvider {));- return usernames.stream().map(usernameIdMap::get).collect(Collectors.toList());+ return CIUsernames.stream().map(usernameIdMap::get).collect(Collectors.toList());});}diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex b9f9b95b1..b3415ca82 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -40,6 +40,7 @@ import org.openremote.manager.provisioning.ProvisioningServiceimport org.openremote.manager.mqtt.UserAssetProvisioningMQTTHandlerimport org.openremote.manager.security.ManagerIdentityServiceimport org.openremote.manager.setup.SetupService+import org.openremote.model.asset.Assetimport org.openremote.model.asset.AssetEventimport org.openremote.model.asset.agent.ConnectionStatusimport org.openremote.model.asset.impl.WeatherAsset@@ -189,11 +190,14 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerConta)then: "the broker should have published to the response topic a success message containing the provisioned asset"+ String weatherAssetID+ Asset<WeatherAsset> weatherAssetconditions.eventually {assert device1Responses.size() == 1assert device1Responses.get(0) instanceof SuccessResponseMessageassert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName- def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset+ weatherAssetID = ((SuccessResponseMessage)device1Responses.get(0)).asset.id+ weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).assetassert weatherAsset != nullassert weatherAsset instanceof WeatherAssetassert weatherAsset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId@@ -235,7 +239,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaassert device1Responses.size() == 1assert device1Responses.get(0) instanceof SuccessResponseMessageassert ((SuccessResponseMessage)device1Responses.get(0)).realm == managerTestSetup.realmBuildingName- def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset+ weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).assetassert weatherAsset != nullassert weatherAsset instanceof WeatherAssetassert weatherAsset.getAttribute("serialNumber").flatMap{it.getValue()}.orElse(null) == device1UniqueId@@ -243,11 +247,30 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaand: "the connected attribute of the provisioned asset should show as connected"conditions.eventually {- def weatherAssetID = ((SuccessResponseMessage)device1Responses.get(0)).asset.id- def weatherAsset = assetStorageService.find(weatherAssetID)+ weatherAsset = assetStorageService.find(weatherAssetID)assert weatherAsset.getAttribute("connected").flatMap{it.value}.orElse(false)}+ when: "the connected attribute user name is changed to something invalid"+ weatherAsset.getAttribute("connected").ifPresent{it.addOrReplaceMeta(new MetaItem<>(MetaItemType.USER_CONNECTED, "invalidUser"))}+ weatherAsset = assetStorageService.merge(weatherAsset)++ then: "the connected attribute should now be disconnected"+ conditions.eventually {+ weatherAsset = assetStorageService.find(weatherAssetID)+ assert !weatherAsset.getAttribute("connected").flatMap{it.value}.orElse(true)+ }++ when: "the connected attribute user name is changed to upper case"+ weatherAsset.getAttribute("connected").ifPresent{it.addOrReplaceMeta(new MetaItem<>(MetaItemType.USER_CONNECTED, PROVISIONING_USER_PREFIX + device1UniqueId.toUpperCase()))}+ weatherAsset = assetStorageService.merge(weatherAsset)++ then: "the connected attribute should still find the right user and be connected"+ conditions.eventually {+ weatherAsset = assetStorageService.find(weatherAssetID)+ assert weatherAsset.getAttribute("connected").flatMap{it.value}.orElse(false)+ }+when: "the client then subscribes to attribute events for the generated asset and asset events for all assets"def asset = ((SuccessResponseMessage)device1Responses.get(0)).assetdef assetSubscriptionTopic = "$provisioningConfig.realm/$mqttDevice1ClientId/$DefaultMQTTHandler.ASSET_TOPIC/#".toString()@@ -337,7 +360,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContaand: "the connected attribute of the provisioned asset should show as not connected"conditions.eventually {- def weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).asset+ weatherAsset = ((SuccessResponseMessage)device1Responses.get(0)).assetassert !weatherAsset.getAttribute("connected").flatMap{it.value}.orElse(true)}