From eb114227aa4352d54e1119df25cb5738bb66e38c Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Fri, 28 Mar 2025 11:08:54 +0200
Subject: [PATCH] Fix removeEntity in TenantRepo

---
 .../main/java/org/thingsboard/server/edqs/repo/TenantRepo.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
index d8dec9fc4e..b9f3589280 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
@@ -220,12 +220,13 @@ public class TenantRepo {
         try {
             UUID entityId = entity.getFields().getId();
             EntityType entityType = entity.getType();
-            EntityData<?> removed = get(entityType, entityId);
+            EntityData<?> removed = getEntityMap(entityType).remove(entityId);
             if (removed != null) {
                 if (removed.getFields() != null) {
                     getEntitySet(entityType).remove(removed);
                 }
                 edqsStatsService.ifPresent(statService -> statService.reportEvent(tenantId, ObjectType.fromEntityType(entityType), EdqsEventType.DELETED));
+
                 UUID customerId = removed.getCustomerId();
                 if (customerId != null) {
                     CustomerData customerData = (CustomerData) get(EntityType.CUSTOMER, customerId);