From d84fd92f571b93b3d789421e7a0fb3aa2aec75b4 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 9 Nov 2022 09:58:15 +0100
Subject: [PATCH] refactored

---
 .../install/SqlDatabaseUpgradeService.java    | 43 +++++++++----------
 .../dao/sql/tenant/TenantRepository.java      |  5 ---
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index bcd3686183..d96475ad31 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -629,23 +629,30 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         conn.createStatement().execute("DELETE FROM asset a WHERE NOT exists(SELECT id FROM tenant WHERE id = a.tenant_id);");
 
                         log.info("Creating default asset profiles...");
-                        PageLink pageLink = new PageLink(1000);
-                        PageData<TbPair<UUID, String>> pageData;
                         List<ListenableFuture<?>> futures = new ArrayList<>();
+
+                        PageLink pageLink = new PageLink(1000);
+                        PageData<TenantId> tenantIds;
+                        do {
+                            tenantIds = tenantService.findTenantsIds(pageLink);
+                            for (TenantId tenantId : tenantIds.getData()) {
+                                futures.add(dbUpgradeExecutor.submit(() -> {
+                                    try {
+                                        assetProfileService.createDefaultAssetProfile(tenantId);
+                                    } catch (Exception e) {}
+                                }));
+                            }
+                            pageLink = pageLink.nextPageLink();
+                        } while (tenantIds.hasNext());
+
+                        pageLink = new PageLink(1000);
+                        PageData<TbPair<UUID, String>> pairs;
                         Set<UUID> tenants = new HashSet<>();
                         do {
-                            pageData = assetDao.getAllAssetTypes(pageLink);
-                            for (TbPair<UUID, String> pair : pageData.getData()) {
+                            pairs = assetDao.getAllAssetTypes(pageLink);
+                            for (TbPair<UUID, String> pair : pairs.getData()) {
                                 TenantId tenantId = new TenantId(pair.getFirst());
                                 String assetType = pair.getSecond();
-                                if (tenants.add(pair.getFirst())) {
-                                    futures.add(dbUpgradeExecutor.submit(() -> {
-                                        try {
-                                            assetProfileService.createDefaultAssetProfile(tenantId);
-                                        } catch (Exception e) {}
-                                    }));
-                                }
-
                                 if (!"default".equals(assetType)) {
                                     futures.add(dbUpgradeExecutor.submit(() -> {
                                         try {
@@ -655,17 +662,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                 }
                             }
                             pageLink = pageLink.nextPageLink();
-                        } while (pageData.hasNext());
-
-                        List<UUID> tenantsWithoutProfiles = tenantRepository.getIdsNotIn(tenants);
-
-                        tenantsWithoutProfiles.forEach(uuid ->
-                            futures.add(dbUpgradeExecutor.submit(() -> {
-                                try {
-                                    assetProfileService.createDefaultAssetProfile(TenantId.fromUUID(uuid));
-                                } catch (Exception e) {}
-                            }))
-                        );
+                        } while (pairs.hasNext());
 
                         Futures.allAsList(futures).get();
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
index fb563895d5..ac02d77bc8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
@@ -24,7 +24,6 @@ import org.thingsboard.server.dao.model.sql.TenantEntity;
 import org.thingsboard.server.dao.model.sql.TenantInfoEntity;
 
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -54,8 +53,4 @@ public interface TenantRepository extends JpaRepository<TenantEntity, UUID> {
 
     @Query("SELECT t.id FROM TenantEntity t where t.tenantProfileId = :tenantProfileId")
     List<UUID> findTenantIdsByTenantProfileId(@Param("tenantProfileId") UUID tenantProfileId);
-
-    @Query("SELECT t.id FROM TenantEntity t WHERE t.id NOT IN :ids")
-    List<UUID> getIdsNotIn(@Param("ids")Set<UUID> ids);
-
 }