From bbf02b5f39ad5ed035a24884f211201a564fbeb8 Mon Sep 17 00:00:00 2001
From: desoliture <ikozka@thingsboard.io>
Date: Mon, 17 Jan 2022 13:21:23 +0200
Subject: [PATCH] add timeout for tenant deletion transaction and fix test for
 tenant deletion

---
 .../thingsboard/server/dao/tenant/TenantServiceImpl.java    | 6 +++---
 .../server/dao/service/BaseTenantServiceTest.java           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 47179049a1..d9cfd8647d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -107,7 +107,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     private RpcService rpcService;
 
     @Override
-    @Cacheable(cacheNames = TENANTS_CACHE, key = "#tenantId", condition = "#tenantId!=null")
+    @Cacheable(cacheNames = TENANTS_CACHE, key = "#tenantId")
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
         Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
@@ -148,8 +148,8 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     }
 
     @Override
-    @Transactional
-    @CacheEvict(cacheNames = TENANTS_CACHE, key = "#tenantId", condition = "#tenantId!=null")
+    @Transactional(timeout = 60 * 60)
+    @CacheEvict(cacheNames = TENANTS_CACHE, key = "#tenantId")
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
         Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
index 06aaaff43d..21bbddde9b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java
@@ -423,6 +423,8 @@ public abstract class BaseTenantServiceTest extends AbstractServiceTest {
         assertResourceIsDeleted(savedTenant, savedResource);
         assertOtaPackageIsDeleted(savedTenant, savedOtaPackage);
         Assert.assertNull(rpcService.findById(savedTenant.getId(), savedRpc.getId()));
+
+        tenantProfileService.deleteTenantProfile(TenantId.SYS_TENANT_ID, savedProfile.getId());
     }
 
     private void assertOtaPackageIsDeleted(Tenant savedTenant, OtaPackage savedOtaPackage) {