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 for DateTimePredicate querying
Michael Rademakere327a8d0cb23
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex 11fd8024c..775fe06f0 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -35,7 +35,6 @@ import org.keycloak.adapters.KeycloakDeploymentBuilder;import org.keycloak.admin.client.resource.RealmsResource;import org.keycloak.common.enums.SslRequired;import org.keycloak.representations.adapters.config.AdapterConfig;-import org.keycloak.representations.idm.ClientRepresentation;import org.keycloak.representations.idm.PublishedRealmRepresentation;import org.keycloak.representations.idm.RealmRepresentation;import org.openremote.container.Container;@@ -50,8 +49,6 @@ import javax.ws.rs.NotFoundException;import javax.ws.rs.client.Client;import javax.ws.rs.core.Response;import javax.ws.rs.core.UriBuilder;-import java.util.ArrayList;-import java.util.Collections;import java.util.List;import java.util.concurrent.TimeUnit;import java.util.logging.Level;diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex cad6bc9b5..784671499 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -67,6 +67,7 @@ import javax.persistence.EntityManager;import javax.persistence.NoResultException;import javax.persistence.TypedQuery;import java.sql.*;+import java.time.Instant;import java.util.*;import java.util.Date;import java.util.function.Consumer;@@ -1081,14 +1082,12 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}} else if (attributePredicate.value instanceof DateTimePredicate) {DateTimePredicate dateTimePredicate = (DateTimePredicate) attributePredicate.value;- attributeBuilder.append(" and to_timestamp(AX.VALUE #>> '{value}', ?)");- final int keyFormatPos = binders.size() + 1;- binders.add(st -> st.setString(keyFormatPos, dateTimePredicate.dateFormat));+ attributeBuilder.append(" and (AX.Value #>> '{value}')::timestamp");Pair<Long, Long> fromAndTo = AssetQueryPredicate.asFromAndTo(timerService.getCurrentTimeMillis(), dateTimePredicate);final int pos = binders.size() + 1;- binders.add(st -> st.setDate(pos, new java.sql.Date(fromAndTo.key)));+ binders.add(st -> st.setObject(pos, new java.sql.Timestamp(fromAndTo.key).toLocalDateTime()));switch (dateTimePredicate.operator) {case EQUALS:@@ -1111,7 +1110,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicbreak;case BETWEEN:final int pos2 = binders.size() + 1;- binders.add(st -> st.setDate(pos2, new java.sql.Date(fromAndTo.value)));+ binders.add(st -> st.setObject(pos2, new java.sql.Timestamp(fromAndTo.value).toLocalDateTime()));attributeBuilder.append(" BETWEEN ? AND ?");break;}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex 2d710286a..eda846d67 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -4,44 +4,35 @@ import org.openremote.container.Containerimport org.openremote.container.persistence.PersistenceServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageService-import org.openremote.manager.setup.SetupServiceimport org.openremote.manager.setup.builtin.KeycloakDemoSetupimport org.openremote.manager.setup.builtin.ManagerDemoSetup-import org.openremote.model.asset.Asset-import org.openremote.model.asset.AssetMeta-import org.openremote.model.query.AssetQuery-import org.openremote.model.asset.AssetType-import org.openremote.model.asset.CalendarEventConfiguration+import org.openremote.model.asset.*import org.openremote.model.calendar.CalendarEventimport org.openremote.model.calendar.RecurrenceRuleimport org.openremote.model.geo.GeoJSONPoint-import org.openremote.model.query.filter.LocationAttributePredicate-import org.openremote.model.query.filter.PathPredicate-import org.openremote.model.query.filter.AttributeMetaPredicate-import org.openremote.model.query.filter.AttributePredicate-import org.openremote.model.query.filter.AttributeRefPredicate-import org.openremote.model.query.filter.BooleanPredicate-import org.openremote.model.query.filter.NumberPredicate-import org.openremote.model.query.filter.ParentPredicate-import org.openremote.model.query.filter.RadialGeofencePredicate-import org.openremote.model.query.filter.RectangularGeofencePredicate-import org.openremote.model.query.filter.StringPredicate-import org.openremote.model.query.filter.TenantPredicate+import org.openremote.model.query.AssetQuery+import org.openremote.model.query.filter.*+import org.openremote.model.value.Valuesimport org.openremote.test.ManagerContainerTraitimport spock.lang.Sharedimport spock.lang.Specificationimport spock.util.concurrent.PollingConditionsimport javax.persistence.EntityManager+import java.time.Instant+import java.time.LocalDateTime+import java.time.ZoneIdimport java.util.function.Function+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME+import static org.openremote.model.asset.AssetType.THING+import static org.openremote.model.attribute.AttributeValueType.DATETIMEimport static org.openremote.model.query.BaseAssetQuery.*import static org.openremote.model.query.BaseAssetQuery.Access.PRIVATE_READimport static org.openremote.model.query.BaseAssetQuery.Access.RESTRICTED_READimport static org.openremote.model.query.BaseAssetQuery.OrderBy.Property.CREATED_ONimport static org.openremote.model.query.BaseAssetQuery.OrderBy.Property.NAME-import static org.openremote.model.asset.AssetType.THINGclass AssetQueryTest extends Specification implements ManagerContainerTrait {@@ -866,4 +857,79 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {assets.size() == 4!assets.any {it.name == "Lobby"}}++ def "DateTime queries"() {+ when: "the lobby has an opening date and the date falls is between the filtering date"+ def lobby = assetStorageService.find(managerDemoSetup.lobbyId, true)++ lobby.addAttributes(+ new AssetAttribute("openingDate", DATETIME, Values.create("2018-01-28T15:00:00"))+ )+ lobby = assetStorageService.merge(lobby)++ def rangeStart = LocalDateTime.ofInstant(Instant.ofEpochMilli(1517151600000), ZoneId.systemDefault()).minusHours(2) // 28/01/2018 @ 1:00pm (UTC)+ def rangeEnd = LocalDateTime.ofInstant(Instant.ofEpochMilli(1517151600000), ZoneId.systemDefault()).plusHours(3) // 28/01/2018 @ 6:00pm (UTC)++ def assets = assetStorageService.findAll(+ new AssetQuery()+ .tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.id))+ .attributeValue(+ "openingDate",+ new DateTimePredicate(rangeStart.format(ISO_LOCAL_DATE_TIME), rangeEnd.format(ISO_LOCAL_DATE_TIME))+ .operator(Operator.BETWEEN)+ .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ )+++ then: "the lobby asset should be retrieved"+ assets.size() == 1+ assets[0].id == lobby.id++ when: "the lobby has an opening date and the date is after the filtering date"+ assets = assetStorageService.findAll(+ new AssetQuery()+ .tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.id))+ .attributeValue(+ "openingDate",+ new DateTimePredicate(Operator.GREATER_THAN, rangeStart.format(ISO_LOCAL_DATE_TIME))+ .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ )+++ then: "the lobby asset should be retrieved"+ assets.size() == 1+ assets[0].id == lobby.id++ when: "the lobby has an opening date and the date is before the filtering date"+ assets = assetStorageService.findAll(+ new AssetQuery()+ .tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.id))+ .attributeValue(+ "openingDate",+ new DateTimePredicate(Operator.LESS_THAN, rangeEnd.format(ISO_LOCAL_DATE_TIME))+ .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ )+++ then: "the lobby asset should be retrieved"+ assets.size() == 1+ assets[0].id == lobby.id++ when: "the lobby has an opening date and the date is equal to the filtering date"+ rangeStart = LocalDateTime.ofInstant(Instant.ofEpochMilli(1517151600000), ZoneId.systemDefault()).minusHours(1) // 28/01/2018 @ 2:00pm (UTC)++ assets = assetStorageService.findAll(+ new AssetQuery()+ .tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.id))+ .attributeValue(+ "openingDate",+ new DateTimePredicate(Operator.EQUALS, rangeStart.format(ISO_LOCAL_DATE_TIME))+ .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ )+++ then: "the lobby asset should be retrieved"+ assets.size() == 1+ assets[0].id == lobby.id+ }}diff --git a/ui/yarn.lock b/ui/yarn.lockindex 4d07c840d..73c1f57c7 100644--- a/ui/yarn.lock+++ b/ui/yarn.lock@@ -3787,6 +3787,18 @@ [email protected]:resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.0.2.tgz#fa4fbcb7844944fc2bfb0bcf9ca0dea13463ca21"integrity sha1-+k+8t4RJRPwr+wvPnKDeoTRjyiE=+lit-element@^2.0.0-rc.2:+ version "2.0.0-rc.2"+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.0-rc.2.tgz#5975c3b282ce47937de861b48456036df71f422b"+ integrity sha512-yP6mX23n8WUYXpS2RJUL87DSZYQY327YrnqFiSyPe9aSzjgJ5Jy3In3itzjeiFOT8Od4VKLM7u6bLG9tGFO1pw==+ dependencies:+ lit-html "^1.0.0-rc.2"+[email protected], lit-html@^1.0.0-rc.2:+ version "1.0.0-rc.2"+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.0.0-rc.2.tgz#b9c904520fe005d349aa737a86d83645d97d5a89"+ integrity sha512-4bq34lhVmwWly1zBXicOBJLOwaWfjOVbchEEmFnZLuztxjh5wRd2WqV0URX8Q47MQ7PaIjn/eXyTRKsYhSAeRw==+lit-html@^0.12.0:version "0.12.0"resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.12.0.tgz#d994420fda74744f9d4a79401b086de929643e6a"