From c35288af5fadbbbb779dc1b0053db56d22f86d45 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Wed, 26 Nov 2025 19:27:09 +0200
Subject: [PATCH] Refactor deleteUserAndPushEntityDeletedEventToRuleEngine to
 add additional metadata

---
 .../rpc/processor/user/BaseUserProcessor.java | 34 ++++++++++++++++++-
 .../rpc/processor/user/UserEdgeProcessor.java | 11 ------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
index a742d83ada..fc24588f5b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
@@ -21,10 +21,14 @@ import org.springframework.data.util.Pair;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
@@ -82,7 +86,23 @@ public abstract class BaseUserProcessor extends BaseEdgeProcessor {
         return Pair.of(isCreated, userEmailUpdated);
     }
 
-    protected User deleteUser(TenantId tenantId, UserId userId) {
+    protected void deleteUserAndPushEntityDeletedEventToRuleEngine(TenantId tenantId, UserId userId) {
+        deleteUserAndPushEntityDeletedEventToRuleEngine(tenantId, userId, null);
+    }
+
+    protected void deleteUserAndPushEntityDeletedEventToRuleEngine(TenantId tenantId, UserId userId, Edge edge) {
+        User removedUser = deleteUser(tenantId, userId);
+        if (removedUser == null) {
+            return;
+        }
+        CustomerId userCustomerId = removedUser.getCustomerId();
+        String userAsString = JacksonUtil.toString(removedUser);
+        TbMsgMetaData msgMetaData = edge == null ? new TbMsgMetaData() : getEdgeActionTbMsgMetaData(edge, userCustomerId);
+        addRemovedUserMetadata(msgMetaData, removedUser);
+        pushEntityEventToRuleEngine(tenantId, userId, userCustomerId, TbMsgType.ENTITY_DELETED, userAsString, msgMetaData);
+    }
+
+    private User deleteUser(TenantId tenantId, UserId userId) {
         User userById = edgeCtx.getUserService().findUserById(tenantId, userId);
         if (userById == null) {
             log.trace("[{}] User with id {} does not exist", tenantId, userId);
@@ -118,6 +138,18 @@ public abstract class BaseUserProcessor extends BaseEdgeProcessor {
         }
     }
 
+    private void addRemovedUserMetadata(TbMsgMetaData metaData, User removedUser) {
+        metaData.putValue("userId", removedUser.getId().toString());
+        metaData.putValue("userName", removedUser.getName());
+        metaData.putValue("userEmail", removedUser.getEmail());
+        if (removedUser.getFirstName() != null) {
+            metaData.putValue("userFirstName", removedUser.getFirstName());
+        }
+        if (removedUser.getLastName() != null) {
+            metaData.putValue("userLastName", removedUser.getLastName());
+        }
+    }
+
     protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, User user, UserUpdateMsg userUpdateMsg);
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
index 968d573618..3b2d76356b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
@@ -120,17 +120,6 @@ public class UserEdgeProcessor extends BaseUserProcessor implements UserProcesso
         }
     }
 
-    private void deleteUserAndPushEntityDeletedEventToRuleEngine(TenantId tenantId, UserId userId, Edge edge) {
-        User removedUser = deleteUser(tenantId, userId);
-        if (removedUser == null) {
-            return;
-        }
-        CustomerId userCustomerId = removedUser.getCustomerId();
-        String userAsString = JacksonUtil.toString(removedUser);
-        TbMsgMetaData msgMetaData = getEdgeActionTbMsgMetaData(edge, userCustomerId);
-        pushEntityEventToRuleEngine(tenantId, userId, userCustomerId, TbMsgType.ENTITY_DELETED, userAsString, msgMetaData);
-    }
-
     @Override
     public DownlinkMsg convertEdgeEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion) {
         UserId userId = new UserId(edgeEvent.getEntityId());