refactoring: customer - test start

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

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
+import lombok.extern.slf4j.Slf4j;
 import org.mockito.Mockito;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.thingsboard.server.cluster.TbClusterService;
@@ -26,6 +27,8 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.model.ModelConstants;
 
@@ -35,6 +38,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.thingsboard.server.service.entitiy.DefaultTbNotificationEntityService.edgeTypeByActionType;
 
+@Slf4j
 public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
 
     @SpyBean
@@ -43,31 +47,53 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
     @SpyBean
     protected AuditLogService auditLogService;
 
-    protected void testNotifyEntityOk(HasName entity, EntityId entityId, EntityId originatorId,
-                                      TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                      ActionType actionType) {
-        testSendNotificationMsgToEdgeServiceOk(entityId, tenantId, actionType);
-        testLogEntityActionOk(entity, originatorId, tenantId, customerId, userId, userName, actionType);
-        testPushMsgToRuleEngineOk(entity, originatorId, tenantId, customerId, userId, userName, actionType);
+    protected void testNotifyEntityOne(HasName entity, EntityId entityId, EntityId originatorId,
+                                       TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                       ActionType actionType, Object... additionalInfo) {
+        testSendNotificationMsgToEdgeServiceOne(entityId, tenantId, actionType);
+        testLogEntityActionOne(entity, originatorId, tenantId, customerId, userId, userName, actionType, additionalInfo);
+        testPushMsgToRuleEngineOne(originatorId, tenantId);
         Mockito.reset(tbClusterService, auditLogService);
     }
 
-    protected void testNotifyEntityDeleteOk(HasName entity, EntityId entityId, EntityId originatorId,
-                                            TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                            ActionType actionType) {
-        Mockito.verify(tbClusterService, never()).sendNotificationMsgToEdgeService(Mockito.any(),
-                Mockito.any(), Mockito.any(entityId.getClass()), Mockito.any(), Mockito.any(), Mockito.any());
-        testLogEntityActionOk(entity, originatorId, tenantId, customerId, userId, userName, actionType);
-        testPushMsgToRuleEngineOk(entity, originatorId, tenantId, customerId, userId, userName, actionType);
+
+    protected void testNotifyEntityDeleteOneMsgToEdgeServiceNever(HasName entity, EntityId entityId, EntityId originatorId,
+                                                                  TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                                                  ActionType actionType, Object... additionalInfo) {
+        testNotificationMsgToEdgeServiceNever(entityId);
+        testLogEntityActionOne(entity, originatorId, tenantId, customerId, userId, userName, actionType, additionalInfo);
+        testPushMsgToRuleEngineOne(entityId, tenantId);
+        testBroadcastEntityStateChangeEventOne(entityId, tenantId);
+
     }
 
-    private void testNotifyEntityError(EntityId entityId, HasName entity, TenantId tenantId,
-                                       UserId userId, String userName, ActionType actionType, Exception exp,
-                                       Object... additionalInfo) {
+    protected void testNotifyEntityOneMsgToEdgeServiceNever(HasName entity, EntityId entityId, EntityId originatorId,
+                                                            TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                                            ActionType actionType, Object... additionalInfo) {
+        testNotificationMsgToEdgeServiceNever(entityId);
+        testLogEntityActionOne(entity, originatorId, tenantId, customerId, userId, userName, actionType, additionalInfo);
+        testPushMsgToRuleEngineOne(originatorId, tenantId);
+        Mockito.reset(tbClusterService, auditLogService);
+    }
+
+    protected void testNotifyEntityBroadcastEntityStateChangeEventOneMsgToEdgeServiceNever(HasName entity, EntityId entityId, EntityId originatorId,
+                                                                                           TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                                                                           ActionType actionType, Object... additionalInfo) {
+        testNotificationMsgToEdgeServiceNever(entityId);
+        testLogEntityActionOne(entity, originatorId, tenantId, customerId, userId, userName, actionType, additionalInfo);
+        testPushMsgToRuleEngineOne(originatorId, tenantId);
+        testBroadcastEntityStateChangeEventOne(entityId, tenantId);
+        Mockito.reset(tbClusterService, auditLogService);
+    }
+
+    protected void testNotifyEntityError(HasName entity, TenantId tenantId,
+                                         UserId userId, String userName, ActionType actionType, Exception exp,
+                                         Object... additionalInfo) {
         CustomerId customer_NULL_UUID = (CustomerId) EntityIdFactory.getByTypeAndUuid(EntityType.CUSTOMER, ModelConstants.NULL_UUID);
-        EntityId entity_NULL_UUID = EntityIdFactory.getByTypeAndUuid(EntityType.valueOf(entity.getClass().toString().substring(entity.getClass().toString().lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH)),
+        EntityId entity_NULL_UUID = EntityIdFactory.getByTypeAndUuid(EntityType.valueOf(entity.getClass().toString()
+                        .substring(entity.getClass().toString().lastIndexOf(".") + 1).toUpperCase(Locale.ENGLISH)),
                 ModelConstants.NULL_UUID);
-        testNotificationMsgToEdgeServiceNever(entityId);
+        testNotificationMsgToEdgeServiceNever(entity_NULL_UUID);
         if (additionalInfo.length > 0) {
             Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId),
                     Mockito.eq(customer_NULL_UUID), Mockito.eq(userId), Mockito.eq(userName),
@@ -77,9 +103,9 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
             Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId),
                     Mockito.eq(customer_NULL_UUID), Mockito.eq(userId), Mockito.eq(userName),
                     Mockito.eq(entity_NULL_UUID), Mockito.any(entity.getClass()), Mockito.eq(actionType),
-                    Mockito.any(exp.getClass()), Mockito.isNull());
+                    Mockito.any(exp.getClass()));
         }
-        Mockito.verify(tbClusterService, never()).pushMsgToRuleEngine(Mockito.any(), Mockito.any(entityId.getClass()),
+        Mockito.verify(tbClusterService, never()).pushMsgToRuleEngine(Mockito.any(), Mockito.any(entity_NULL_UUID.getClass()),
                 Mockito.any(), Mockito.any());
         Mockito.reset(tbClusterService, auditLogService);
     }
@@ -106,27 +132,46 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
                 Mockito.any(entityId.getClass()), Mockito.any(), Mockito.any());
     }
 
