Refactor notification rules processing

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleEngineComponentActor.java

@@ -50,7 +50,8 @@ public abstract class RuleEngineComponentActor<T extends EntityId, P extends Com
     }
 
     private void processNotificationRule(ComponentLifecycleEvent event, Throwable e) {
-        systemContext.getNotificationRuleProcessingService().process(tenantId, RuleEngineComponentLifecycleEventTrigger.builder()
+        systemContext.getNotificationRuleProcessingService().process(RuleEngineComponentLifecycleEventTrigger.builder()
+                .tenantId(tenantId)
                 .ruleChainId(getRuleChainId())
                 .ruleChainName(getRuleChainName())
                 .componentId(id)

application/src/main/java/org/thingsboard/server/controller/NotificationController.java

@@ -42,10 +42,10 @@ import org.thingsboard.server.common.data.notification.NotificationDeliveryMetho
 import org.thingsboard.server.common.data.notification.NotificationRequest;
 import org.thingsboard.server.common.data.notification.NotificationRequestInfo;
 import org.thingsboard.server.common.data.notification.NotificationRequestPreview;
-import org.thingsboard.server.common.data.notification.info.UserOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetType;
+import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.page.PageData;
@@ -187,9 +187,7 @@ public class NotificationController extends BaseController {
         checkEntity(notificationRequest.getId(), notificationRequest, NOTIFICATION);
 
         notificationRequest.setOriginatorEntityId(user.getId());
-        if (notificationRequest.getInfo() != null && !(notificationRequest.getInfo() instanceof UserOriginatedNotificationInfo)) {
+        notificationRequest.setInfo(null);
-            throw new IllegalArgumentException("Unsupported notification info type");
-        }
         notificationRequest.setRuleId(null);
         notificationRequest.setStatus(null);
         notificationRequest.setStats(null);
@@ -241,8 +239,8 @@ public class NotificationController extends BaseController {
         for (NotificationTarget target : targets) {
             int recipientsCount;
             if (target.getConfiguration().getType() == NotificationTargetType.PLATFORM_USERS) {
-                PageData<User> recipients = notificationTargetService.findRecipientsForNotificationTargetConfig(user.getTenantId(), null,
+                PageData<User> recipients = notificationTargetService.findRecipientsForNotificationTargetConfig(user.getTenantId(),
-                        target.getConfiguration(), new PageLink(recipientsPreviewSize));
+                        (PlatformUsersNotificationTargetConfig) target.getConfiguration(), new PageLink(recipientsPreviewSize));
                 recipientsCount = (int) recipients.getTotalElements();
                 for (User recipient : recipients.getData()) {
                     if (recipientsPreview.size() < recipientsPreviewSize) {

application/src/main/java/org/thingsboard/server/controller/NotificationTargetController.java

@@ -116,7 +116,7 @@ public class NotificationTargetController extends BaseController {
         }
 
         PageLink pageLink = createPageLink(pageSize, page, null, null, null);
-        return notificationTargetService.findRecipientsForNotificationTargetConfig(user.getTenantId(), null, notificationTarget.getConfiguration(), pageLink);
+        return notificationTargetService.findRecipientsForNotificationTargetConfig(user.getTenantId(), (PlatformUsersNotificationTargetConfig) notificationTarget.getConfiguration(), pageLink);
     }
 
     @GetMapping(value = "/targets", params = {"ids"})

application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java

@@ -142,6 +142,13 @@ public class EntityActionService {
                 if (user != null) {
                     metaData.putValue("userId", user.getId().toString());
                     metaData.putValue("userName", user.getName());
+                    metaData.putValue("userEmail", user.getEmail());
+                    if (user.getFirstName() != null) {
+                        metaData.putValue("userFirstName", user.getFirstName());
+                    }
+                    if (user.getLastName() != null) {
+                        metaData.putValue("userLastName", user.getLastName());
+                    }
                 }
                 if (customerId != null && !customerId.isNullUid()) {
                     metaData.putValue("customerId", customerId.toString());

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

@@ -22,13 +22,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.DonAsynchron;
-import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.NotificationCenter;
-import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
+import org.thingsboard.server.common.data.id.NotificationRuleId;
 import org.thingsboard.server.common.data.id.NotificationTargetId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
@@ -46,7 +45,6 @@ import org.thingsboard.server.common.data.notification.settings.NotificationSett
 import org.thingsboard.server.common.data.notification.targets.NotificationRecipient;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
-import org.thingsboard.server.common.data.notification.targets.platform.UsersFilterType;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackNotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
@@ -103,59 +101,57 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     private final NotificationsTopicService notificationsTopicService;
     private final TbQueueProducerProvider producerProvider;
     private final RateLimitService rateLimitService;
-    private final MailService mailService;
-    private final SmsService smsService;
 
     private Map<NotificationDeliveryMethod, NotificationChannel> channels;
 
-
     @Override
-    public NotificationRequest processNotificationRequest(TenantId tenantId, NotificationRequest notificationRequest) {
+    public NotificationRequest processNotificationRequest(TenantId tenantId, NotificationRequest request) {
         if (!rateLimitService.checkRateLimit(tenantId, LimitedApi.NOTIFICATION_REQUEST)) {
             throw new TbRateLimitsException(EntityType.TENANT);
         }
-        NotificationSettings settings = notificationSettingsService.findNotificationSettings(tenantId);
+
         NotificationTemplate notificationTemplate;
-        if (notificationRequest.getTemplateId() != null) {
+        if (request.getTemplateId() != null) {
-            notificationTemplate = notificationTemplateService.findNotificationTemplateById(tenantId, notificationRequest.getTemplateId());
+            notificationTemplate = notificationTemplateService.findNotificationTemplateById(tenantId, request.getTemplateId());
         } else {
-            notificationTemplate = notificationRequest.getTemplate();
+            notificationTemplate = request.getTemplate();
         }
         if (notificationTemplate == null) throw new IllegalArgumentException("Template is missing");
 
-        List<NotificationTarget> targets = notificationRequest.getTargets().stream().map(NotificationTargetId::new)
+        List<NotificationTarget> targets = request.getTargets().stream().map(NotificationTargetId::new)
                 .map(id -> notificationTargetService.findNotificationTargetById(tenantId, id)).collect(Collectors.toList());
-        Set<NotificationDeliveryMethod> availableDeliveryMethods = getAvailableDeliveryMethods(tenantId);
 
+        NotificationRuleId ruleId = request.getRuleId();
         notificationTemplate.getConfiguration().getDeliveryMethodsTemplates().forEach((deliveryMethod, template) -> {
             if (!template.isEnabled()) return;
-            if (!availableDeliveryMethods.contains(deliveryMethod)) {
+            if (!channels.get(deliveryMethod).check(tenantId)) {
-                throw new IllegalArgumentException("Settings for " + deliveryMethod.getName() + " are missing");
+                throw new IllegalArgumentException("Unable to send notification via " + deliveryMethod.getName() + ": not configured or not working");
             }
-            if (notificationRequest.getRuleId() == null) {
+            if (ruleId == null) {
                 if (targets.stream().noneMatch(target -> target.getConfiguration().getType().getSupportedDeliveryMethods().contains(deliveryMethod))) {
                     throw new IllegalArgumentException("Target for " + deliveryMethod.getName() + " delivery method is missing");
                 }
             }
         });
 
-        if (notificationRequest.getAdditionalConfig() != null) {
+        if (request.getAdditionalConfig() != null) {
-            NotificationRequestConfig config = notificationRequest.getAdditionalConfig();
+            NotificationRequestConfig config = request.getAdditionalConfig();
-            if (config.getSendingDelayInSec() > 0 && notificationRequest.getId() == null) {
+            if (config.getSendingDelayInSec() > 0 && request.getId() == null) {
-                notificationRequest.setStatus(NotificationRequestStatus.SCHEDULED);
+                request.setStatus(NotificationRequestStatus.SCHEDULED);
-                NotificationRequest savedNotificationRequest = notificationRequestService.saveNotificationRequest(tenantId, notificationRequest);
+                request = notificationRequestService.saveNotificationRequest(tenantId, request);
-                forwardToNotificationSchedulerService(tenantId, savedNotificationRequest.getId());
+                forwardToNotificationSchedulerService(tenantId, request.getId());
-                return savedNotificationRequest;
+                return request;
             }
         }
+        NotificationSettings settings = notificationSettingsService.findNotificationSettings(tenantId);
 
-        log.debug("Processing notification request (tenantId: {}, targets: {})", tenantId, notificationRequest.getTargets());
+        log.debug("Processing notification request (tenantId: {}, targets: {})", tenantId, request.getTargets());
-        notificationRequest.setStatus(NotificationRequestStatus.PROCESSING);
+        request.setStatus(NotificationRequestStatus.PROCESSING);
-        NotificationRequest savedNotificationRequest = notificationRequestService.saveNotificationRequest(tenantId, notificationRequest);
+        request = notificationRequestService.saveNotificationRequest(tenantId, request);
 
         NotificationProcessingContext ctx = NotificationProcessingContext.builder()
                 .tenantId(tenantId)
-                .request(savedNotificationRequest)
+                .request(request)
                 .settings(settings)
                 .template(notificationTemplate)
                 .build();
@@ -169,7 +165,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             }
 
             Futures.whenAllComplete(results).run(() -> {
-                NotificationRequestId requestId = savedNotificationRequest.getId();
+                NotificationRequestId requestId = ctx.getRequest().getId();
                 log.debug("[{}] Notification request processing is finished", requestId);
                 NotificationRequestStats stats = ctx.getStats();
                 try {
@@ -180,33 +176,28 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             }, dbCallbackExecutorService);
         });
 
-        return savedNotificationRequest;
+        return request;
     }
 
     private List<ListenableFuture<Void>> processForTarget(NotificationTarget target, NotificationProcessingContext ctx) {
         Iterable<? extends NotificationRecipient> recipients;
         switch (target.getConfiguration().getType()) {
             case PLATFORM_USERS: {
-                PlatformUsersNotificationTargetConfig platformUsersTargetConfig = (PlatformUsersNotificationTargetConfig) target.getConfiguration();
+                PlatformUsersNotificationTargetConfig targetConfig = (PlatformUsersNotificationTargetConfig) target.getConfiguration();
-                if (platformUsersTargetConfig.getUsersFilter().getType() == UsersFilterType.AFFECTED_USER) {
+                if (targetConfig.getUsersFilter().getType().isForRules()) {
-                    if (ctx.getRequest().getInfo() instanceof RuleOriginatedNotificationInfo) {
+                    recipients = new PageDataIterable<>(pageLink -> {
-                        UserId targetUserId = ((RuleOriginatedNotificationInfo) ctx.getRequest().getInfo()).getTargetUserId();
+                        return notificationTargetService.findRecipientsForRuleNotificationTargetConfig(ctx.getTenantId(), targetConfig, (RuleOriginatedNotificationInfo) ctx.getRequest().getInfo(), pageLink);
-                        if (targetUserId != null) {
+                    }, 500);
-                            recipients = List.of(userService.findUserById(ctx.getTenantId(), targetUserId));
-                            break;
-                        }
-                    }
-                    recipients = Collections.emptyList();
                 } else {
                     recipients = new PageDataIterable<>(pageLink -> {
-                        return notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), ctx.getCustomerId(), platformUsersTargetConfig, pageLink);
+                        return notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), targetConfig, pageLink);
                     }, 500);
                 }
                 break;
             }
             case SLACK: {
-                SlackNotificationTargetConfig slackTargetConfig = (SlackNotificationTargetConfig) target.getConfiguration();
+                SlackNotificationTargetConfig targetConfig = (SlackNotificationTargetConfig) target.getConfiguration();
-                recipients = List.of(slackTargetConfig.getConversation());
+                recipients = List.of(targetConfig.getConversation());
                 break;
             }
             default: {
@@ -345,20 +336,15 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     @Override
     public Set<NotificationDeliveryMethod> getAvailableDeliveryMethods(TenantId tenantId) {
-        Set<NotificationDeliveryMethod> deliveryMethods = new HashSet<>();
+        return channels.values().stream()
-        deliveryMethods.add(NotificationDeliveryMethod.WEB);
+                .filter(channel -> channel.check(tenantId))
-        NotificationSettings notificationSettings = notificationSettingsService.findNotificationSettings(tenantId);
+                .map(NotificationChannel::getDeliveryMethod)
-        if (notificationSettings.getDeliveryMethodsConfigs().containsKey(NotificationDeliveryMethod.SLACK)) {
+                .collect(Collectors.toSet());
-            deliveryMethods.add(NotificationDeliveryMethod.SLACK);
+    }
-        }
+
-        try {
+    @Override
-            mailService.testConnection(tenantId);
+    public boolean check(TenantId tenantId) {
-            deliveryMethods.add(NotificationDeliveryMethod.EMAIL);
+        return true;
-        } catch (Exception e) {}
-        if (smsService.isConfigured(tenantId)) {
-            deliveryMethods.add(NotificationDeliveryMethod.SMS);
-        }
-        return deliveryMethods;
     }
 
     @Override

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

@@ -154,7 +154,7 @@ public class NotificationProcessingContext {
 
     public CustomerId getCustomerId() {
         if (request.getInfo() instanceof RuleOriginatedNotificationInfo) {
-            return ((RuleOriginatedNotificationInfo) request.getInfo()).getOriginatorEntityCustomerId();
+            return ((RuleOriginatedNotificationInfo) request.getInfo()).getAffectedCustomerId();
         } else {
             return null;
         }

application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java

@@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.service.mail.MailExecutorService;
@@ -40,6 +41,16 @@ public class EmailNotificationChannel implements NotificationChannel<User, Email
         });
     }
 
+    @Override
+    public boolean check(TenantId tenantId) {
+        try {
+            mailService.testConnection(tenantId);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
         return NotificationDeliveryMethod.EMAIL;

application/src/main/java/org/thingsboard/server/service/notification/channels/NotificationChannel.java

@@ -16,15 +16,18 @@
 package org.thingsboard.server.service.notification.channels;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
-import org.thingsboard.server.service.notification.NotificationProcessingContext;
 import org.thingsboard.server.common.data.notification.targets.NotificationRecipient;
 import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
+import org.thingsboard.server.service.notification.NotificationProcessingContext;
 
 public interface NotificationChannel<R extends NotificationRecipient, T extends DeliveryMethodNotificationTemplate> {
 
     ListenableFuture<Void> sendNotification(R recipient, T processedTemplate, NotificationProcessingContext ctx);
 
+    boolean check(TenantId tenantId);
+
     NotificationDeliveryMethod getDeliveryMethod();
 
 }

application/src/main/java/org/thingsboard/server/service/notification/channels/SlackNotificationChannel.java

@@ -19,7 +19,10 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.slack.SlackService;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
+import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
+import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
 import org.thingsboard.server.common.data.notification.settings.SlackNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
@@ -31,6 +34,7 @@ import org.thingsboard.server.service.executors.ExternalCallExecutorService;
 public class SlackNotificationChannel implements NotificationChannel<SlackConversation, SlackDeliveryMethodNotificationTemplate> {
 
     private final SlackService slackService;
+    private final NotificationSettingsService notificationSettingsService;
     private final ExternalCallExecutorService executor;
 
     @Override
@@ -42,6 +46,12 @@ public class SlackNotificationChannel implements NotificationChannel<SlackConver
         });
     }
 
+    @Override
+    public boolean check(TenantId tenantId) {
+        NotificationSettings notificationSettings = notificationSettingsService.findNotificationSettings(tenantId);
+        return notificationSettings.getDeliveryMethodsConfigs().containsKey(NotificationDeliveryMethod.SLACK);
+    }
+
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
         return NotificationDeliveryMethod.SLACK;

application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.template.SmsDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
@@ -47,6 +48,11 @@ public class SmsNotificationChannel implements NotificationChannel<User, SmsDeli
         });
     }
 
+    @Override
+    public boolean check(TenantId tenantId) {
+        return smsService.isConfigured(tenantId);
+    }
+
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
         return NotificationDeliveryMethod.SMS;

application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessingService.java

@@ -32,7 +32,6 @@ import org.thingsboard.server.common.data.notification.NotificationRequestConfig
 import org.thingsboard.server.common.data.notification.NotificationRequestStatus;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.NotificationRule;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -41,6 +40,7 @@ import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.notification.NotificationRuleProcessingService;
 import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.dao.notification.trigger.RuleEngineMsgTrigger;
 import org.thingsboard.server.service.executors.NotificationExecutorService;
 import org.thingsboard.server.service.notification.rule.trigger.NotificationRuleTriggerProcessor;
@@ -72,13 +72,13 @@ public class DefaultNotificationRuleProcessingService implements NotificationRul
     private final Map<String, NotificationRuleTriggerType> ruleEngineMsgTypeToTriggerType = new HashMap<>();
 
     @Override
-    public void process(TenantId tenantId, NotificationRuleTrigger trigger) {
+    public void process(NotificationRuleTrigger trigger) {
         List<NotificationRule> rules = notificationRuleService.findNotificationRulesByTenantIdAndTriggerType(
-                trigger.getType().isTenantLevel() ? tenantId : TenantId.SYS_TENANT_ID, trigger.getType());
+                trigger.getType().isTenantLevel() ? trigger.getTenantId() : TenantId.SYS_TENANT_ID, trigger.getType());
         for (NotificationRule rule : rules) {
             notificationExecutor.submit(() -> {
                 try {
-                    processNotificationRule(tenantId, rule, trigger);
+                    processNotificationRule(rule, trigger);
                 } catch (Throwable e) {
                     log.error("Failed to process notification rule {} for trigger type {} with trigger object {}", rule.getId(), rule.getTriggerType(), trigger, e);
                 }
@@ -92,18 +92,19 @@ public class DefaultNotificationRuleProcessingService implements NotificationRul
         if (triggerType == null) {
             return;
         }
-        process(tenantId, RuleEngineMsgTrigger.builder()
+        process(RuleEngineMsgTrigger.builder()
+                .tenantId(tenantId)
                 .msg(ruleEngineMsg)
                 .triggerType(triggerType)
                 .build());
     }
 
-    private void processNotificationRule(TenantId tenantId, NotificationRule rule, NotificationRuleTrigger trigger) {
+    private void processNotificationRule(NotificationRule rule, NotificationRuleTrigger trigger) {
         NotificationRuleTriggerConfig triggerConfig = rule.getTriggerConfig();
         log.debug("Processing notification rule '{}' for trigger type {}", rule.getName(), rule.getTriggerType());
 
         if (matchesClearRule(trigger, triggerConfig)) {
-            List<NotificationRequest> notificationRequests = notificationRequestService.findNotificationRequestsByRuleIdAndOriginatorEntityId(tenantId, rule.getId(), trigger.getOriginatorEntityId());
+            List<NotificationRequest> notificationRequests = findAlreadySentNotificationRequests(rule, trigger);
             if (notificationRequests.isEmpty()) {
                 return;
             }
@@ -113,11 +114,11 @@ public class DefaultNotificationRuleProcessingService implements NotificationRul
                     .flatMap(notificationRequest -> notificationRequest.getTargets().stream())
                     .distinct().collect(Collectors.toList());
             NotificationInfo notificationInfo = constructNotificationInfo(trigger, triggerConfig);
-            submitNotificationRequest(tenantId, targets, rule, trigger.getOriginatorEntityId(), notificationInfo, 0);
+            submitNotificationRequest(targets, rule, trigger.getOriginatorEntityId(), notificationInfo, 0);
 
             notificationRequests.forEach(notificationRequest -> {
                 if (notificationRequest.isScheduled()) {
-                    notificationCenter.deleteNotificationRequest(tenantId, notificationRequest.getId());
+                    notificationCenter.deleteNotificationRequest(rule.getTenantId(), notificationRequest.getId());
                 }
             });
             return;
@@ -126,31 +127,23 @@ public class DefaultNotificationRuleProcessingService implements NotificationRul
         if (matchesFilter(trigger, triggerConfig)) {
             NotificationInfo notificationInfo = constructNotificationInfo(trigger, triggerConfig);
             rule.getRecipientsConfig().getTargetsTable().forEach((delay, targets) -> {
-                submitNotificationRequest(tenantId, targets, rule, trigger.getOriginatorEntityId(), notificationInfo, delay);
+                submitNotificationRequest(targets, rule, trigger.getOriginatorEntityId(), notificationInfo, delay);
             });
         }
     }
 
-    private boolean matchesFilter(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
+    private List<NotificationRequest> findAlreadySentNotificationRequests(NotificationRule rule, NotificationRuleTrigger trigger) {
-        return triggerProcessors.get(triggerConfig.getTriggerType()).matchesFilter(trigger, triggerConfig);
+        return notificationRequestService.findNotificationRequestsByRuleIdAndOriginatorEntityId(rule.getTenantId(), rule.getId(), trigger.getOriginatorEntityId());
     }
 
-    private boolean matchesClearRule(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
+    private void submitNotificationRequest(List<UUID> targets, NotificationRule rule,
-        return triggerProcessors.get(triggerConfig.getTriggerType()).matchesClearRule(trigger, triggerConfig);
-    }
-
-    private NotificationInfo constructNotificationInfo(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
-        return triggerProcessors.get(triggerConfig.getTriggerType()).constructNotificationInfo(trigger, triggerConfig);
-    }
-
-    private void submitNotificationRequest(TenantId tenantId, List<UUID> targets, NotificationRule rule,
                                            EntityId originatorEntityId, NotificationInfo notificationInfo, int delayInSec) {
         NotificationRequestConfig config = new NotificationRequestConfig();
         if (delayInSec > 0) {
             config.setSendingDelayInSec(delayInSec);
         }
         NotificationRequest notificationRequest = NotificationRequest.builder()
-                .tenantId(tenantId)
+                .tenantId(rule.getTenantId())
                 .targets(targets)
                 .templateId(rule.getTemplateId())
                 .additionalConfig(config)
@@ -161,13 +154,25 @@ public class DefaultNotificationRuleProcessingService implements NotificationRul
         notificationExecutor.submit(() -> {
             try {
                 log.debug("Submitting notification request for rule '{}' with delay of {} sec to targets {}", rule.getName(), delayInSec, targets);
-                notificationCenter.processNotificationRequest(tenantId, notificationRequest);
+                notificationCenter.processNotificationRequest(rule.getTenantId(), notificationRequest);
             } catch (Exception e) {
                 log.error("Failed to process notification request for rule {}", rule.getId(), e);
             }
         });
     }
 
+    private boolean matchesFilter(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
+        return triggerProcessors.get(triggerConfig.getTriggerType()).matchesFilter(trigger, triggerConfig);
+    }
+
+    private boolean matchesClearRule(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
+        return triggerProcessors.get(triggerConfig.getTriggerType()).matchesClearRule(trigger, triggerConfig);
+    }
+
+    private NotificationInfo constructNotificationInfo(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
+        return triggerProcessors.get(triggerConfig.getTriggerType()).constructNotificationInfo(trigger);
+    }
+
     @EventListener(ComponentLifecycleMsg.class)
     public void onNotificationRuleDeleted(ComponentLifecycleMsg componentLifecycleMsg) {
         if (componentLifecycleMsg.getEvent() != ComponentLifecycleEvent.DELETED ||

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.notification.info.AlarmAssignmentNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig.Action;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
@@ -49,7 +49,7 @@ public class AlarmAssignmentTriggerProcessor implements RuleEngineMsgNotificatio
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger, AlarmAssignmentNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
         AlarmInfo alarmInfo = JacksonUtil.fromString(trigger.getMsg().getData(), AlarmInfo.class);
         AlarmAssignee assignee = alarmInfo.getAssignee();
         return AlarmAssignmentNotificationInfo.builder()
@@ -58,7 +58,9 @@ public class AlarmAssignmentTriggerProcessor implements RuleEngineMsgNotificatio
                 .assigneeLastName(assignee != null ? assignee.getLastName() : null)
                 .assigneeEmail(assignee != null ? assignee.getEmail() : null)
                 .assigneeId(assignee != null ? assignee.getId() : null)
-                .userName(trigger.getMsg().getMetaData().getValue("userName"))
+                .userEmail(trigger.getMsg().getMetaData().getValue("userEmail"))
+                .userFirstName(trigger.getMsg().getMetaData().getValue("userFirstName"))
+                .userLastName(trigger.getMsg().getMetaData().getValue("userLastName"))
                 .alarmId(alarmInfo.getUuidId())
                 .alarmType(alarmInfo.getType())
                 .alarmOriginator(alarmInfo.getOriginator())

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java

@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.notification.info.AlarmCommentNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmCommentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -59,14 +59,16 @@ public class AlarmCommentTriggerProcessor implements RuleEngineMsgNotificationRu
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger, AlarmCommentNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
         TbMsg msg = trigger.getMsg();
         AlarmComment comment = JacksonUtil.fromString(msg.getMetaData().getValue("comment"), AlarmComment.class);
         AlarmInfo alarmInfo = JacksonUtil.fromString(msg.getData(), AlarmInfo.class);
         return AlarmCommentNotificationInfo.builder()
                 .comment(comment.getComment().get("text").asText())
                 .action(msg.getType().equals(DataConstants.COMMENT_CREATED) ? "added" : "updated")
-                .userName(msg.getMetaData().getValue("userName"))
+                .userEmail(trigger.getMsg().getMetaData().getValue("userEmail"))
+                .userFirstName(trigger.getMsg().getMetaData().getValue("userFirstName"))
+                .userLastName(trigger.getMsg().getMetaData().getValue("userLastName"))
                 .alarmId(alarmInfo.getUuidId())
                 .alarmType(alarmInfo.getType())
                 .alarmOriginator(alarmInfo.getOriginator())

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmTriggerProcessor.java

@@ -20,7 +20,7 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
 import org.thingsboard.server.common.data.notification.info.AlarmNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmNotificationRuleTriggerConfig.AlarmAction;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmNotificationRuleTriggerConfig.ClearRule;
@@ -93,7 +93,7 @@ public class AlarmTriggerProcessor implements NotificationRuleTriggerProcessor<A
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(AlarmTrigger trigger, AlarmNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(AlarmTrigger trigger) {
         AlarmApiCallResult alarmUpdate = trigger.getAlarmUpdate();
         AlarmInfo alarmInfo = alarmUpdate.getAlarm();
         return AlarmNotificationInfo.builder()

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceInactivityTriggerProcessor.java

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.info.DeviceInactivityNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.DeviceInactivityNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -52,7 +52,7 @@ public class DeviceInactivityTriggerProcessor implements RuleEngineMsgNotificati
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger, DeviceInactivityNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
         TbMsg msg = trigger.getMsg();
         return DeviceInactivityNotificationInfo.builder()
                 .deviceId(msg.getOriginator().getId())

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntitiesLimitTriggerProcessor.java

@@ -18,7 +18,7 @@ package org.thingsboard.server.service.notification.rule.trigger;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.notification.info.EntitiesLimitNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.EntitiesLimitNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.dao.notification.trigger.EntitiesLimitTrigger;
@@ -41,7 +41,7 @@ public class EntitiesLimitTriggerProcessor implements NotificationRuleTriggerPro
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(EntitiesLimitTrigger trigger, EntitiesLimitNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(EntitiesLimitTrigger trigger) {
         return EntitiesLimitNotificationInfo.builder()
                 .entityType(trigger.getEntityType())
                 .currentCount(trigger.getCurrentCount())

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/EntityActionTriggerProcessor.java

@@ -20,7 +20,7 @@ import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.notification.info.EntityActionNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.EntityActionNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -55,7 +55,7 @@ public class EntityActionTriggerProcessor implements RuleEngineMsgNotificationRu
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger, EntityActionNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
         TbMsg msg = trigger.getMsg();
         String msgType = msg.getType();
         ActionType actionType = msgType.equals(DataConstants.ENTITY_CREATED) ? ActionType.ADDED :
@@ -65,8 +65,10 @@ public class EntityActionTriggerProcessor implements RuleEngineMsgNotificationRu
                 .entityId(msg.getOriginator())
                 .entityName(msg.getMetaData().getValue("entityName"))
                 .actionType(actionType)
-                .originatorUserId(UUID.fromString(msg.getMetaData().getValue("userId")))
+                .userId(UUID.fromString(msg.getMetaData().getValue("userId")))
-                .originatorUserName(msg.getMetaData().getValue("userName"))
+                .userEmail(trigger.getMsg().getMetaData().getValue("userEmail"))
+                .userFirstName(trigger.getMsg().getMetaData().getValue("userFirstName"))
+                .userLastName(trigger.getMsg().getMetaData().getValue("userLastName"))
                 .entityCustomerId(msg.getCustomerId())
                 .build();
     }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/NewPlatformVersionTriggerProcessor.java

@@ -19,9 +19,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.info.NewPlatformVersionNotificationInfo;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.NewPlatformVersionNotificationRuleTriggerConfig;
-import org.thingsboard.server.common.data.notification.rule.trigger.NewPlatformVersionTrigger;
+import org.thingsboard.server.dao.notification.trigger.NewPlatformVersionTrigger;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.queue.discovery.PartitionService;
@@ -42,7 +42,7 @@ public class NewPlatformVersionTriggerProcessor implements NotificationRuleTrigg
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(NewPlatformVersionTrigger trigger, NewPlatformVersionNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(NewPlatformVersionTrigger trigger) {
         return NewPlatformVersionNotificationInfo.builder()
                 .message(trigger.getMessage().getMessage())
                 .build();

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/NotificationRuleTriggerProcessor.java

@@ -15,8 +15,8 @@
  */
 package org.thingsboard.server.service.notification.rule.trigger;
 
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.dao.notification.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 
@@ -28,7 +28,7 @@ public interface NotificationRuleTriggerProcessor<T extends NotificationRuleTrig
         return false;
     }
 
-    NotificationInfo constructNotificationInfo(T trigger, C triggerConfig);
+    RuleOriginatedNotificationInfo constructNotificationInfo(T trigger);
 
     NotificationRuleTriggerType getTriggerType();
 

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineComponentLifecycleEventTriggerProcessor.java

@@ -20,8 +20,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleEngineComponentLifecycleEventNotificationInfo;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.notification.rule.trigger.RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
@@ -68,7 +68,7 @@ public class RuleEngineComponentLifecycleEventTriggerProcessor implements Notifi
     }
 
     @Override
-    public NotificationInfo constructNotificationInfo(RuleEngineComponentLifecycleEventTrigger trigger, RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig triggerConfig) {
+    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineComponentLifecycleEventTrigger trigger) {
         return RuleEngineComponentLifecycleEventNotificationInfo.builder()
                 .ruleChainId(trigger.getRuleChainId())
                 .ruleChainName(trigger.getRuleChainName())

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java

@@ -51,9 +51,9 @@ import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 import org.thingsboard.server.dao.alarm.AlarmOperationResult;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.notification.NotificationRuleProcessingService;
+import org.thingsboard.server.dao.notification.trigger.AlarmTrigger;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmCommentService;
-import org.thingsboard.server.dao.notification.trigger.AlarmTrigger;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
 
 import java.util.Collection;
@@ -235,7 +235,8 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
                     return TbSubscriptionUtils.toAlarmUpdateProto(tenantId, entityId, alarm);
                 });
             }
-            notificationRuleProcessingService.process(tenantId, AlarmTrigger.builder()
+            notificationRuleProcessingService.process(AlarmTrigger.builder()
+                    .tenantId(tenantId)
                     .alarmUpdate(result)
                     .build());
         });
@@ -252,7 +253,8 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
                     return TbSubscriptionUtils.toAlarmDeletedProto(tenantId, entityId, alarm);
                 });
             }
-            notificationRuleProcessingService.process(tenantId, AlarmTrigger.builder()
+            notificationRuleProcessingService.process(AlarmTrigger.builder()
+                    .tenantId(tenantId)
                     .alarmUpdate(result)
                     .build());
         });

application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java

@@ -25,8 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.UpdateMessage;
-import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.notification.trigger.NewPlatformVersionTrigger;
-import org.thingsboard.server.common.data.notification.rule.trigger.NewPlatformVersionTrigger;
 import org.thingsboard.server.dao.notification.NotificationRuleProcessingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
@@ -135,7 +134,7 @@ public class DefaultUpdateService implements UpdateService {
                     response.get("updateAvailable").asBoolean()
             );
             if (updateMessage.isUpdateAvailable() && !updateMessage.equals(prevUpdateMessage)) {
-                notificationRuleProcessingService.process(TenantId.SYS_TENANT_ID, NewPlatformVersionTrigger.builder()
+                notificationRuleProcessingService.process(NewPlatformVersionTrigger.builder()
                         .message(updateMessage)
                         .build());
             }

application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java

@@ -35,7 +35,6 @@ import org.thingsboard.server.common.data.notification.NotificationRequestConfig
 import org.thingsboard.server.common.data.notification.NotificationRequestInfo;
 import org.thingsboard.server.common.data.notification.NotificationRequestStats;
 import org.thingsboard.server.common.data.notification.NotificationType;
-import org.thingsboard.server.common.data.notification.info.UserOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
@@ -44,8 +43,8 @@ import org.thingsboard.server.common.data.notification.template.DeliveryMethodNo
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
-import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.SmsDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
@@ -110,12 +109,9 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
     protected NotificationRequest submitNotificationRequest(List<NotificationTargetId> targets, NotificationTemplateId notificationTemplateId, int delayInSec) {
         NotificationRequestConfig config = new NotificationRequestConfig();
         config.setSendingDelayInSec(delayInSec);
-        UserOriginatedNotificationInfo notificationInfo = new UserOriginatedNotificationInfo();
-        notificationInfo.setDescription("My description");
         NotificationRequest notificationRequest = NotificationRequest.builder()
                 .targets(targets.stream().map(UUIDBased::getId).collect(Collectors.toList()))
                 .templateId(notificationTemplateId)
-                .info(notificationInfo)
                 .additionalConfig(config)
                 .build();
         return doPost("/api/notification/request", notificationRequest, NotificationRequest.class);

application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java

@@ -35,7 +35,6 @@ import org.thingsboard.server.common.data.notification.NotificationRequestPrevie
 import org.thingsboard.server.common.data.notification.NotificationRequestStats;
 import org.thingsboard.server.common.data.notification.NotificationRequestStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
-import org.thingsboard.server.common.data.notification.info.UserOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.settings.SlackNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
@@ -49,9 +48,9 @@ import org.thingsboard.server.common.data.notification.template.DeliveryMethodNo
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
-import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.SlackDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.SmsDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;

application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java

@@ -123,7 +123,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
     @Test
     public void testNotificationRuleProcessing_entityActionTrigger() throws Exception {
         String notificationSubject = "${actionType}: ${entityType} [${entityId}]";
-        String notificationText = "User: ${originatorUserName}";
+        String notificationText = "User: ${userEmail}";
         NotificationTemplate notificationTemplate = createNotificationTemplate(NotificationType.GENERAL, notificationSubject, notificationText, NotificationDeliveryMethod.WEB);
 
         NotificationRule notificationRule = new NotificationRule();

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationRuleProcessingService.java

@@ -16,12 +16,12 @@
 package org.thingsboard.server.dao.notification;
 
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.dao.notification.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.common.msg.TbMsg;
 
 public interface NotificationRuleProcessingService {
 
-    void process(TenantId tenantId, NotificationRuleTrigger trigger);
+    void process(NotificationRuleTrigger trigger);
 
     void process(TenantId tenantId, TbMsg ruleEngineMsg);
 

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationTargetService.java

@@ -20,8 +20,10 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.NotificationTargetId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
+import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 
@@ -41,9 +43,9 @@ public interface NotificationTargetService {
 
     PageData<User> findRecipientsForNotificationTarget(TenantId tenantId, CustomerId customerId, NotificationTargetId targetId, PageLink pageLink);
 
-    int countRecipientsForNotificationTargetConfig(TenantId tenantId, NotificationTargetConfig targetConfig);
+    PageData<User> findRecipientsForNotificationTargetConfig(TenantId tenantId, PlatformUsersNotificationTargetConfig targetConfig, PageLink pageLink);
 
-    PageData<User> findRecipientsForNotificationTargetConfig(TenantId tenantId, CustomerId customerId, NotificationTargetConfig targetConfig, PageLink pageLink);
+    PageData<User> findRecipientsForRuleNotificationTargetConfig(TenantId tenantId, PlatformUsersNotificationTargetConfig targetConfig, RuleOriginatedNotificationInfo info, PageLink pageLink);
 
     void deleteNotificationTargetById(TenantId tenantId, NotificationTargetId id);
 

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/AlarmTrigger.java

@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.notification.trigger;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 
@@ -26,6 +26,7 @@ import org.thingsboard.server.dao.alarm.AlarmApiCallResult;
 @Builder
 public class AlarmTrigger implements NotificationRuleTrigger {
 
+    private final TenantId tenantId;
     private final AlarmApiCallResult alarmUpdate;
 
     @Override

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/EntitiesLimitTrigger.java

@@ -20,7 +20,6 @@ import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 
 @Data

common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/NewPlatformVersionTrigger.java → common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/NewPlatformVersionTrigger.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.notification.rule.trigger;
+package org.thingsboard.server.dao.notification.trigger;
 
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.UpdateMessage;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 
 @Data
 @Builder
@@ -32,6 +33,11 @@ public class NewPlatformVersionTrigger implements NotificationRuleTrigger {
         return NotificationRuleTriggerType.NEW_PLATFORM_VERSION;
     }
 
+    @Override
+    public TenantId getTenantId() {
+        return TenantId.SYS_TENANT_ID;
+    }
+
     @Override
     public EntityId getOriginatorEntityId() {
         return TenantId.SYS_TENANT_ID;

common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/NotificationRuleTrigger.java → common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/NotificationRuleTrigger.java

@@ -13,14 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.notification.rule.trigger;
+package org.thingsboard.server.dao.notification.trigger;
 
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 
 public interface NotificationRuleTrigger {
 
     NotificationRuleTriggerType getType();
 
+    TenantId getTenantId();
+
     EntityId getOriginatorEntityId();
 
 }

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/RuleEngineComponentLifecycleEventTrigger.java

@@ -19,7 +19,7 @@ import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 
@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 @Builder
 public class RuleEngineComponentLifecycleEventTrigger implements NotificationRuleTrigger {
 
+    private final TenantId tenantId;
     private final RuleChainId ruleChainId;
     private final String ruleChainName;
     private final EntityId componentId;

common/dao-api/src/main/java/org/thingsboard/server/dao/notification/trigger/RuleEngineMsgTrigger.java

@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.notification.trigger;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
 import org.thingsboard.server.common.msg.TbMsg;
 
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.msg.TbMsg;
 @Builder
 public class RuleEngineMsgTrigger implements NotificationRuleTrigger {
 
+    private final TenantId tenantId;
     private final TbMsg msg;
     private final NotificationRuleTriggerType triggerType;
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmAssignmentNotificationInfo.java

@@ -37,11 +37,15 @@ import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
 public class AlarmAssignmentNotificationInfo implements RuleOriginatedNotificationInfo {
 
     private String action;
+
+    private String assigneeEmail;
     private String assigneeFirstName;
     private String assigneeLastName;
-    private String assigneeEmail;
     private UserId assigneeId;
-    private String userName;
+
+    private String userEmail;
+    private String userFirstName;
+    private String userLastName;
 
     private String alarmType;
     private UUID alarmId;
@@ -59,7 +63,9 @@ public class AlarmAssignmentNotificationInfo implements RuleOriginatedNotificati
                 "assigneeLastName", assigneeLastName,
                 "assigneeEmail", assigneeEmail,
                 "assigneeId", assigneeId != null ? assigneeId.toString() : null,
-                "userName", userName,
+                "userEmail", userEmail,
+                "userFirstName", userFirstName,
+                "userLastName", userLastName,
                 "alarmType", alarmType,
                 "alarmId", alarmId.toString(),
                 "alarmSeverity", alarmSeverity.name().toLowerCase(),
@@ -71,12 +77,12 @@ public class AlarmAssignmentNotificationInfo implements RuleOriginatedNotificati
     }
 
     @Override
-    public CustomerId getOriginatorEntityCustomerId() {
+    public CustomerId getAffectedCustomerId() {
         return alarmCustomerId;
     }
 
     @Override
-    public UserId getTargetUserId() {
+    public UserId getAffectedUserId() {
         return assigneeId;
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmCommentNotificationInfo.java

@@ -37,7 +37,10 @@ public class AlarmCommentNotificationInfo implements RuleOriginatedNotificationI
 
     private String comment;
     private String action;
-    private String userName;
+
+    private String userEmail;
+    private String userFirstName;
+    private String userLastName;
 
     private String alarmType;
     private UUID alarmId;
@@ -52,7 +55,9 @@ public class AlarmCommentNotificationInfo implements RuleOriginatedNotificationI
         return mapOf(
                 "comment", comment,
                 "action", action,
-                "userName", userName,
+                "userEmail", userEmail,
+                "userFirstName", userFirstName,
+                "userLastName", userLastName,
                 "alarmType", alarmType,
                 "alarmId", alarmId.toString(),
                 "alarmSeverity", alarmSeverity.name().toLowerCase(),
@@ -64,7 +69,7 @@ public class AlarmCommentNotificationInfo implements RuleOriginatedNotificationI
     }
 
     @Override
-    public CustomerId getOriginatorEntityCustomerId() {
+    public CustomerId getAffectedCustomerId() {
         return alarmCustomerId;
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/AlarmNotificationInfo.java

@@ -59,7 +59,7 @@ public class AlarmNotificationInfo implements RuleOriginatedNotificationInfo {
     }
 
     @Override
-    public CustomerId getOriginatorEntityCustomerId() {
+    public CustomerId getAffectedCustomerId() {
         return alarmCustomerId;
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/DeviceInactivityNotificationInfo.java

@@ -40,11 +40,6 @@ public class DeviceInactivityNotificationInfo implements RuleOriginatedNotificat
     private String deviceType;
     private CustomerId deviceCustomerId;
 
-    @Override
-    public CustomerId getOriginatorEntityCustomerId() {
-        return deviceCustomerId;
-    }
-
     @Override
     public Map<String, String> getTemplateData() {
         return mapOf(
@@ -55,6 +50,11 @@ public class DeviceInactivityNotificationInfo implements RuleOriginatedNotificat
         );
     }
 
+    @Override
+    public CustomerId getAffectedCustomerId() {
+        return deviceCustomerId;
+    }
+
     @Override
     public EntityId getStateEntityId() {
         return new DeviceId(deviceId);

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EntitiesLimitNotificationInfo.java

@@ -30,7 +30,7 @@ import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class EntitiesLimitNotificationInfo implements NotificationInfo {
+public class EntitiesLimitNotificationInfo implements RuleOriginatedNotificationInfo {
 
     private EntityType entityType;
     private long currentCount;
@@ -51,4 +51,9 @@ public class EntitiesLimitNotificationInfo implements NotificationInfo {
         );
     }
 
+    @Override
+    public TenantId getAffectedTenantId() {
+        return tenantId;
+    }
+
 }

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/EntityActionNotificationInfo.java

@@ -37,14 +37,12 @@ public class EntityActionNotificationInfo implements RuleOriginatedNotificationI
     private EntityId entityId;
     private String entityName;
     private ActionType actionType;
-    private UUID originatorUserId;
-    private String originatorUserName;
     private CustomerId entityCustomerId;
 
-    @Override
+    private UUID userId;
-    public CustomerId getOriginatorEntityCustomerId() {
+    private String userEmail;
-        return entityCustomerId;
+    private String userFirstName;
-    }
+    private String userLastName;
 
     @Override
     public Map<String, String> getTemplateData() {
@@ -53,11 +51,18 @@ public class EntityActionNotificationInfo implements RuleOriginatedNotificationI
                 "entityId", entityId.toString(),
                 "entityName", entityName,
                 "actionType", actionType.name().toLowerCase(),
-                "originatorUserId", originatorUserId.toString(),
+                "userId", userId.toString(),
-                "originatorUserName", originatorUserName
+                "userEmail", userEmail,
+                "userFirstName", userFirstName,
+                "userLastName", userLastName
         );
     }
 
+    @Override
+    public CustomerId getAffectedCustomerId() {
+        return entityCustomerId;
+    }
+
     @Override
     public EntityId getStateEntityId() {
         return entityId;

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/NewPlatformVersionNotificationInfo.java

@@ -28,7 +28,7 @@ import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class NewPlatformVersionNotificationInfo implements NotificationInfo {
+public class NewPlatformVersionNotificationInfo implements RuleOriginatedNotificationInfo {
 
     private String message;
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/RuleEngineComponentLifecycleEventNotificationInfo.java

@@ -31,7 +31,7 @@ import static org.thingsboard.server.common.data.util.CollectionsUtil.mapOf;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class RuleEngineComponentLifecycleEventNotificationInfo implements NotificationInfo {
+public class RuleEngineComponentLifecycleEventNotificationInfo implements RuleOriginatedNotificationInfo {
 
     private RuleChainId ruleChainId;
     private String ruleChainName;

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/RuleOriginatedNotificationInfo.java

@@ -16,13 +16,20 @@
 package org.thingsboard.server.common.data.notification.info;
 
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 
 public interface RuleOriginatedNotificationInfo extends NotificationInfo {
 
-    CustomerId getOriginatorEntityCustomerId();
+    default CustomerId getAffectedCustomerId() {
+        return null;
+    }
+
+    default UserId getAffectedUserId() {
+        return null;
+    }
 
-    default UserId getTargetUserId() {
+    default TenantId getAffectedTenantId() {
         return null;
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/info/UserOriginatedNotificationInfo.java

@@ -1,33 +0,0 @@
-/**
- * Copyright © 2016-2023 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.common.data.notification.info;
-
-import lombok.Data;
-
-import java.util.Collections;
-import java.util.Map;
-
-@Data
-public class UserOriginatedNotificationInfo implements NotificationInfo {
-
-    private String description;
-
-    @Override
-    public Map<String, String> getTemplateData() {
-        return Collections.emptyMap();
-    }
-
-}

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

@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.NotificationRequestStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.platform.CustomerUsersFilter;
@@ -97,20 +98,12 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
         NotificationTarget notificationTarget = findNotificationTargetById(tenantId, targetId);
         Objects.requireNonNull(notificationTarget, "Notification target [" + targetId + "] not found");
         NotificationTargetConfig configuration = notificationTarget.getConfiguration();
-        return findRecipientsForNotificationTargetConfig(tenantId, customerId, configuration, pageLink);
+        return findRecipientsForNotificationTargetConfig(tenantId, (PlatformUsersNotificationTargetConfig) configuration, pageLink);
     }
 
     @Override
-    public int countRecipientsForNotificationTargetConfig(TenantId tenantId, NotificationTargetConfig targetConfig) {
+    public PageData<User> findRecipientsForNotificationTargetConfig(TenantId tenantId, PlatformUsersNotificationTargetConfig targetConfig, PageLink pageLink) {
-        return (int) findRecipientsForNotificationTargetConfig(tenantId, null, targetConfig, new PageLink(1)).getTotalElements();
+        UsersFilter usersFilter = targetConfig.getUsersFilter();
-    }
-
-    @Override
-    public PageData<User> findRecipientsForNotificationTargetConfig(TenantId tenantId, CustomerId customerId, NotificationTargetConfig targetConfig, PageLink pageLink) {
-        if (!(targetConfig instanceof PlatformUsersNotificationTargetConfig)) {
-            throw new IllegalArgumentException("Unsupported target type " + targetConfig.getType());
-        }
-        UsersFilter usersFilter = ((PlatformUsersNotificationTargetConfig) targetConfig).getUsersFilter();
         switch (usersFilter.getType()) {
             case USER_LIST: {
                 List<User> users = ((UserListFilter) usersFilter).getUsersIds().stream()
@@ -142,8 +135,6 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
                     }
                 }
             }
-            case AFFECTED_TENANT_ADMINISTRATORS:
-                return userService.findTenantAdmins(tenantId, pageLink);
             case SYSTEM_ADMINISTRATORS:
                 return userService.findSysAdmins(pageLink);
             case ALL_USERS: {
@@ -153,13 +144,34 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
                     return userService.findAllUsers(pageLink);
                 }
             }
-            case ORIGINATOR_ENTITY_OWNER_USERS: {
+        }
+        return new PageData<>();
+    }
+
+    @Override
+    public PageData<User> findRecipientsForRuleNotificationTargetConfig(TenantId tenantId, PlatformUsersNotificationTargetConfig targetConfig, RuleOriginatedNotificationInfo info, PageLink pageLink) {
+        switch (targetConfig.getUsersFilter().getType()) {
+            case ORIGINATOR_ENTITY_OWNER_USERS:
+                CustomerId customerId = info.getAffectedCustomerId();
                 if (customerId != null && !customerId.isNullUid()) {
                     return userService.findCustomerUsers(tenantId, customerId, pageLink);
                 } else {
                     return userService.findTenantAdmins(tenantId, pageLink);
                 }
-            }
+            case AFFECTED_USER:
+                UserId userId = info.getAffectedUserId();
+                if (userId != null) {
+                    return new PageData<>(List.of(userService.findUserById(tenantId, userId)), 1, 1, false);
+                }
+            case AFFECTED_TENANT_ADMINISTRATORS:
+                TenantId affectedTenantId = info.getAffectedTenantId();
+                if (affectedTenantId == null) {
+                    affectedTenantId = tenantId;
+                }
+                if (!affectedTenantId.isNullUid()) {
+                    return userService.findTenantAdmins(affectedTenantId, pageLink);
+                }
+                break;
         }
         return new PageData<>();
     }

dao/src/main/java/org/thingsboard/server/dao/usagerecord/DefaultApiLimitService.java

@@ -48,7 +48,7 @@ public class DefaultApiLimitService implements ApiLimitService {
             filter.setEntityType(entityType);
             long currentCount = entityService.countEntitiesByQuery(tenantId, new CustomerId(EntityId.NULL_UUID), new EntityCountQuery(filter));
             if (notificationRuleProcessingService != null) {
-                notificationRuleProcessingService.process(tenantId, EntitiesLimitTrigger.builder()
+                notificationRuleProcessingService.process(EntitiesLimitTrigger.builder()
                         .tenantId(tenantId)
                         .entityType(entityType)
                         .currentCount(currentCount)