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 several asset tree- and HTTP '/asset/count' issues (#2414)
Martin Peetersc6da50e38bac
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 468fd18ea..f36d6ee3d 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -104,17 +104,17 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicthis.binders = binders;}- protected void apply(EntityManager em, org.hibernate.query.Query<Object[]> query) {+ protected void apply(EntityManager em, org.hibernate.query.Query<Object> query) {for (ParameterBinder binder : binders) {binder.accept(em, query);}}}- public interface ParameterBinder extends BiConsumer<EntityManager, org.hibernate.query.Query<Object[]>> {+ public interface ParameterBinder extends BiConsumer<EntityManager, org.hibernate.query.Query<Object>> {@Override- default void accept(EntityManager em, org.hibernate.query.Query<Object[]> st) {+ default void accept(EntityManager em, org.hibernate.query.Query<Object> st) {try {acceptStatement(em, st);} catch (SQLException ex) {@@ -122,7 +122,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}}- void acceptStatement(EntityManager em, org.hibernate.query.Query<Object[]> st) throws SQLException;+ void acceptStatement(EntityManager em, org.hibernate.query.Query<Object> st) throws SQLException;}private static final Logger LOG = Logger.getLogger(AssetStorageService.class.getName());@@ -1350,7 +1350,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic// return asset;// });- org.hibernate.query.Query<Object[]> jpql = em.createNativeQuery(querySql.querySql, Asset.class).unwrap(org.hibernate.query.Query.class)+ org.hibernate.query.Query<Object> jpql = em.createNativeQuery(querySql.querySql, Asset.class).unwrap(org.hibernate.query.Query.class).setHint(AvailableHints.HINT_READ_ONLY, true); // Make query readonly so no dirty checks are performedquerySql.apply(em, jpql);List<Asset<?>> assets = (List<Asset<?>>)(Object)jpql.getResultList();@@ -1389,8 +1389,10 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}PreparedAssetQuery querySql = buildQuery(query, timerService::getCurrentTimeMillis, true).key;- Query countQuery = em.createNativeQuery(querySql.querySql).unwrap(org.hibernate.query.Query.class)+ org.hibernate.query.Query<Object> countQuery = em.createNativeQuery(querySql.querySql, Integer.class).unwrap(org.hibernate.query.Query.class).setHint(AvailableHints.HINT_READ_ONLY, true); // Make query readonly so no dirty checks are performed++ querySql.apply(em, countQuery);return ((Number) countQuery.getSingleResult()).intValue();}@@ -1564,11 +1566,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicStringBuilder sb = new StringBuilder();boolean recursive = query.recursive;List<ParameterBinder> binders = new ArrayList<>();- if (count) {- sb.append("select COUNT(*)");- } else {- sb.append(buildSelectString(query, 1, binders, timeProvider));- }+ sb.append(buildSelectString(query, 1, binders, timeProvider));sb.append(buildFromString(query, 1));boolean containsCalendarPredicate = appendWhereClause(sb, query, 1, binders, timeProvider);@@ -1584,11 +1582,15 @@ public class AssetStorageService extends RouteBuilder implements ContainerServiccontainsCalendarPredicate = !containsCalendarPredicate && appendWhereClause(sb, query, 3, binders, timeProvider);}- if (!count) {- sb.append(buildOrderByString(query));- }+ sb.append(buildOrderByString(query));sb.append(buildLimitString(query));sb.append(buildOffsetString(query));++ if (count) {+ sb.insert(0, "select COUNT(*) FROM (");+ sb.append(")");+ }+return new Pair<>(new PreparedAssetQuery(sb.toString(), binders), containsCalendarPredicate);}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex fff3ee8f4..868a5257c 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -88,13 +88,12 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets[0].realm == managerTestSetup.realmMasterNamewhen: "a user filtering query is executed"- assets = assetStorageService.findAll(- new AssetQuery()- .userIds(keycloakTestSetup.testuser3Id)- )+ def query = new AssetQuery().userIds(keycloakTestSetup.testuser3Id)+ assets = assetStorageService.findAll(query)then: "only the users assets should be retrieved"assets.size() == 6+ assetStorageService.count(query) == 6assets.get(0).id == managerTestSetup.apartment1Idassets.get(1).id == managerTestSetup.apartment1LivingroomIdassets.get(1).getAttributes().size() == 14@@ -109,14 +108,14 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(5).id == managerTestSetup.apartment1BathroomIdwhen: "a user filtering query is executed that limits to protected attributes"- assets = assetStorageService.findAll(- new AssetQuery()- .userIds(keycloakTestSetup.testuser3Id)- .access(PROTECTED)- )+ query = new AssetQuery()+ .userIds(keycloakTestSetup.testuser3Id)+ .access(PROTECTED)+ assets = assetStorageService.findAll(query)then: "only the users assets should be retrieved"assets.size() == 6+ assetStorageService.count(query) == 6assets.get(0).id == managerTestSetup.apartment1Idassets.get(1).id == managerTestSetup.apartment1LivingroomIdassets.get(1).getAttributes().size() == 8@@ -133,14 +132,14 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(5).id == managerTestSetup.apartment1BathroomIdwhen: "a query is executed that returns a protected attribute without any other meta items"- assets = assetStorageService.findAll(- new AssetQuery()- .ids(managerTestSetup.apartment2LivingroomId)- .access(PROTECTED)- )+ query = new AssetQuery()+ .ids(managerTestSetup.apartment2LivingroomId)+ .access(PROTECTED)+ assets = assetStorageService.findAll(query)then: "only one asset should be retrieved"assets.size() == 1+ assetStorageService.count(query) == 1assets.get(0).id == managerTestSetup.apartment2LivingroomIdassets.get(0).getAttributes().size() == 2assets.get(0).getAttribute("windowOpen").isPresent()@@ -149,16 +148,16 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(0).getAttribute("targetTemperature").isPresent()when: "a recursive query is executed for apartment 1 assets"- assets = assetStorageService.findAll(- new AssetQuery()- .ids(managerTestSetup.smartBuildingId)- .orderBy(new OrderBy(CREATED_ON))- .recursive(true)- .access(PROTECTED)- )+ query = new AssetQuery()+ .ids(managerTestSetup.smartBuildingId)+ .orderBy(new OrderBy(CREATED_ON))+ .recursive(true)+ .access(PROTECTED)+ assets = assetStorageService.findAll(query)then: "result should contain only basic info and attribute names"assets.size() == 13+ assetStorageService.count(query) == 13assets.find {it.id == managerTestSetup.smartBuildingId}.name == "Smart building"def apartment1 = assets.find {it.id == managerTestSetup.apartment1Id}apartment1.name == "Apartment 1"@@ -258,14 +257,14 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {((BuildingAsset)assets.get(0)).getStreet().orElse("") == "Torenallee 20"when: "a query is executed"- assets = assetStorageService.findAll(- new AssetQuery()- .select(new Select().excludeAttributes())- .parents(new ParentPredicate(managerTestSetup.smartBuildingId))- )+ query = new AssetQuery()+ .select(new Select().excludeAttributes())+ .parents(new ParentPredicate(managerTestSetup.smartBuildingId))+ assets = assetStorageService.findAll(query)then: "result should match"assets.size() == 3+ assetStorageService.count(query) == 3assets.get(0).id == managerTestSetup.apartment1Idassets.get(0).createdOn.time < System.currentTimeMillis()assets.get(0).name == "Apartment 1"@@ -277,15 +276,15 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.get(2).id == managerTestSetup.apartment3Idwhen: "a query is executed"- assets = assetStorageService.findAll(- new AssetQuery()- .select(new Select().excludeAttributes())- .parents(new ParentPredicate(managerTestSetup.smartBuildingId))- .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))- )+ query = new AssetQuery()+ .select(new Select().excludeAttributes())+ .parents(new ParentPredicate(managerTestSetup.smartBuildingId))+ .realm(new RealmPredicate(keycloakTestSetup.realmBuilding.name))+ assets = assetStorageService.findAll(query)then: "result should match"assets.size() == 3+ assetStorageService.count(query) == 3assets.get(0).id == managerTestSetup.apartment1Idassets.get(1).id == managerTestSetup.apartment2Idassets.get(2).id == managerTestSetup.apartment3Iddiff --git a/ui/app/manager/test/assettree.test.ts b/ui/app/manager/test/assettree.test.tsindex 1e556fd66..8352da52c 100644--- a/ui/app/manager/test/assettree.test.ts+++ b/ui/app/manager/test/assettree.test.ts@@ -85,9 +85,18 @@ async function applyParentAssets(parentAssets: Asset[], manager: Manager) {* @and Tries to navigate through the assets in the system using the asset tree* @then The asset list should be complete and should not display any artifacts or visual errors.*/-test(`Check if assets are visible in the tree`, async ({ assetTree, manager, assetsPage }) => {+test(`Check if assets are visible in the tree`, async ({ assetTree, manager, assetsPage, page }) => {++ // Make sure the count endpoint during page load returns a correct value+ await page.route("**/asset/count", async (route, request) => {+ await route.continue();+ const response = await request.response();+ expect(response?.status()).toBe(200);+ expect(await response?.json()).toBeGreaterThanOrEqual(8);+ });+const batteryAssets = createBatteryAssets(2);- const electricityAssets = createElectricityAssets(2)+ const electricityAssets = createElectricityAssets(2);await manager.setup("smartcity", { assets: [...batteryAssets, ...electricityAssets] });await applyParentAssets(parentAssets, manager);await manager.goToRealmStartPage("smartcity");diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex 1ea2a2107..2ef384cc6 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -623,6 +623,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {|| _changedProperties.has("rootAssets")|| _changedProperties.has("rootAssetIds")|| _changedProperties.has("queryLimit")+ || _changedProperties.has("paginationThreshold")) {this.refresh();}@@ -1795,7 +1796,7 @@ export class OrAssetTree extends subscribe(manager)(LitElement) {// We request the number of assets through the HTTP API, and disable pagination when there are less than 1000 assets.try {const threshold = this.paginationThreshold ?? 1000;- const countResponse = await manager.rest.api.AssetResource.queryCount({...query, limit: threshold});+ const countResponse = await manager.rest.api.AssetResource.queryCount({...query, limit: threshold, parents: undefined });if (countResponse.data < threshold) {query.parents = undefined;query.limit = threshold;