add timeout for tenant deletion transaction and fix test for tenant deletion

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
+    @Transactional(timeout = 60 * 60)
-    @CacheEvict(cacheNames = TENANTS_CACHE, key = "#tenantId", condition = "#tenantId!=null")
+    @CacheEvict(cacheNames = TENANTS_CACHE, key = "#tenantId")
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
         Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);

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) {