-    private void testLogEntityActionOk(HasName entity, EntityId originatorId,
-                                       TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                       ActionType actionType) {
-        Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId), Mockito.eq(customerId),
-                Mockito.eq(userId), Mockito.eq(userName), Mockito.eq(originatorId),
-                Mockito.eq(entity), Mockito.eq(actionType), Mockito.isNull());
+    private void testLogEntityActionOne(HasName entity, EntityId originatorId, TenantId tenantId, CustomerId customerId,
+                                        UserId userId, String userName, ActionType actionType, Object... additionalInfo) {
+        if (additionalInfo.length == 0) {
+            Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId), Mockito.eq(customerId),
+                    Mockito.eq(userId), Mockito.eq(userName), Mockito.eq(originatorId),
+                    Mockito.eq(entity), Mockito.eq(actionType), Mockito.isNull());
+        } else {
+            String additionalInfoStr = extractParameter(String.class, 0, additionalInfo);
+            Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId), Mockito.eq(customerId),
+                    Mockito.eq(userId), Mockito.eq(userName), Mockito.eq(originatorId),
+                    Mockito.eq(entity), Mockito.eq(actionType), Mockito.isNull(), Mockito.eq(additionalInfoStr));
+        }
     }
 
-    private void testPushMsgToRuleEngineOk(HasName entity, EntityId originatorId,
-                                           TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                           ActionType actionType) {
-
-        Mockito.verify(auditLogService, times(1)).logEntityAction(Mockito.eq(tenantId), Mockito.eq(customerId),
-                Mockito.eq(userId), Mockito.eq(userName), Mockito.eq(originatorId),
-                Mockito.eq(entity), Mockito.eq(actionType), Mockito.isNull());
+    private void testPushMsgToRuleEngineOne(EntityId originatorId, TenantId tenantId) {
+        Mockito.verify(tbClusterService, times(1)).pushMsgToRuleEngine(Mockito.eq(tenantId),
+                Mockito.eq(originatorId), Mockito.any(TbMsg.class), Mockito.isNull());
     }
 
-    private void testSendNotificationMsgToEdgeServiceOk(EntityId entityId, TenantId tenantId, ActionType actionType) {
+    private void testSendNotificationMsgToEdgeServiceOne(EntityId entityId, TenantId tenantId, ActionType actionType) {
         Mockito.verify(tbClusterService, times(1)).sendNotificationMsgToEdgeService(Mockito.eq(tenantId),
                 Mockito.isNull(), Mockito.eq(entityId), Mockito.isNull(), Mockito.isNull(),
                 Mockito.eq(edgeTypeByActionType(actionType)));
     }
 
+    private void testBroadcastEntityStateChangeEventOne(EntityId entityId, TenantId tenantId) {
+        Mockito.verify(tbClusterService, times(1)).broadcastEntityStateChangeEvent(Mockito.eq(tenantId),
+                Mockito.any(entityId.getClass()), Mockito.any(ComponentLifecycleEvent.class));
+    }
+
+    private <T> T extractParameter(Class<T> clazz, int index, Object... additionalInfo) {
+        T result = null;
+        if (additionalInfo != null && additionalInfo.length > index) {
+            Object paramObject = additionalInfo[index];
+            if (clazz.isInstance(paramObject)) {
+                result = clazz.cast(paramObject);
+            }
+        }
+        return result;
+    }
+
+
 }

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

@@ -65,7 +65,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         Alarm alarm = createAlarm(TEST_ALARM_TYPE);
 
-        testNotifyEntityOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOne(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ADDED);
         logout();
     }
