From caec9699d47f0dc1e89187f86d118c4c63be4443 Mon Sep 17 00:00:00 2001
From: Yevhenii <uman980124@gmail.com>
Date: Tue, 16 Sep 2025 18:19:45 +0300
Subject: [PATCH] Refactoring

---
 .../processor/ai/AiModelEdgeProcessor.java    |  7 +-----
 .../server/dao/ai/AiModelServiceImpl.java     | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ai/AiModelEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ai/AiModelEdgeProcessor.java
index cd932ece5d..74ca7ac27a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ai/AiModelEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ai/AiModelEdgeProcessor.java
@@ -63,12 +63,7 @@ public class AiModelEdgeProcessor extends BaseAiModelProcessor implements AiMode
                     return handleUnsupportedMsgType(aiModelUpdateMsg.getMsgType());
             }
         } catch (DataValidationException e) {
-            if (e.getMessage().contains("limit reached")) {
-                log.warn("[{}] Number of allowed aiModel violated {}", tenantId, aiModelUpdateMsg, e);
-                return Futures.immediateFuture(null);
-            } else {
-                return Futures.immediateFailedFuture(e);
-            }
+            return Futures.immediateFailedFuture(e);
         } finally {
             edgeSynchronizationManager.getEdgeId().remove();
         }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ai/AiModelServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/ai/AiModelServiceImpl.java
index f898c7aa4f..971eba8921 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ai/AiModelServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ai/AiModelServiceImpl.java
@@ -37,6 +37,7 @@ import org.thingsboard.server.dao.sql.JpaExecutorService;
 
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 
 import static org.thingsboard.server.dao.service.Validator.validatePageLink;
 
@@ -125,11 +126,7 @@ class AiModelServiceImpl extends CachedVersionedEntityService<AiModelCacheKey, A
     @Override
     @Transactional
     public boolean deleteByTenantIdAndId(TenantId tenantId, AiModelId modelId) {
-        AiModel aiModel = aiModelDao.findById(tenantId, modelId.getId());
-        if (aiModel == null) {
-            return true;
-        }
-        return deleteByTenantIdAndIdInternal(tenantId, aiModel);
+        return deleteByTenantIdAndIdInternal(tenantId, modelId.getId());
     }
 
     @Override
@@ -146,17 +143,16 @@ class AiModelServiceImpl extends CachedVersionedEntityService<AiModelCacheKey, A
     @Override
     @Transactional
     public void deleteEntity(TenantId tenantId, EntityId id, boolean force) {
-        AiModel aiModel = aiModelDao.findById(tenantId, id.getId());
-        if (aiModel == null) {
-            return;
-        }
-
-        deleteByTenantIdAndIdInternal(tenantId, aiModel);
+        deleteByTenantIdAndIdInternal(tenantId, id.getId());
     }
 
-    private boolean deleteByTenantIdAndIdInternal(TenantId tenantId, AiModel aiModel) {
-        boolean deleted = aiModelDao.deleteByTenantIdAndId(tenantId, aiModel.getId());
+    private boolean deleteByTenantIdAndIdInternal(TenantId tenantId, UUID aiModelId) {
+        AiModel aiModel = aiModelDao.findById(tenantId, aiModelId);
+        if (aiModel == null) {
+            return false;
+        }
 
+        boolean deleted = aiModelDao.deleteByTenantIdAndId(tenantId, aiModel.getId());
         if (deleted) {
             publishEvictEvent(new AiModelCacheEvictEvent.Deleted(AiModelCacheKey.of(tenantId, aiModel.getId())));
             eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(aiModel.getId()).entity(aiModel).build());