dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle properly cases when state persistent to timeseries

Browse Source
This commit is contained in:
Volodymyr Babak 2023-04-10 17:52:05 +03:00
parent fa8c3cc6e5
commit 80f1ec2fcd
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
View File

@ -77,9 +77,9 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
EdgeEventActionType actionType = getAlarmActionType(msg); EdgeEventActionType actionType = getAlarmActionType(msg);
return buildEvent(ctx.getTenantId(), actionType, getUUIDFromMsgData(msg), getAlarmEventType(), null); return buildEvent(ctx.getTenantId(), actionType, getUUIDFromMsgData(msg), getAlarmEventType(), null);
} else { } else {
EdgeEventActionType actionType = getEdgeEventActionTypeByMsgType(msgType);
Map<String, Object> entityBody = new HashMap<>();
Map<String, String> metadata = msg.getMetaData().getData(); Map<String, String> metadata = msg.getMetaData().getData();
EdgeEventActionType actionType = getEdgeEventActionTypeByMsgType(msgType, metadata);
Map<String, Object> entityBody = new HashMap<>();
JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData()); JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData());
switch (actionType) { switch (actionType) {
case ATTRIBUTES_UPDATED: case ATTRIBUTES_UPDATED:
@ -148,21 +148,27 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
return scope; return scope;
} }
protected EdgeEventActionType getEdgeEventActionTypeByMsgType(String msgType) { protected EdgeEventActionType getEdgeEventActionTypeByMsgType(String msgType, Map<String, String> metadata) {
EdgeEventActionType actionType; EdgeEventActionType actionType;
if (SessionMsgType.POST_TELEMETRY_REQUEST.name().equals(msgType) if (SessionMsgType.POST_TELEMETRY_REQUEST.name().equals(msgType)
|| DataConstants.TIMESERIES_UPDATED.equals(msgType)) { || DataConstants.TIMESERIES_UPDATED.equals(msgType)) {
actionType = EdgeEventActionType.TIMESERIES_UPDATED; actionType = EdgeEventActionType.TIMESERIES_UPDATED;
} else if (DataConstants.ATTRIBUTES_UPDATED.equals(msgType) } else if (DataConstants.ATTRIBUTES_UPDATED.equals(msgType)) {
|| DataConstants.CONNECT_EVENT.equals(msgType)
|| DataConstants.DISCONNECT_EVENT.equals(msgType)
|| DataConstants.ACTIVITY_EVENT.equals(msgType)
|| DataConstants.INACTIVITY_EVENT.equals(msgType)) {
actionType = EdgeEventActionType.ATTRIBUTES_UPDATED; actionType = EdgeEventActionType.ATTRIBUTES_UPDATED;
} else if (SessionMsgType.POST_ATTRIBUTES_REQUEST.name().equals(msgType)) { } else if (SessionMsgType.POST_ATTRIBUTES_REQUEST.name().equals(msgType)) {
actionType = EdgeEventActionType.POST_ATTRIBUTES; actionType = EdgeEventActionType.POST_ATTRIBUTES;
} else if (DataConstants.ATTRIBUTES_DELETED.equals(msgType)) { } else if (DataConstants.ATTRIBUTES_DELETED.equals(msgType)) {
actionType = EdgeEventActionType.ATTRIBUTES_DELETED; actionType = EdgeEventActionType.ATTRIBUTES_DELETED;
} else if (DataConstants.CONNECT_EVENT.equals(msgType)
|| DataConstants.DISCONNECT_EVENT.equals(msgType)
|| DataConstants.ACTIVITY_EVENT.equals(msgType)
|| DataConstants.INACTIVITY_EVENT.equals(msgType)) {
String scope = metadata.get(SCOPE);
if ( StringUtils.isEmpty(scope)) {
actionType = EdgeEventActionType.TIMESERIES_UPDATED;
} else {
actionType = EdgeEventActionType.ATTRIBUTES_UPDATED;
}
} else { } else {
log.warn("Unsupported msg type [{}]", msgType); log.warn("Unsupported msg type [{}]", msgType);
throw new IllegalArgumentException("Unsupported msg type: " + msgType); throw new IllegalArgumentException("Unsupported msg type: " + msgType);

49
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
View File

@ -115,23 +115,38 @@ public class TbMsgPushToEdgeNodeTest {
List<String> miscEvents = List.of(DataConstants.CONNECT_EVENT, DataConstants.DISCONNECT_EVENT, List<String> miscEvents = List.of(DataConstants.CONNECT_EVENT, DataConstants.DISCONNECT_EVENT,
DataConstants.ACTIVITY_EVENT, DataConstants.INACTIVITY_EVENT); DataConstants.ACTIVITY_EVENT, DataConstants.INACTIVITY_EVENT);
for (String event : miscEvents) { for (String event : miscEvents) {
Mockito.when(ctx.getTenantId()).thenReturn(tenantId); TbMsgMetaData metaData = new TbMsgMetaData();
Mockito.when(ctx.getEdgeService()).thenReturn(edgeService); metaData.putValue(DataConstants.SCOPE, DataConstants.SERVER_SCOPE);
Mockito.when(ctx.getEdgeEventService()).thenReturn(edgeEventService); testEvent(event, metaData, EdgeEventActionType.ATTRIBUTES_UPDATED, "kv");
Mockito.when(ctx.getDbCallbackExecutor()).thenReturn(dbCallbackExecutor);
Mockito.when(edgeEventService.saveAsync(any())).thenReturn(SettableFuture.create());
TbMsg msg = TbMsg.newMsg(event, new EdgeId(UUID.randomUUID()), new TbMsgMetaData(),
TbMsgDataType.JSON, "{\"lastConnectTs\":1}", null, null);
node.onMsg(ctx, msg);
ArgumentMatcher<EdgeEvent> eventArgumentMatcher = edgeEvent ->
edgeEvent.getAction().equals(EdgeEventActionType.ATTRIBUTES_UPDATED)
&& edgeEvent.getBody().get("kv").get("lastConnectTs").asInt() == 1;
verify(edgeEventService).saveAsync(Mockito.argThat(eventArgumentMatcher));
Mockito.reset(ctx, edgeEventService);
} }
} }
@Test
public void testMiscEventsProcessedAsTimeseriesUpdated() {
List<String> miscEvents = List.of(DataConstants.CONNECT_EVENT, DataConstants.DISCONNECT_EVENT,
DataConstants.ACTIVITY_EVENT, DataConstants.INACTIVITY_EVENT);
for (String event : miscEvents) {
testEvent(event, new TbMsgMetaData(), EdgeEventActionType.TIMESERIES_UPDATED, "data");
}
}
private void testEvent(String event, TbMsgMetaData metaData, EdgeEventActionType expectedType, String dataKey) {
Mockito.when(ctx.getTenantId()).thenReturn(tenantId);
Mockito.when(ctx.getEdgeService()).thenReturn(edgeService);
Mockito.when(ctx.getEdgeEventService()).thenReturn(edgeEventService);
Mockito.when(ctx.getDbCallbackExecutor()).thenReturn(dbCallbackExecutor);
Mockito.when(edgeEventService.saveAsync(any())).thenReturn(SettableFuture.create());
TbMsg msg = TbMsg.newMsg(event, new EdgeId(UUID.randomUUID()), metaData,
TbMsgDataType.JSON, "{\"lastConnectTs\":1}", null, null);
node.onMsg(ctx, msg);
ArgumentMatcher<EdgeEvent> eventArgumentMatcher = edgeEvent ->
edgeEvent.getAction().equals(expectedType)
&& edgeEvent.getBody().get(dataKey).get("lastConnectTs").asInt() == 1;
verify(edgeEventService).saveAsync(Mockito.argThat(eventArgumentMatcher));
Mockito.reset(ctx, edgeEventService);
}
} }