@@ -78,7 +78,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         Alarm alarm = createAlarm(TEST_ALARM_TYPE);
 
-        testNotifyEntityOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOne(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ADDED);
         logout();
     }
@@ -91,7 +91,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         Alarm alarm = createAlarm(TEST_ALARM_TYPE);
 
-        testNotifyEntityOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOne(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ADDED);
 
         alarm.setSeverity(AlarmSeverity.MAJOR);
@@ -99,7 +99,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(updatedAlarm);
         Assert.assertEquals(AlarmSeverity.MAJOR, updatedAlarm.getSeverity());
 
-        testNotifyEntityOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOne(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.UPDATED);
         logout();
     }
@@ -112,7 +112,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         Alarm alarm = createAlarm(TEST_ALARM_TYPE);
 
-        testNotifyEntityOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOne(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ADDED);
 
         alarm.setSeverity(AlarmSeverity.MAJOR);
@@ -120,7 +120,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(updatedAlarm);
         Assert.assertEquals(AlarmSeverity.MAJOR, updatedAlarm.getSeverity());
 
-        testNotifyEntityOk(updatedAlarm, updatedAlarm.getId(), updatedAlarm.getOriginator(),
+        testNotifyEntityOne(updatedAlarm, updatedAlarm.getId(), updatedAlarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.UPDATED);
         logout();
     }
@@ -166,7 +166,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
-        testNotifyEntityDeleteOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOneMsgToEdgeServiceNever(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED);
         logout();
     }
@@ -180,7 +180,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
 
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
-        testNotifyEntityDeleteOk(alarm, alarm.getId(), alarm.getOriginator(),
+        testNotifyEntityOneMsgToEdgeServiceNever(alarm, alarm.getId(), alarm.getOriginator(),
                 tenantId, tenantAdminCustomerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED);
         logout();
     }
@@ -229,7 +229,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.CLEARED_UNACK, foundAlarm.getStatus());
 
-        testNotifyEntityOk(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+        testNotifyEntityOne(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ALARM_CLEAR);
         logout();
     }
@@ -246,7 +246,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.CLEARED_UNACK, foundAlarm.getStatus());
 
-        testNotifyEntityOk(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+        testNotifyEntityOne(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
                 tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_CLEAR);
         logout();
     }
@@ -264,7 +264,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest {
         Assert.assertNotNull(foundAlarm);
         Assert.assertEquals(AlarmStatus.ACTIVE_ACK, foundAlarm.getStatus());
 
-        testNotifyEntityOk(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
+        testNotifyEntityOne(foundAlarm, foundAlarm.getId(), foundAlarm.getOriginator(),
                 tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ALARM_ACK);
         logout();
     }

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

@@ -25,14 +25,17 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.exception.DataValidationException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,71 +89,164 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
     public void testSaveCustomer() throws Exception {
         Customer customer = new Customer();
         customer.setTitle("My customer");
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
         Assert.assertNotNull(savedCustomer);
         Assert.assertNotNull(savedCustomer.getId());
         Assert.assertTrue(savedCustomer.getCreatedTime() > 0);
         Assert.assertEquals(customer.getTitle(), savedCustomer.getTitle());
+
+        testNotifyEntityOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(),
+                tenantAdmin.getEmail(), ActionType.ADDED);
+
         savedCustomer.setTitle("My new customer");
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         doPost("/api/customer", savedCustomer, Customer.class);
 
+        testNotifyEntityOne(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.UPDATED);
+
         Customer foundCustomer = doGet("/api/customer/" + savedCustomer.getId().getId().toString(), Customer.class);
         Assert.assertEquals(foundCustomer.getTitle(), savedCustomer.getTitle());
 
         doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isOk());
