From cc52452d75b47fa3b8f315955cf1e250ae9ba1cf Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Fri, 10 Jun 2022 16:17:37 +0300
Subject: [PATCH] Remove admin settings on tenant deletion

---
 .../sync/vc/TbAbstractVersionControlSettingsService.java  | 2 +-
 .../server/dao/settings/AdminSettingsService.java         | 4 +++-
 .../thingsboard/server/dao/settings/AdminSettingsDao.java | 2 ++
 .../server/dao/settings/AdminSettingsServiceImpl.java     | 8 +++++++-
 .../server/dao/sql/settings/AdminSettingsRepository.java  | 2 ++
 .../server/dao/sql/settings/JpaAdminSettingsDao.java      | 6 ++++++
 .../thingsboard/server/dao/tenant/TenantServiceImpl.java  | 5 +++++
 7 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
index c9f5f5ee4a..3a674eece0 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
@@ -72,7 +72,7 @@ public abstract class TbAbstractVersionControlSettingsService<T extends Serializ
     }
 
     public boolean delete(TenantId tenantId) {
-        boolean result = adminSettingsService.deleteAdminSettings(tenantId, settingsKey);
+        boolean result = adminSettingsService.deleteAdminSettingsByTenantIdAndKey(tenantId, settingsKey);
         cache.evict(tenantId);
         return result;
     }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
index e5577f7311..82839da1b8 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
@@ -29,6 +29,8 @@ public interface AdminSettingsService {
 
     AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings);
 
-    boolean deleteAdminSettings(TenantId tenantId, String key);
+    boolean deleteAdminSettingsByTenantIdAndKey(TenantId tenantId, String key);
+
+    void deleteAdminSettingsByTenantId(TenantId tenantId);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java
index d211a8340f..972d580cd7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java
@@ -41,4 +41,6 @@ public interface AdminSettingsDao extends Dao<AdminSettings> {
 
     boolean removeByTenantIdAndKey(UUID tenantId, String key);
 
+    void removeByTenantId(UUID tenantId);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
index 22a279639a..7d6f931ef1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
@@ -71,9 +71,15 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     }
 
     @Override
-    public boolean deleteAdminSettings(TenantId tenantId, String key) {
+    public boolean deleteAdminSettingsByTenantIdAndKey(TenantId tenantId, String key) {
         log.trace("Executing deleteAdminSettings, tenantId [{}], key [{}]", tenantId, key);
         Validator.validateString(key, "Incorrect key " + key);
         return adminSettingsDao.removeByTenantIdAndKey(tenantId.getId(), key);
     }
+
+    @Override
+    public void deleteAdminSettingsByTenantId(TenantId tenantId) {
+        adminSettingsDao.removeByTenantId(tenantId.getId());
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java
index 0e68327fdf..e607517f52 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java
@@ -29,6 +29,8 @@ public interface AdminSettingsRepository extends JpaRepository<AdminSettingsEnti
 
     void deleteByTenantIdAndKey(UUID tenantId, String key);
 
+    void deleteByTenantId(UUID tenantId);
+
     boolean existsByTenantIdAndKey(UUID tenantId, String key);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java
index de4a2fd5ed..719dc420a9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java
@@ -60,4 +60,10 @@ public class JpaAdminSettingsDao extends JpaAbstractDao<AdminSettingsEntity, Adm
         }
         return false;
     }
+
+    @Override
+    public void removeByTenantId(UUID tenantId) {
+        adminSettingsRepository.deleteByTenantId(tenantId);
+    }
+
 }
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 61c037e2d6..e53806bb0e 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
@@ -41,6 +41,7 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
@@ -107,6 +108,9 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     @Autowired
     private QueueService queueService;
 
+    @Autowired
+    private AdminSettingsService adminSettingsService;
+
     @Override
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
@@ -164,6 +168,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
         otaPackageService.deleteOtaPackagesByTenantId(tenantId);
         rpcService.deleteAllRpcByTenantId(tenantId);
         queueService.deleteQueuesByTenantId(tenantId);
+        adminSettingsService.deleteAdminSettingsByTenantId(tenantId);
         tenantDao.removeById(tenantId, tenantId.getId());
         deleteEntityRelations(tenantId, tenantId);
     }