@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test ;
import org.springframework.beans.factory.annotation.Autowired ;
import org.springframework.test.context.TestPropertySource ;
import org.springframework.test.util.ReflectionTestUtils ;
import org.springframework.test.context.bean.override.mockito.MockitoBean ;
import org.springframework.test.web.servlet.ResultActions ;
import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils ;
@ -62,6 +63,8 @@ import org.thingsboard.server.common.data.query.AlarmDataQuery;
import org.thingsboard.server.common.data.query.AliasEntityId ;
import org.thingsboard.server.common.data.query.AvailableEntityKeysV2 ;
import org.thingsboard.server.common.data.query.AvailableEntityKeysV2.KeyInfo ;
import org.thingsboard.server.common.data.query.ComplexFilterPredicate ;
import org.thingsboard.server.common.data.query.ComplexOperation ;
import org.thingsboard.server.common.data.query.DeviceTypeFilter ;
import org.thingsboard.server.common.data.query.DynamicValue ;
import org.thingsboard.server.common.data.query.DynamicValueSourceType ;
@ -89,6 +92,7 @@ import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
import org.thingsboard.server.common.data.security.Authority ;
import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration ;
import org.thingsboard.server.common.data.tenant.profile.TenantProfileData ;
import org.thingsboard.server.dao.entity.BaseEntityService ;
import org.thingsboard.server.dao.queue.QueueStatsService ;
import org.thingsboard.server.dao.service.DaoSqlTest ;
import org.thingsboard.server.edqs.util.EdqsRocksDb ;
@ -123,6 +127,8 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
@Autowired
private QueueStatsService queueStatsService ;
@Autowired
private BaseEntityService baseEntityService ;
@MockitoBean
private EdqsRocksDb edqsRocksDb ;
@ -1343,7 +1349,7 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
//assign dashboard
doPost ( "/api/customer/" + savedCustomer . getId ( ) . getId ( ) . toString ( )
+ "/dashboard/" + savedDashboard . getId ( ) . getId ( ) . toString ( ) , Dashboard . class ) ;
+ "/dashboard/" + savedDashboard . getId ( ) . getId ( ) . toString ( ) , Dashboard . class ) ;
// check entity data query by customer
User customerUser = new User ( ) ;
@ -1729,4 +1735,523 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
return new EntityDataQuery ( filter , new EntityDataPageLink ( 1 , 0 , null , null ) , Collections . emptyList ( ) , null , null ) ;
}
// --- OR conditions tests ---
private Device createDeviceWithSharedAttributes ( String name , String type , String sharedAttributesPayload ) throws Exception {
Device device = new Device ( ) ;
device . setName ( name ) ;
device . setType ( type ) ;
device = doPost ( "/api/device" , device , Device . class ) ;
if ( sharedAttributesPayload ! = null ) {
doPost ( "/api/plugins/telemetry/" + device . getId ( ) + "/" + DataConstants . SHARED_SCOPE ,
sharedAttributesPayload , String . class , status ( ) . isOk ( ) ) ;
}
return device ;
}
private Device createDeviceWithTimeseries ( String name , String type , String timeseriesPayload ) throws Exception {
Device device = new Device ( ) ;
device . setName ( name ) ;
device . setType ( type ) ;
device = doPost ( "/api/device" , device , Device . class ) ;
JsonNode payload = JacksonUtil . toJsonNode ( timeseriesPayload ) ;
doPost ( "/api/plugins/telemetry/" + EntityType . DEVICE . name ( ) + "/" + device . getUuidId ( ) + "/timeseries/SERVER_SCOPE" , payload )
. andExpect ( status ( ) . isOk ( ) ) ;
return device ;
}
private Alarm createAlarm ( DeviceId originator , String type , AlarmSeverity severity ) throws Exception {
Alarm alarm = new Alarm ( ) ;
alarm . setOriginator ( originator ) ;
alarm . setType ( type ) ;
alarm . setSeverity ( severity ) ;
return doPost ( "/api/alarm" , alarm , Alarm . class ) ;
}
private static DeviceTypeFilter deviceTypeFilter ( String type ) {
DeviceTypeFilter filter = new DeviceTypeFilter ( ) ;
filter . setDeviceTypes ( List . of ( type ) ) ;
filter . setDeviceNameFilter ( "" ) ;
return filter ;
}
private static KeyFilter numericKeyFilter ( EntityKeyType keyType , String key ,
NumericFilterPredicate . NumericOperation operation , double value ) {
KeyFilter keyFilter = new KeyFilter ( ) ;
keyFilter . setKey ( new EntityKey ( keyType , key ) ) ;
keyFilter . setValueType ( EntityKeyValueType . NUMERIC ) ;
NumericFilterPredicate predicate = new NumericFilterPredicate ( ) ;
predicate . setValue ( FilterPredicateValue . fromDouble ( value ) ) ;
predicate . setOperation ( operation ) ;
keyFilter . setPredicate ( predicate ) ;
return keyFilter ;
}
private static KeyFilter numericAttributeKeyFilter ( String key ,
NumericFilterPredicate . NumericOperation operation , double value ) {
return numericKeyFilter ( EntityKeyType . ATTRIBUTE , key , operation , value ) ;
}
private static KeyFilter stringKeyFilter ( EntityKeyType keyType , String key ,
StringFilterPredicate . StringOperation operation , String value ) {
KeyFilter keyFilter = new KeyFilter ( ) ;
keyFilter . setKey ( new EntityKey ( keyType , key ) ) ;
keyFilter . setValueType ( EntityKeyValueType . STRING ) ;
StringFilterPredicate predicate = new StringFilterPredicate ( ) ;
predicate . setValue ( FilterPredicateValue . fromString ( value ) ) ;
predicate . setOperation ( operation ) ;
keyFilter . setPredicate ( predicate ) ;
return keyFilter ;
}
private static KeyFilter stringAttributeKeyFilter ( String key ,
StringFilterPredicate . StringOperation operation , String value ) {
return stringKeyFilter ( EntityKeyType . ATTRIBUTE , key , operation , value ) ;
}
private static EntityDataPageLink pageLinkSortedByName ( int pageSize , int page , String textSearch ) {
EntityDataSortOrder sortOrder = new EntityDataSortOrder (
new EntityKey ( EntityKeyType . ENTITY_FIELD , "name" ) , EntityDataSortOrder . Direction . ASC ) ;
return new EntityDataPageLink ( pageSize , page , textSearch , sortOrder ) ;
}
private static List < EntityKey > nameEntityField ( ) {
return Collections . singletonList ( new EntityKey ( EntityKeyType . ENTITY_FIELD , "name" ) ) ;
}
private static List < String > extractNames ( PageData < EntityData > result ) {
return result . getData ( ) . stream ( )
. map ( e - > e . getLatest ( ) . get ( EntityKeyType . ENTITY_FIELD ) . get ( "name" ) . getValue ( ) )
. collect ( Collectors . toList ( ) ) ;
}
@Test
public void testCountEntitiesWithOrKeyFiltersOperation ( ) throws Exception {
String type = "orTestType" ;
createDeviceWithSharedAttributes ( "OrTestDeviceA" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "OrTestDeviceB" , type , "{\"temperature\":5}" ) ;
createDeviceWithSharedAttributes ( "OrTestDeviceC" , type , "{\"temperature\":30}" ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// OR: deviceA (60>50) and deviceB (5<10) match => count=2
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 2 ) ) ;
// AND: no device has temperature both >50 AND <10 => count=0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testFindEntityDataWithOrKeyFiltersOperation ( ) throws Exception {
String type = "orDataType" ;
createDeviceWithSharedAttributes ( "OrDataDeviceX" , type , "{\"status\":\"active\"}" ) ;
createDeviceWithSharedAttributes ( "OrDataDeviceY" , type , "{\"humidity\":80}" ) ;
createDeviceWithSharedAttributes ( "OrDataDeviceZ" , type , null ) ; // no matching attribute
List < KeyFilter > keyFilters = List . of (
stringAttributeKeyFilter ( "status" , StringFilterPredicate . StringOperation . EQUAL , "active" ) ,
numericAttributeKeyFilter ( "humidity" , NumericFilterPredicate . NumericOperation . GREATER , 70 ) ) ;
// OR: deviceX matches status=active, deviceY matches humidity>70
EntityDataQuery orQuery = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findByQueryAndCheck ( orQuery , 2 ) ) ;
PageData < EntityData > result = findByQueryAndCheck ( orQuery , 2 ) ;
assertThat ( extractNames ( result ) ) . containsExactlyInAnyOrder ( "OrDataDeviceX" , "OrDataDeviceY" ) ;
}
@Test
public void testFindEntityDataWithOrDoesNotLeakFilterOnlyEntityFields ( ) throws Exception {
// Regression test: under OR, an entity-field filter (e.g. label) that isn't declared in
// entityFields must not leak its value into EntityData.latest[ENTITY_FIELD].
String type = "orLeakGuardType" ;
Device d1 = createDeviceWithSharedAttributes ( "OrLeakDeviceA" , type , "{\"status\":\"active\"}" ) ;
d1 . setLabel ( "leak-label-A" ) ;
doPost ( "/api/device" , d1 , Device . class ) ;
Device d2 = createDeviceWithSharedAttributes ( "OrLeakDeviceB" , type , null ) ;
d2 . setLabel ( "leak-label-B" ) ;
doPost ( "/api/device" , d2 , Device . class ) ;
List < KeyFilter > keyFilters = List . of (
stringAttributeKeyFilter ( "status" , StringFilterPredicate . StringOperation . EQUAL , "active" ) ,
buildStringKeyFilter ( EntityKeyType . ENTITY_FIELD , "label" , StringFilterPredicate . StringOperation . EQUAL , "leak-label-B" ) ) ;
EntityDataQuery orQuery = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findByQueryAndCheck ( orQuery , 2 ) ) ;
PageData < EntityData > result = findByQueryAndCheck ( orQuery , 2 ) ;
assertThat ( extractNames ( result ) ) . containsExactlyInAnyOrder ( "OrLeakDeviceA" , "OrLeakDeviceB" ) ;
for ( EntityData entity : result . getData ( ) ) {
assertThat ( entity . getLatest ( ) . get ( EntityKeyType . ENTITY_FIELD ) ) . containsOnlyKeys ( "name" ) ;
}
}
@Test
public void testFindEntityDataWithOrSameKeyFilters ( ) throws Exception {
String type = "orSameKeyType" ;
createDeviceWithSharedAttributes ( "OrSameKeyDeviceA" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "OrSameKeyDeviceB" , type , "{\"temperature\":5}" ) ;
// Same key "temperature" with two different predicates exercises the OR-ungrouping path
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
EntityDataQuery orQuery = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findByQueryAndCheck ( orQuery , 2 ) ) ;
PageData < EntityData > result = findByQueryAndCheck ( orQuery , 2 ) ;
assertThat ( extractNames ( result ) ) . containsExactlyInAnyOrder ( "OrSameKeyDeviceA" , "OrSameKeyDeviceB" ) ;
}
@Test
public void testCountEntitiesWithoutKeyFiltersOperation ( ) throws Exception {
String type = "backCompatType" ;
createDeviceWithSharedAttributes ( "BackCompatDeviceA" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "BackCompatDeviceB" , type , "{\"temperature\":5}" ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// Await attribute propagation via an OR query that should find 2 when propagated
EntityCountQuery orCheckQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orCheckQuery , 2 ) ) ;
// Query without keyFiltersOperation (null) -- should behave as AND
EntityCountQuery nullOpQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters ) ;
Long nullResult = countByQueryAndCheck ( nullOpQuery , 0 ) ;
// Query with explicit AND -- should produce the same result
EntityCountQuery andOpQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
Long andResult = countByQueryAndCheck ( andOpQuery , 0 ) ;
Assert . assertEquals ( nullResult , andResult ) ;
}
@Test
public void testAlarmDataQueryWithOrKeyFiltersOperation ( ) throws Exception {
loginTenantAdmin ( ) ;
String type = "orAlarmType" ;
Device deviceHot = createDeviceWithSharedAttributes ( "OrAlarmDeviceHot" , type , "{\"temperature\":60}" ) ;
Device deviceCold = createDeviceWithSharedAttributes ( "OrAlarmDeviceCold" , type , "{\"temperature\":5}" ) ;
Device deviceMid = createDeviceWithSharedAttributes ( "OrAlarmDeviceMid" , type , "{\"temperature\":30}" ) ;
createAlarm ( deviceHot . getId ( ) , "highTemp" , AlarmSeverity . CRITICAL ) ;
createAlarm ( deviceCold . getId ( ) , "lowTemp" , AlarmSeverity . WARNING ) ;
createAlarm ( deviceMid . getId ( ) , "normalTemp" , AlarmSeverity . WARNING ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
AlarmDataPageLink pageLink = new AlarmDataPageLink ( ) ;
pageLink . setPage ( 0 ) ;
pageLink . setPageSize ( 100 ) ;
pageLink . setSortOrder ( new EntityDataSortOrder ( new EntityKey ( EntityKeyType . ALARM_FIELD , "createdTime" ) ) ) ;
List < EntityKey > alarmFields = List . of ( new EntityKey ( EntityKeyType . ALARM_FIELD , "type" ) ) ;
// OR query: should return alarms for deviceHot (60>50) and deviceCold (5<10) = 2 alarms
AlarmDataQuery orAlarmQuery = new AlarmDataQuery ( deviceTypeFilter ( type ) , pageLink , null , null , keyFilters , alarmFields , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findAlarmsByQueryAndCheck ( orAlarmQuery , 2 ) ) ;
PageData < AlarmData > alarmResult = findAlarmsByQueryAndCheck ( orAlarmQuery , 2 ) ;
List < String > alarmTypes = alarmResult . getData ( ) . stream ( ) . map ( AlarmData : : getType ) . collect ( Collectors . toList ( ) ) ;
assertThat ( alarmTypes ) . containsExactlyInAnyOrder ( "highTemp" , "lowTemp" ) ;
// AND query: no device has temp both >50 AND <10 => 0 alarms
AlarmDataQuery andAlarmQuery = new AlarmDataQuery ( deviceTypeFilter ( type ) , pageLink , null , null , keyFilters , alarmFields , ComplexOperation . AND ) ;
findAlarmsByQueryAndCheck ( andAlarmQuery , 0 ) ;
}
@Test
public void testCountAlarmsByQueryWithOrKeyFiltersOperation ( ) throws Exception {
loginTenantAdmin ( ) ;
String type = "orAlarmCntType" ;
Device deviceHot = createDeviceWithSharedAttributes ( "OrAlarmCntDeviceHot" , type , "{\"temperature\":60}" ) ;
Device deviceCold = createDeviceWithSharedAttributes ( "OrAlarmCntDeviceCold" , type , "{\"temperature\":5}" ) ;
Device deviceMid = createDeviceWithSharedAttributes ( "OrAlarmCntDeviceMid" , type , "{\"temperature\":30}" ) ;
// 2 alarms for deviceHot, 1 for deviceCold, 1 for deviceMid
createAlarm ( deviceHot . getId ( ) , "highTemp1" , AlarmSeverity . CRITICAL ) ;
createAlarm ( deviceHot . getId ( ) , "highTemp2" , AlarmSeverity . CRITICAL ) ;
createAlarm ( deviceCold . getId ( ) , "lowTemp" , AlarmSeverity . WARNING ) ;
createAlarm ( deviceMid . getId ( ) , "normalTemp" , AlarmSeverity . WARNING ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// OR: deviceHot (2 alarms) + deviceCold (1 alarm) match => 3 alarms total
AlarmCountQuery orQuery = new AlarmCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countAlarmsByQueryAndCheck ( orQuery , 3 ) ) ;
// AND: no device matches both filters => 0
AlarmCountQuery andQuery = new AlarmCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countAlarmsByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testCountEntitiesWithOrMixedEntityFieldAndAttribute ( ) throws Exception {
// Exercises the entity field predicate relocation to middle-layer WHERE under OR
String type = "orMixedType" ;
createDeviceWithSharedAttributes ( "OrMixedAlpha" , type , "{\"temperature\":10}" ) ;
createDeviceWithSharedAttributes ( "OrMixedBeta" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "OrMixedGamma" , type , "{\"temperature\":10}" ) ;
List < KeyFilter > keyFilters = List . of (
stringKeyFilter ( EntityKeyType . ENTITY_FIELD , "name" , StringFilterPredicate . StringOperation . CONTAINS , "Alpha" ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ) ;
// OR: Alpha matches name contains "Alpha", Beta matches temp>50 => count=2
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 2 ) ) ;
// AND: only Alpha has name "Alpha" AND temp is 10 (not >50) => count=0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testCountEntitiesWithOrStringAttributes ( ) throws Exception {
String type = "orStrType" ;
createDeviceWithSharedAttributes ( "OrStrDeviceA" , type , "{\"color\":\"red\"}" ) ;
createDeviceWithSharedAttributes ( "OrStrDeviceB" , type , "{\"color\":\"blue\"}" ) ;
createDeviceWithSharedAttributes ( "OrStrDeviceC" , type , "{\"color\":\"green\"}" ) ;
List < KeyFilter > keyFilters = List . of (
stringAttributeKeyFilter ( "color" , StringFilterPredicate . StringOperation . EQUAL , "red" ) ,
stringAttributeKeyFilter ( "color" , StringFilterPredicate . StringOperation . EQUAL , "blue" ) ) ;
// OR: red and blue match => count=2
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 2 ) ) ;
// AND: no device is both red AND blue => count=0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testCountEntitiesWithOrSingleFilter ( ) throws Exception {
String type = "orSingleType" ;
createDeviceWithSharedAttributes ( "OrSingleDeviceA" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "OrSingleDeviceB" , type , "{\"temperature\":30}" ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ) ;
// Single filter with OR should behave identically to AND
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 1 ) ) ;
Long orResult = countByQueryAndCheck ( orQuery , 1 ) ;
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
Long andResult = countByQueryAndCheck ( andQuery , 1 ) ;
Assert . assertEquals ( orResult , andResult ) ;
}
@Test
public void testCountEntitiesWithOrThreeFilters ( ) throws Exception {
String type = "or3fType" ;
createDeviceWithSharedAttributes ( "Or3fDeviceA" , type , "{\"temperature\":60,\"humidity\":50,\"pressure\":1000}" ) ;
createDeviceWithSharedAttributes ( "Or3fDeviceB" , type , "{\"temperature\":20,\"humidity\":90,\"pressure\":1000}" ) ;
createDeviceWithSharedAttributes ( "Or3fDeviceC" , type , "{\"temperature\":20,\"humidity\":50,\"pressure\":1050}" ) ;
createDeviceWithSharedAttributes ( "Or3fDeviceD" , type , "{\"temperature\":20,\"humidity\":50,\"pressure\":1000}" ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "humidity" , NumericFilterPredicate . NumericOperation . GREATER , 80 ) ,
numericAttributeKeyFilter ( "pressure" , NumericFilterPredicate . NumericOperation . GREATER , 1040 ) ) ;
// OR: A matches temp>50, B matches hum>80, C matches press>1040, D matches none => 3
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 3 ) ) ;
// AND: no device matches all three => 0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testFindEntityDataWithOrPagination ( ) throws Exception {
// 5 devices, 4 match OR filters; explicit temperatures keep the setup easy to read.
String type = "orPageType" ;
int [ ] temperatures = { 61 , 62 , 2 , 1 , 25 } ; // devices 1,2: temp>50; 3,4: temp<10; 5: no match
for ( int i = 0 ; i < temperatures . length ; i + + ) {
createDeviceWithSharedAttributes (
String . format ( "OrPageDevice%02d" , i + 1 ) , type ,
"{\"temperature\":" + temperatures [ i ] + "}" ) ;
}
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// Page 1: pageSize=2, totalElements=4, data.size()=2
EntityDataQuery orQuery1 = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 2 , 0 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findByQueryAndCheck ( orQuery1 , 4 ) ) ;
PageData < EntityData > page1 = findByQueryAndCheck ( orQuery1 , 4 ) ;
Assert . assertEquals ( 2 , page1 . getData ( ) . size ( ) ) ;
Assert . assertTrue ( page1 . hasNext ( ) ) ;
// Page 2: remaining 2 of 4
EntityDataQuery orQuery2 = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 2 , 1 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
PageData < EntityData > page2 = findByQueryAndCheck ( orQuery2 , 4 ) ;
Assert . assertEquals ( 2 , page2 . getData ( ) . size ( ) ) ;
Assert . assertFalse ( page2 . hasNext ( ) ) ;
// All names across both pages should be from the 4 matching devices (01..04)
List < String > allNames = new ArrayList < > ( extractNames ( page1 ) ) ;
allNames . addAll ( extractNames ( page2 ) ) ;
assertThat ( allNames ) . hasSize ( 4 ) . doesNotContain ( "OrPageDevice05" ) ;
}
@Test
public void testCountEntitiesWithOrZeroMatches ( ) throws Exception {
String type = "orZeroType" ;
createDeviceWithSharedAttributes ( "OrZeroDeviceA" , type , "{\"temperature\":30}" ) ;
createDeviceWithSharedAttributes ( "OrZeroDeviceB" , type , "{\"temperature\":40}" ) ;
// Await attribute propagation via a filter that actually matches both devices
EntityCountQuery propagationCheck = new EntityCountQuery ( deviceTypeFilter ( type ) , List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 20 ) ) ,
ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( propagationCheck , 2 ) ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// OR with no matches: neither filter matches any device => count=0
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
countByQueryAndCheck ( orQuery , 0 ) ;
}
@Test
public void testOrKeyFiltersOperationRejectedWhenDisabled ( ) throws Exception {
loginTenantAdmin ( ) ;
ReflectionTestUtils . setField ( baseEntityService , "keyFiltersOrConditionsEnabled" , false ) ;
try {
DeviceTypeFilter filter = deviceTypeFilter ( "default" ) ;
// POST a query with OR operation -- should be rejected with 400
EntityCountQuery orQuery = new EntityCountQuery ( filter , Collections . emptyList ( ) , ComplexOperation . OR ) ;
String errorMessage = getErrorMessage (
doPost ( "/api/entitiesQuery/count" , orQuery ) . andExpect ( status ( ) . isBadRequest ( ) )
) ;
assertThat ( errorMessage ) . contains ( "OR conditions between key filters are disabled" ) ;
// POST a query without keyFiltersOperation (null/AND) -- should still succeed
EntityCountQuery andQuery = new EntityCountQuery ( filter , Collections . emptyList ( ) ) ;
doPost ( "/api/entitiesQuery/count" , andQuery ) . andExpect ( status ( ) . isOk ( ) ) ;
// POST a query with explicit AND -- should also succeed
EntityCountQuery explicitAndQuery = new EntityCountQuery ( filter , Collections . emptyList ( ) , ComplexOperation . AND ) ;
doPost ( "/api/entitiesQuery/count" , explicitAndQuery ) . andExpect ( status ( ) . isOk ( ) ) ;
} finally {
ReflectionTestUtils . setField ( baseEntityService , "keyFiltersOrConditionsEnabled" , true ) ;
}
}
@Test
public void testFindEntityDataWithOrAndTextSearch ( ) throws Exception {
// 3 devices: 2 match OR filters, but only 1 also matches textSearch at a time
String type = "orTextType" ;
createDeviceWithSharedAttributes ( "OrTextAlpha" , type , "{\"temperature\":60}" ) ;
createDeviceWithSharedAttributes ( "OrTextBeta" , type , "{\"temperature\":5}" ) ;
createDeviceWithSharedAttributes ( "OrTextGamma" , type , "{\"temperature\":30}" ) ;
List < KeyFilter > keyFilters = List . of (
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericAttributeKeyFilter ( "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// OR without textSearch: Alpha and Beta match => 2
EntityDataQuery orQueryNoText = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , null ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > findByQueryAndCheck ( orQueryNoText , 2 ) ) ;
// OR with textSearch="Alpha": only Alpha matches both OR filter AND text search
EntityDataQuery orQueryWithText = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , "Alpha" ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
assertThat ( extractNames ( findByQueryAndCheck ( orQueryWithText , 1 ) ) ) . containsExactly ( "OrTextAlpha" ) ;
// OR with textSearch="Beta": only Beta matches both OR filter AND text search
EntityDataQuery orQueryBeta = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , "Beta" ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
assertThat ( extractNames ( findByQueryAndCheck ( orQueryBeta , 1 ) ) ) . containsExactly ( "OrTextBeta" ) ;
// OR with textSearch="Gamma": Gamma doesn't match any OR filter => 0
EntityDataQuery orQueryGamma = new EntityDataQuery ( deviceTypeFilter ( type ) , pageLinkSortedByName ( 10 , 0 , "Gamma" ) ,
nameEntityField ( ) , null , keyFilters , ComplexOperation . OR ) ;
findByQueryAndCheck ( orQueryGamma , 0 ) ;
}
@Test
public void testCountEntitiesWithOrTimeSeriesKeyFilters ( ) throws Exception {
String type = "orTsType" ;
createDeviceWithTimeseries ( "OrTsDeviceA" , type , "{\"temperature\":60}" ) ;
createDeviceWithTimeseries ( "OrTsDeviceB" , type , "{\"temperature\":5}" ) ;
createDeviceWithTimeseries ( "OrTsDeviceC" , type , "{\"temperature\":30}" ) ;
List < KeyFilter > keyFilters = List . of (
numericKeyFilter ( EntityKeyType . TIME_SERIES , "temperature" , NumericFilterPredicate . NumericOperation . GREATER , 50 ) ,
numericKeyFilter ( EntityKeyType . TIME_SERIES , "temperature" , NumericFilterPredicate . NumericOperation . LESS , 10 ) ) ;
// OR: deviceA (60>50) and deviceB (5<10) match => count=2
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 2 ) ) ;
// AND: no device has ts temperature both >50 AND <10 => count=0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
@Test
public void testCountEntitiesWithOrComplexFilterPredicate ( ) throws Exception {
// Key-level ComplexFilterPredicate combined with query-level OR
String type = "orCplxType" ;
createDeviceWithSharedAttributes ( "OrCplxDeviceA" , type , "{\"temperature\":65,\"humidity\":50}" ) ;
createDeviceWithSharedAttributes ( "OrCplxDeviceB" , type , "{\"temperature\":25,\"humidity\":90}" ) ;
createDeviceWithSharedAttributes ( "OrCplxDeviceC" , type , "{\"temperature\":25,\"humidity\":50}" ) ;
// Key filter 1: temperature > 50 AND temperature < 70 (complex predicate within key filter) — matches A only
NumericFilterPredicate gt50 = new NumericFilterPredicate ( ) ;
gt50 . setValue ( FilterPredicateValue . fromDouble ( 50 ) ) ;
gt50 . setOperation ( NumericFilterPredicate . NumericOperation . GREATER ) ;
NumericFilterPredicate lt70 = new NumericFilterPredicate ( ) ;
lt70 . setValue ( FilterPredicateValue . fromDouble ( 70 ) ) ;
lt70 . setOperation ( NumericFilterPredicate . NumericOperation . LESS ) ;
ComplexFilterPredicate complexTempPred = new ComplexFilterPredicate ( ) ;
complexTempPred . setOperation ( ComplexOperation . AND ) ;
complexTempPred . setPredicates ( List . of ( gt50 , lt70 ) ) ;
KeyFilter tempComplexFilter = new KeyFilter ( ) ;
tempComplexFilter . setKey ( new EntityKey ( EntityKeyType . ATTRIBUTE , "temperature" ) ) ;
tempComplexFilter . setValueType ( EntityKeyValueType . NUMERIC ) ;
tempComplexFilter . setPredicate ( complexTempPred ) ;
// Key filter 2: humidity > 80 (simple predicate) — matches B only
List < KeyFilter > keyFilters = List . of (
tempComplexFilter ,
numericAttributeKeyFilter ( "humidity" , NumericFilterPredicate . NumericOperation . GREATER , 80 ) ) ;
// Query-level OR: A matches key filter 1, B matches key filter 2 => 2
EntityCountQuery orQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . OR ) ;
await ( ) . atMost ( TIMEOUT , TimeUnit . SECONDS ) . untilAsserted ( ( ) - > countByQueryAndCheck ( orQuery , 2 ) ) ;
// Query-level AND: no device matches both key filters => 0
EntityCountQuery andQuery = new EntityCountQuery ( deviceTypeFilter ( type ) , keyFilters , ComplexOperation . AND ) ;
countByQueryAndCheck ( andQuery , 0 ) ;
}
}
Jake
5 months ago
GitHub