+
+        testNotifyEntityBroadcastEntityStateChangeEventOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
+                ActionType.DELETED, savedCustomer.getId().getId().toString());
     }
 
     @Test
     public void testSaveCustomerWithViolationOfValidation() throws Exception {
         Customer customer = new Customer();
+
+        Mockito.reset(tbClusterService, auditLogService);
+
+        doPost("/api/customer", customer)
+                .andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString("Customer title should be specified")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: empty title"));
+
         customer.setTitle(RandomStringUtils.randomAlphabetic(300));
+
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad title"));
+
         customer.setTitle("Normal title");
+        customer.setEmail("invalid@mail");
+        doPost("/api/customer", customer)
+                .andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString("Invalid email address format 'invalid@mail'")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: invalid email"));
+
+        customer.setEmail("normal@mail.com.ua");
+
         customer.setCity(RandomStringUtils.randomAlphabetic(300));
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of city must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad City"));
+
         customer.setCity("Normal city");
         customer.setCountry(RandomStringUtils.randomAlphabetic(300));
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of country must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad Country"));
+
         customer.setCountry("Ukraine");
         customer.setPhone(RandomStringUtils.randomAlphabetic(300));
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of phone must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad Phone"));
+
         customer.setPhone("+3892555554512");
         customer.setState(RandomStringUtils.randomAlphabetic(300));
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of state must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad state"));
+
         customer.setState("Normal state");
         customer.setZip(RandomStringUtils.randomAlphabetic(300));
         doPost("/api/customer", customer).andExpect(statusReason(containsString("length of zip or postal code must be equal or less than 255")));
+
+        testNotifyEntityError(customer, savedTenant.getId(),
+                tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException("Test: bad Zip"));
     }
 
     @Test
     public void testUpdateCustomerFromDifferentTenant() throws Exception {
         Customer customer = new Customer();
         customer.setTitle("My customer");
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
+
+        testNotifyEntityOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED);
+
         doPost("/api/customer", savedCustomer, Customer.class);
 
         loginDifferentTenant();
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         doPost("/api/customer", savedCustomer, Customer.class, status().isForbidden());
+
+        testNotifyEntityNever(savedCustomer.getId(), savedCustomer);
+
         deleteDifferentTenant();
 
         login(tenantAdmin.getName(), "testPassword1");
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isOk());
+
+        testNotifyEntityDeleteOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
+                ActionType.DELETED, savedCustomer.getId().getId().toString());
     }
 
     @Test
     public void testFindCustomerById() throws Exception {
         Customer customer = new Customer();
         customer.setTitle("My customer");
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
 
+        testNotifyEntityOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(),
+                tenantAdmin.getEmail(), ActionType.ADDED);
+
         Customer foundCustomer = doGet("/api/customer/" + savedCustomer.getId().getId().toString(), Customer.class);
         Assert.assertNotNull(foundCustomer);
         Assert.assertEquals(savedCustomer, foundCustomer);
 
         doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isOk());
+
+        testNotifyEntityBroadcastEntityStateChangeEventOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
+                ActionType.DELETED, savedCustomer.getId().getId().toString());
     }
 
     @Test
@@ -159,36 +255,19 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
         customer.setTitle("My customer");
         Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
 
+        Mockito.reset(tbClusterService, auditLogService);
+
         doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isOk());
 
+        testNotifyEntityBroadcastEntityStateChangeEventOneMsgToEdgeServiceNever(savedCustomer, savedCustomer.getId(), savedCustomer.getId(),
+                savedCustomer.getTenantId(), savedCustomer.getId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
+                ActionType.DELETED, savedCustomer.getId().getId().toString());
+
         doGet("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isNotFound());
     }
 
-    @Test
-    public void testSaveCustomerWithEmptyTitle() throws Exception {
-        Customer customer = new Customer();
-        doPost("/api/customer", customer)
-                .andExpect(status().isBadRequest())
-                .andExpect(statusReason(containsString("Customer title should be specified")));
-    }
-
-    @Test
-    public void testSaveCustomerWithInvalidEmail() throws Exception {
-        Customer customer = new Customer();
-        customer.setTitle("My customer");
-        customer.setEmail("invalid@mail");
-        doPost("/api/customer", customer)
-                .andExpect(status().isBadRequest())
-                .andExpect(statusReason(containsString("Invalid email address format 'invalid@mail'")));
-
-//        loginSysAdmin();
-//
-//        doDelete("/api/tenant/"+savedTenant.getId().getId().toString())
-//        .andExpect(status().isOk());
-    }
-
     @Test
     public void testFindCustomers() throws Exception {
         TenantId tenantId = savedTenant.getId();