tests added for update service for convertDeviceProfileAlarmRulesForVersion330
This commit is contained in:
Sergey Matvienko
parent
b477328dd3
commit
27d745f1e3
@ -145,10 +145,16 @@ public class DefaultDataUpdateService implements DataUpdateService {
|
||||
|
||||
@Override
|
||||
protected void updateEntity(DeviceProfileEntity deviceProfile) {
|
||||
if (deviceProfile.getProfileData().has("alarms") &&
|
||||
!deviceProfile.getProfileData().get("alarms").isNull()) {
|
||||
if (convertDeviceProfileForVersion330(deviceProfile.getProfileData())) {
|
||||
deviceProfileRepository.save(deviceProfile);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
boolean convertDeviceProfileForVersion330(JsonNode profileData) {
|
||||
boolean isUpdated = false;
|
||||
JsonNode alarms = deviceProfile.getProfileData().get("alarms");
|
||||
if (profileData.has("alarms") && !profileData.get("alarms").isNull()) {
|
||||
JsonNode alarms = profileData.get("alarms");
|
||||
for (JsonNode alarm : alarms) {
|
||||
if (alarm.has("createRules")) {
|
||||
JsonNode createRules = alarm.get("createRules");
|
||||
@ -168,12 +174,9 @@ public class DefaultDataUpdateService implements DataUpdateService {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isUpdated) {
|
||||
deviceProfileRepository.save(deviceProfile);
|
||||
}
|
||||
return isUpdated;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private final PaginatedUpdater<String, Tenant> tenantsDefaultRuleChainUpdater =
|
||||
new PaginatedUpdater<>() {
|
||||
@ -429,7 +432,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean convertDeviceProfileAlarmRulesForVersion330(JsonNode spec) {
|
||||
boolean convertDeviceProfileAlarmRulesForVersion330(JsonNode spec) {
|
||||
if (spec != null) {
|
||||
if (spec.has("type") && spec.get("type").asText().equals("DURATION")) {
|
||||
if (spec.has("value")) {
|
||||
|
||||
@ -0,0 +1,97 @@
|
||||
/**
|
||||
* Copyright © 2016-2021 The Thingsboard Authors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.thingsboard.server.service.install.update;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.BDDMockito.willCallRealMethod;
|
||||
|
||||
@ActiveProfiles("install")
|
||||
@SpringBootTest(classes = DefaultDataUpdateService.class)
|
||||
class DefaultDataUpdateServiceTest {
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
@MockBean
|
||||
DefaultDataUpdateService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
willCallRealMethod().given(service).convertDeviceProfileAlarmRulesForVersion330(any());
|
||||
willCallRealMethod().given(service).convertDeviceProfileForVersion330(any());
|
||||
}
|
||||
|
||||
JsonNode readFromResource(String resourceName) throws IOException {
|
||||
return mapper.readTree(this.getClass().getClassLoader().getResourceAsStream(resourceName));
|
||||
}
|
||||
|
||||
@Test
|
||||
void convertDeviceProfileAlarmRulesForVersion330FirstRun() throws IOException {
|
||||
JsonNode spec = readFromResource("update/330/device_profile_001_in.json");
|
||||
JsonNode expected = readFromResource("update/330/device_profile_001_out.json");
|
||||
|
||||
assertThat(service.convertDeviceProfileForVersion330(spec.get("profileData"))).isTrue();
|
||||
assertThat(spec.toPrettyString()).isEqualTo(expected.toPrettyString()); // use IDE feature <Click to see difference>
|
||||
}
|
||||
|
||||
@Test
|
||||
void convertDeviceProfileAlarmRulesForVersion330SecondRun() throws IOException {
|
||||
JsonNode spec = readFromResource("update/330/device_profile_001_out.json");
|
||||
JsonNode expected = readFromResource("update/330/device_profile_001_out.json");
|
||||
|
||||
assertThat(service.convertDeviceProfileForVersion330(spec.get("profileData"))).isFalse();
|
||||
assertThat(spec.toPrettyString()).isEqualTo(expected.toPrettyString()); // use IDE feature <Click to see difference>
|
||||
}
|
||||
|
||||
@Test
|
||||
void convertDeviceProfileAlarmRulesForVersion330EmptyJson() throws JsonProcessingException {
|
||||
JsonNode spec = mapper.readTree("{ }");
|
||||
JsonNode expected = mapper.readTree("{ }");
|
||||
|
||||
assertThat(service.convertDeviceProfileForVersion330(spec)).isFalse();
|
||||
assertThat(spec.toPrettyString()).isEqualTo(expected.toPrettyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void convertDeviceProfileAlarmRulesForVersion330AlarmNodeNull() throws JsonProcessingException {
|
||||
JsonNode spec = mapper.readTree("{ \"alarms\" : null }");
|
||||
JsonNode expected = mapper.readTree("{ \"alarms\" : null }");
|
||||
|
||||
assertThat(service.convertDeviceProfileForVersion330(spec)).isFalse();
|
||||
assertThat(spec.toPrettyString()).isEqualTo(expected.toPrettyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void convertDeviceProfileAlarmRulesForVersion330NoAlarmNode() throws JsonProcessingException {
|
||||
JsonNode spec = mapper.readTree("{ \"configuration\": { \"type\": \"DEFAULT\" } }");
|
||||
JsonNode expected = mapper.readTree("{ \"configuration\": { \"type\": \"DEFAULT\" } }");
|
||||
|
||||
assertThat(service.convertDeviceProfileForVersion330(spec)).isFalse();
|
||||
assertThat(spec.toPrettyString()).isEqualTo(expected.toPrettyString());
|
||||
}
|
||||
|
||||
}
|
||||
3
application/src/test/resources/update/330/README.md
Normal file
3
application/src/test/resources/update/330/README.md
Normal file
@ -0,0 +1,3 @@
|
||||
To get json from live Thingsboard instance use those methods:
|
||||
1. Browser: F12 -> Network -> open device profile page -> copy raw response
|
||||
2. Database: SELECT * FROM public.device_profile WHERE name = 'LORAWAN 001';
|
||||
@ -0,0 +1,173 @@
|
||||
{
|
||||
"id": {
|
||||
"entityType": "DEVICE_PROFILE",
|
||||
"id": "b99fde7a-33dd-4d5d-a325-d0637f6acbe5"
|
||||
},
|
||||
"createdTime": 1627268171906,
|
||||
"tenantId": {
|
||||
"entityType": "TENANT",
|
||||
"id": "3db30ac6-db03-4788-98fe-6e024b422a15"
|
||||
},
|
||||
"name": "LORAWAN 001",
|
||||
"description": "Tektelic - 001",
|
||||
"type": "DEFAULT",
|
||||
"transportType": "DEFAULT",
|
||||
"provisionType": "DISABLED",
|
||||
"defaultRuleChainId": {
|
||||
"entityType": "RULE_CHAIN",
|
||||
"id": "9c50f4df-f41e-443f-bb7d-37b5ac97f3c3"
|
||||
},
|
||||
"defaultQueueName": "LORAWAN",
|
||||
"profileData": {
|
||||
"configuration": {
|
||||
"type": "DEFAULT"
|
||||
},
|
||||
"transportConfiguration": {
|
||||
"type": "DEFAULT"
|
||||
},
|
||||
"provisionConfiguration": {
|
||||
"type": "DISABLED",
|
||||
"provisionDeviceSecret": null
|
||||
},
|
||||
"alarms": [
|
||||
{
|
||||
"id": "b86271fd-5fee-4bd5-975c-d9c18f610cd5",
|
||||
"alarmType": "LORAWAN - Battery Alarm",
|
||||
"createRules": {
|
||||
"CRITICAL": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "batteryLevel"
|
||||
},
|
||||
"valueType": "NUMERIC",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "NUMERIC",
|
||||
"operation": "LESS",
|
||||
"value": {
|
||||
"defaultValue": 25.0,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "DURATION",
|
||||
"unit": "DAYS",
|
||||
"value": 1
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
}
|
||||
},
|
||||
"clearRule": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "batteryLevel"
|
||||
},
|
||||
"valueType": "NUMERIC",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "NUMERIC",
|
||||
"operation": "GREATER_OR_EQUAL",
|
||||
"value": {
|
||||
"defaultValue": 25.0,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "DURATION",
|
||||
"unit": "DAYS",
|
||||
"value": 1
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
},
|
||||
"propagate": true,
|
||||
"propagateRelationTypes": [
|
||||
"UC-0007 LORAWAN"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "c70aef4e-65cf-4578-acd9-e1927c08b469",
|
||||
"alarmType": "LORAWAN - No Data",
|
||||
"createRules": {
|
||||
"CRITICAL": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "active"
|
||||
},
|
||||
"valueType": "BOOLEAN",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "BOOLEAN",
|
||||
"operation": "EQUAL",
|
||||
"value": {
|
||||
"defaultValue": false,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "SIMPLE"
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
}
|
||||
},
|
||||
"clearRule": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "active"
|
||||
},
|
||||
"valueType": "BOOLEAN",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "BOOLEAN",
|
||||
"operation": "EQUAL",
|
||||
"value": {
|
||||
"defaultValue": true,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "SIMPLE"
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
},
|
||||
"propagate": true,
|
||||
"propagateRelationTypes": [
|
||||
"LORAWAN 001 related"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"provisionDeviceKey": null,
|
||||
"default": false
|
||||
}
|
||||
@ -0,0 +1,189 @@
|
||||
{
|
||||
"id": {
|
||||
"entityType": "DEVICE_PROFILE",
|
||||
"id": "b99fde7a-33dd-4d5d-a325-d0637f6acbe5"
|
||||
},
|
||||
"createdTime": 1627268171906,
|
||||
"tenantId": {
|
||||
"entityType": "TENANT",
|
||||
"id": "3db30ac6-db03-4788-98fe-6e024b422a15"
|
||||
},
|
||||
"name": "LORAWAN 001",
|
||||
"description": "Tektelic - 001",
|
||||
"type": "DEFAULT",
|
||||
"transportType": "DEFAULT",
|
||||
"provisionType": "DISABLED",
|
||||
"defaultRuleChainId": {
|
||||
"entityType": "RULE_CHAIN",
|
||||
"id": "9c50f4df-f41e-443f-bb7d-37b5ac97f3c3"
|
||||
},
|
||||
"defaultQueueName": "LORAWAN",
|
||||
"profileData": {
|
||||
"configuration": {
|
||||
"type": "DEFAULT"
|
||||
},
|
||||
"transportConfiguration": {
|
||||
"type": "DEFAULT"
|
||||
},
|
||||
"provisionConfiguration": {
|
||||
"type": "DISABLED",
|
||||
"provisionDeviceSecret": null
|
||||
},
|
||||
"alarms": [
|
||||
{
|
||||
"id": "b86271fd-5fee-4bd5-975c-d9c18f610cd5",
|
||||
"alarmType": "LORAWAN - Battery Alarm",
|
||||
"createRules": {
|
||||
"CRITICAL": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "batteryLevel"
|
||||
},
|
||||
"valueType": "NUMERIC",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "NUMERIC",
|
||||
"operation": "LESS",
|
||||
"value": {
|
||||
"defaultValue": 25.0,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "DURATION",
|
||||
"unit": "DAYS",
|
||||
"predicate": {
|
||||
"defaultValue": 1,
|
||||
"userValue": null,
|
||||
"dynamicValue": {
|
||||
"sourceType": null,
|
||||
"sourceAttribute": null,
|
||||
"inherit": false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
}
|
||||
},
|
||||
"clearRule": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "batteryLevel"
|
||||
},
|
||||
"valueType": "NUMERIC",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "NUMERIC",
|
||||
"operation": "GREATER_OR_EQUAL",
|
||||
"value": {
|
||||
"defaultValue": 25.0,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "DURATION",
|
||||
"unit": "DAYS",
|
||||
"predicate": {
|
||||
"defaultValue": 1,
|
||||
"userValue": null,
|
||||
"dynamicValue": {
|
||||
"sourceType": null,
|
||||
"sourceAttribute": null,
|
||||
"inherit": false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
},
|
||||
"propagate": true,
|
||||
"propagateRelationTypes": [
|
||||
"UC-0007 LORAWAN"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "c70aef4e-65cf-4578-acd9-e1927c08b469",
|
||||
"alarmType": "LORAWAN - No Data",
|
||||
"createRules": {
|
||||
"CRITICAL": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "active"
|
||||
},
|
||||
"valueType": "BOOLEAN",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "BOOLEAN",
|
||||
"operation": "EQUAL",
|
||||
"value": {
|
||||
"defaultValue": false,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "SIMPLE"
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
}
|
||||
},
|
||||
"clearRule": {
|
||||
"condition": {
|
||||
"condition": [
|
||||
{
|
||||
"key": {
|
||||
"type": "TIME_SERIES",
|
||||
"key": "active"
|
||||
},
|
||||
"valueType": "BOOLEAN",
|
||||
"value": null,
|
||||
"predicate": {
|
||||
"type": "BOOLEAN",
|
||||
"operation": "EQUAL",
|
||||
"value": {
|
||||
"defaultValue": true,
|
||||
"userValue": null,
|
||||
"dynamicValue": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"spec": {
|
||||
"type": "SIMPLE"
|
||||
}
|
||||
},
|
||||
"schedule": null,
|
||||
"alarmDetails": null
|
||||
},
|
||||
"propagate": true,
|
||||
"propagateRelationTypes": [
|
||||
"LORAWAN 001 related"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"provisionDeviceKey": null,
|
||||
"default": false
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user