Improve notification center broadcast logic

application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java

@@ -138,6 +138,7 @@ public class EntityStateSourcingListener {
             case CUSTOMER:
             case EDGE:
             case NOTIFICATION_RULE:
+            case NOTIFICATION_REQUEST:
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
                 break;
             case RULE_CHAIN:
@@ -171,11 +172,6 @@ public class EntityStateSourcingListener {
                 TbResource tbResource = (TbResource) event.getEntity();
                 tbClusterService.onResourceDeleted(tbResource, null);
                 break;
-            case NOTIFICATION_REQUEST:
-                NotificationRequest request = (NotificationRequest) event.getEntity();
-                if (request.isScheduled()) {
-                    tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
-                }
             default:
                 break;
         }

application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java

@@ -398,10 +398,6 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                     .notificationRequestId(notificationRequestId)
                     .deleted(true)
                     .build());
-        } else if (notificationRequest.isScheduled()) {
-            // TODO: just forward to scheduler service
-            // handling in EntityStateSourcingListener.class
-            // clusterService.broadcastEntityStateChangeEvent(tenantId, notificationRequestId, ComponentLifecycleEvent.DELETED);
         }
     }
 

dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationRequestService.java

@@ -89,7 +89,9 @@ public class DefaultNotificationRequestService implements NotificationRequestSer
     @Override
     public void deleteNotificationRequest(TenantId tenantId, NotificationRequest request) {
         notificationRequestDao.removeById(tenantId, request.getUuidId());
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entity(request).entityId(request.getId()).build());
+        if (request.isScheduled()) {
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(request.getId()).build());
+        }
     }
 
     @Override