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

Changes to be in sync with PE

Browse Source
This commit is contained in:
Volodymyr Babak 2022-10-07 21:40:46 +03:00
parent 1beb4fd136
commit 9879b8bcc2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java
View File

@ -50,9 +50,9 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
try { try {
OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(saveOtaPackageInfoRequest), saveOtaPackageInfoRequest.isUsesUrl()); OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(saveOtaPackageInfoRequest), saveOtaPackageInfoRequest.isUsesUrl());
boolean sendToEdge = savedOtaPackageInfo.hasUrl() || savedOtaPackageInfo.isHasData(); boolean sendMsgToEdge = savedOtaPackageInfo.hasUrl() || savedOtaPackageInfo.isHasData();
notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, savedOtaPackageInfo.getId(), notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, savedOtaPackageInfo.getId(),
savedOtaPackageInfo, user, actionType, sendToEdge, null); savedOtaPackageInfo, user, actionType, sendMsgToEdge, null);
return savedOtaPackageInfo; return savedOtaPackageInfo;
} catch (Exception e) { } catch (Exception e) {

2
application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java
View File

@ -36,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
abstract public class BaseEntityViewEdgeTest extends AbstractEdgeTest { abstract public class BaseEntityViewEdgeTest extends AbstractEdgeTest {
@Test @Test
public void testEntityView() throws Exception { public void testEntityViews() throws Exception {
// create entity view and assign to edge // create entity view and assign to edge
edgeImitator.expectMessageAmount(1); edgeImitator.expectMessageAmount(1);
Device device = findDeviceByName("Edge Device 1"); Device device = findDeviceByName("Edge Device 1");

2
application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java
View File

@ -62,6 +62,8 @@ abstract public class BaseUserEdgeTest extends AbstractEdgeTest {
Assert.assertEquals(savedTenantAdmin.getFirstName(), userUpdateMsg.getFirstName()); Assert.assertEquals(savedTenantAdmin.getFirstName(), userUpdateMsg.getFirstName());
Assert.assertEquals(savedTenantAdmin.getLastName(), userUpdateMsg.getLastName()); Assert.assertEquals(savedTenantAdmin.getLastName(), userUpdateMsg.getLastName());
testAutoGeneratedCodeByProtobuf(userUpdateMsg); testAutoGeneratedCodeByProtobuf(userUpdateMsg);
Optional<UserCredentialsUpdateMsg> userCredentialsUpdateMsgOpt = edgeImitator.findMessageByType(UserCredentialsUpdateMsg.class);
Assert.assertTrue(userCredentialsUpdateMsgOpt.isPresent());
// update user // update user
edgeImitator.expectMessageAmount(1); edgeImitator.expectMessageAmount(1);