Fixed assignemnt/unassignemnt of dashboards

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java

@@ -26,6 +26,7 @@ import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Slf4j
@@ -40,54 +41,63 @@ public abstract class BaseDashboardProcessor extends BaseEdgeProcessor {
         if (dashboard == null) {
             throw new RuntimeException("[{" + tenantId + "}] dashboardUpdateMsg {" + dashboardUpdateMsg + "} cannot be converted to dashboard");
         }
-        Set<ShortCustomerInfo> assignedCustomers = null;
+        Set<ShortCustomerInfo> newAssignedCustomers = new HashSet<>(dashboard.getAssignedCustomers());
         Dashboard dashboardById = edgeCtx.getDashboardService().findDashboardById(tenantId, dashboardId);
         if (dashboardById == null) {
             created = true;
             dashboard.setId(null);
+            dashboard.setAssignedCustomers(null);
         } else {
             dashboard.setId(dashboardId);
-            assignedCustomers = filterNonExistingCustomers(tenantId, dashboardById.getAssignedCustomers());
+            dashboard.setAssignedCustomers(dashboardById.getAssignedCustomers());
         }
 
         dashboardValidator.validate(dashboard, Dashboard::getTenantId);
         if (created) {
             dashboard.setId(dashboardId);
         }
-        Set<ShortCustomerInfo> msgAssignedCustomers = filterNonExistingCustomers(tenantId, dashboard.getAssignedCustomers());
+
-        if (msgAssignedCustomers != null) {
+        Dashboard savedDashboard = edgeCtx.getDashboardService().saveDashboard(dashboard, false);
-            if (assignedCustomers == null) {
+
-                assignedCustomers = msgAssignedCustomers;
+        updateDashboardAssignments(tenantId, dashboardById, savedDashboard, newAssignedCustomers);
-            } else {
+
-                assignedCustomers.addAll(msgAssignedCustomers);
+        return created;
+    }
+
+    private void updateDashboardAssignments(TenantId tenantId, Dashboard dashboardById, Dashboard savedDashboard, Set<ShortCustomerInfo> newAssignedCustomers) {
+        Set<ShortCustomerInfo> currentAssignedCustomers = new HashSet<>();
+        if (dashboardById != null) {
+            if (dashboardById.getAssignedCustomers() != null) {
+                currentAssignedCustomers.addAll(dashboardById.getAssignedCustomers());
             }
         }
-        dashboard.setAssignedCustomers(assignedCustomers);
+
-        Dashboard savedDashboard = edgeCtx.getDashboardService().saveDashboard(dashboard, false);
+        newAssignedCustomers = filterNonExistingCustomers(tenantId, currentAssignedCustomers, newAssignedCustomers);
-        if (msgAssignedCustomers != null && !msgAssignedCustomers.isEmpty()) {
+
-            for (ShortCustomerInfo assignedCustomer : msgAssignedCustomers) {
+        Set<CustomerId> addedCustomerIds = new HashSet<>();
-                if (assignedCustomer.getCustomerId().equals(customerId)) {
+        Set<CustomerId> removedCustomerIds = new HashSet<>();
-                    edgeCtx.getDashboardService().assignDashboardToCustomer(tenantId, savedDashboard.getId(), assignedCustomer.getCustomerId());
+        for (ShortCustomerInfo newAssignedCustomer : newAssignedCustomers) {
-                }
+            if (!savedDashboard.isAssignedToCustomer(newAssignedCustomer.getCustomerId())) {
+                addedCustomerIds.add(newAssignedCustomer.getCustomerId());
             }
-        } else {
-            unassignCustomersFromDashboard(tenantId, savedDashboard, customerId);
         }
-        return created;
-    }
 
-    private void unassignCustomersFromDashboard(TenantId tenantId, Dashboard dashboard, CustomerId customerId) {
+        for (ShortCustomerInfo currentAssignedCustomer : currentAssignedCustomers) {
-        if (dashboard.getAssignedCustomers() != null && !dashboard.getAssignedCustomers().isEmpty()) {
+            if (!newAssignedCustomers.contains(currentAssignedCustomer)) {
-            for (ShortCustomerInfo assignedCustomer : dashboard.getAssignedCustomers()) {
+                removedCustomerIds.add(currentAssignedCustomer.getCustomerId());
-                if (assignedCustomer.getCustomerId().equals(customerId)) {
-                    edgeCtx.getDashboardService().unassignDashboardFromCustomer(tenantId, dashboard.getId(), assignedCustomer.getCustomerId());
-                }
             }
         }
+
+        for (CustomerId customerIdToAdd : addedCustomerIds) {
+            edgeCtx.getDashboardService().assignDashboardToCustomer(tenantId, savedDashboard.getId(), customerIdToAdd);
+        }
+        for (CustomerId customerIdToRemove : removedCustomerIds) {
+            edgeCtx.getDashboardService().unassignDashboardFromCustomer(tenantId, savedDashboard.getId(), customerIdToRemove);
+        }
     }
 
     protected abstract Dashboard constructDashboardFromUpdateMsg(TenantId tenantId, DashboardId dashboardId, DashboardUpdateMsg dashboardUpdateMsg);
 
-    protected abstract Set<ShortCustomerInfo> filterNonExistingCustomers(TenantId tenantId, Set<ShortCustomerInfo> assignedCustomers);
+    protected abstract Set<ShortCustomerInfo> filterNonExistingCustomers(TenantId tenantId, Set<ShortCustomerInfo> currentAssignedCustomers, Set<ShortCustomerInfo> newAssignedCustomers);
 
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java

@@ -128,9 +128,9 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
     }
 
     @Override
-    protected Set<ShortCustomerInfo> filterNonExistingCustomers(TenantId tenantId, Set<ShortCustomerInfo> assignedCustomers) {
+    protected Set<ShortCustomerInfo> filterNonExistingCustomers(TenantId tenantId, Set<ShortCustomerInfo> currentAssignedCustomers, Set<ShortCustomerInfo> newAssignedCustomers) {
-        // do nothing on cloud
+        newAssignedCustomers.addAll(currentAssignedCustomers);
-        return assignedCustomers;
+        return newAssignedCustomers;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessorV1.java

@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Component
@@ -44,7 +45,7 @@ public class DashboardEdgeProcessorV1 extends DashboardEdgeProcessor {
         Set<ShortCustomerInfo> assignedCustomers;
         if (dashboardUpdateMsg.hasAssignedCustomers()) {
             assignedCustomers = JacksonUtil.fromString(dashboardUpdateMsg.getAssignedCustomers(), new TypeReference<>() {});
-            assignedCustomers = filterNonExistingCustomers(tenantId, assignedCustomers);
+            assignedCustomers = filterNonExistingCustomers(tenantId, new HashSet<>(), assignedCustomers);
             dashboard.setAssignedCustomers(assignedCustomers);
         }
         dashboard.setMobileOrder(dashboardUpdateMsg.hasMobileOrder() ? dashboardUpdateMsg.getMobileOrder() : null);

application/src/test/java/org/thingsboard/server/edge/DashboardEdgeTest.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.edge;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.Sets;
 import com.google.protobuf.AbstractMessage;
 import org.junit.Assert;
 import org.junit.Test;
@@ -175,7 +176,11 @@ public class DashboardEdgeTest extends AbstractEdgeTest {
 
     @Test
     public void testSendDashboardToCloud() throws Exception {
-        Dashboard dashboard = buildDashboardForUplinkMsg();
+        Customer customer = new Customer();
+        customer.setTitle("Edge Customer");
+        Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
+
+        Dashboard dashboard = buildDashboardForUplinkMsg(savedCustomer);
 
         UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder();
         DashboardUpdateMsg.Builder dashboardUpdateMsgBuilder = DashboardUpdateMsg.newBuilder();
@@ -196,6 +201,11 @@ public class DashboardEdgeTest extends AbstractEdgeTest {
         Dashboard foundDashboard = doGet("/api/dashboard/" + dashboard.getUuidId(), Dashboard.class);
         Assert.assertNotNull(foundDashboard);
         Assert.assertEquals("Edge Test Dashboard", foundDashboard.getName());
+
+        PageData<DashboardInfo> pageData = doGetTypedWithPageLink("/api/customer/" + savedCustomer.getId().toString() + "/dashboards?",
+                new TypeReference<>() {}, new PageLink(100));
+        Assert.assertEquals(1, pageData.getData().size());
+        Assert.assertEquals("Edge Test Dashboard", pageData.getData().get(0).getTitle());
     }
 
     @Test
@@ -242,11 +252,12 @@ public class DashboardEdgeTest extends AbstractEdgeTest {
         return savedDashboard;
     }
 
-    private Dashboard buildDashboardForUplinkMsg() {
+    private Dashboard buildDashboardForUplinkMsg(Customer savedCustomer) {
         Dashboard dashboard = new Dashboard();
         dashboard.setId(new DashboardId(UUID.randomUUID()));
         dashboard.setTenantId(tenantId);
         dashboard.setTitle("Edge Test Dashboard");
+        dashboard.setAssignedCustomers(Sets.newHashSet(new ShortCustomerInfo(savedCustomer.getId(), savedCustomer.getTitle(), savedCustomer.isPublic())));
         return dashboard;
     }