Do not create public customer in case edge connection - create only during make public entities and sync to edge

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java

@@ -65,8 +65,10 @@ public class EdgeSyncCursor {
             fetchers.add(new AdminSettingsEdgeEventFetcher(ctx.getAdminSettingsService()));
             fetchers.add(new TenantAdminUsersEdgeEventFetcher(ctx.getUserService()));
         }
-        Customer publicCustomer = ctx.getCustomerService().findOrCreatePublicCustomer(edge.getTenantId());
-        fetchers.add(new CustomerEdgeEventFetcher(publicCustomer.getId()));
+        Customer publicCustomer = ctx.getCustomerService().findPublicCustomer(edge.getTenantId());
+        if (publicCustomer != null) {
+            fetchers.add(new CustomerEdgeEventFetcher(publicCustomer.getId()));
+        }
         if (edge.getCustomerId() != null && !EntityId.NULL_UUID.equals(edge.getCustomerId().getId())) {
             fetchers.add(new CustomerEdgeEventFetcher(edge.getCustomerId()));
             fetchers.add(new CustomerUsersEdgeEventFetcher(ctx.getUserService(), edge.getCustomerId()));

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java

@@ -81,13 +81,16 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
         UUID uuid = new UUID(edgeNotificationMsg.getEntityIdMSB(), edgeNotificationMsg.getEntityIdLSB());
         CustomerId customerId = new CustomerId(EntityIdFactory.getByEdgeEventTypeAndUuid(type, uuid).getId());
         switch (actionType) {
-            case UPDATED:
-                List<ListenableFuture<Void>> futures = new ArrayList<>();
-                PageDataIterable<Edge> edges = new PageDataIterable<>(link -> edgeCtx.getEdgeService().findEdgesByTenantIdAndCustomerId(tenantId, customerId, link), 1024);
-                for (Edge edge : edges) {
-                    futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, customerId, null));
+            case ADDED:
+                Customer customerById = edgeCtx.getCustomerService().findCustomerById(tenantId, customerId);
+                if (customerById != null && customerById.isPublic()) {
+                    return findEdgesAndSaveEdgeEvents(link -> edgeCtx.getEdgeService().findEdgesByTenantId(tenantId, link),
+                            tenantId, type, actionType, customerId);
                 }
-                return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
+                return Futures.immediateFuture(null);
+            case UPDATED:
+                return findEdgesAndSaveEdgeEvents(link -> edgeCtx.getEdgeService().findEdgesByTenantIdAndCustomerId(tenantId, customerId, link),
+                        tenantId, type, actionType, customerId);
             case DELETED:
                 EdgeId edgeId = new EdgeId(new UUID(edgeNotificationMsg.getEdgeIdMSB(), edgeNotificationMsg.getEdgeIdLSB()));
                 return saveEdgeEvent(tenantId, edgeId, type, actionType, customerId, null);
@@ -96,6 +99,16 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
         }
     }
 
+    public ListenableFuture<Void> findEdgesAndSaveEdgeEvents(PageDataIterable.FetchFunction<Edge> edgeFetcher, TenantId tenantId,
+                                                             EdgeEventType type, EdgeEventActionType actionType, CustomerId customerId) {
+        List<ListenableFuture<Void>> futures = new ArrayList<>();
+        PageDataIterable<Edge> edges = new PageDataIterable<>(edgeFetcher, 1024);
+        for (Edge edge : edges) {
+            futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, customerId, null));
+        }
+        return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
+    }
+
     @Override
     public EdgeEventType getEdgeEventType() {
         return EdgeEventType.CUSTOMER;

application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java

@@ -885,6 +885,10 @@ public class EdgeControllerTest extends AbstractControllerTest {
         device.setType("default");
         Device savedDevice = doPost("/api/device", device, Device.class);
 
+        // create public customer
+        doPost("/api/customer/public/device/" + savedDevice.getId().getId(), Device.class);
+        doDelete("/api/customer/device/" + savedDevice.getId().getId(), Device.class);
+
         simulateEdgeActivation(edge);
 
         doPost("/api/edge/" + edge.getId().getId().toString()

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

@@ -168,6 +168,10 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
 
         Device savedDevice = saveDevice("Edge Device 1", THERMOSTAT_DEVICE_PROFILE_NAME);
 
+        // create public customer
+        doPost("/api/customer/public/device/" + savedDevice.getId().getId(), Device.class);
+        doDelete("/api/customer/device/" + savedDevice.getId().getId(), Device.class);
+
         Asset savedAsset = saveAsset("Edge Asset 1");
 
         updateRootRuleChainMetadata();

common/dao-api/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java

@@ -41,6 +41,8 @@ public interface CustomerService extends EntityDaoService {
 
     Customer findOrCreatePublicCustomer(TenantId tenantId);
 
+    Customer findPublicCustomer(TenantId tenantId);
+
     PageData<Customer> findCustomersByTenantId(TenantId tenantId, PageLink pageLink);
 
     void deleteCustomersByTenantId(TenantId tenantId);

dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java

@@ -213,12 +213,11 @@ public class CustomerServiceImpl extends AbstractCachedEntityService<CustomerCac
     @Override
     public Customer findOrCreatePublicCustomer(TenantId tenantId) {
         log.trace("Executing findOrCreatePublicCustomer, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        Optional<Customer> publicCustomerOpt = customerDao.findPublicCustomerByTenantId(tenantId.getId());
-        if (publicCustomerOpt.isPresent()) {
-            return publicCustomerOpt.get();
+        var publicCustomer = findPublicCustomer(tenantId);
+        if (publicCustomer != null) {
+            return publicCustomer;
         }
-        var publicCustomer = new Customer();
+        publicCustomer = new Customer();
         publicCustomer.setTenantId(tenantId);
         publicCustomer.setTitle(PUBLIC_CUSTOMER_TITLE);
         try {
@@ -230,7 +229,7 @@ public class CustomerServiceImpl extends AbstractCachedEntityService<CustomerCac
             return saveCustomer(publicCustomer, false);
         } catch (DataValidationException e) {
             if (CUSTOMER_UNIQUE_TITLE_EX_MSG.equals(e.getMessage())) {
-                publicCustomerOpt = customerDao.findPublicCustomerByTenantId(tenantId.getId());
+                Optional<Customer> publicCustomerOpt = customerDao.findPublicCustomerByTenantId(tenantId.getId());
                 if (publicCustomerOpt.isPresent()) {
                     return publicCustomerOpt.get();
                 }
@@ -239,6 +238,14 @@ public class CustomerServiceImpl extends AbstractCachedEntityService<CustomerCac
         }
     }
 
+    @Override
+    public Customer findPublicCustomer(TenantId tenantId) {
+        log.trace("Executing findPublicCustomer, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Optional<Customer> publicCustomerOpt = customerDao.findPublicCustomerByTenantId(tenantId.getId());
+        return publicCustomerOpt.orElse(null);
+    }
+
     @Override
     public PageData<Customer> findCustomersByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findCustomersByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);