From 7cd2a870f56bf0f4687ff756b47c7a89ed1ce311 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 25 Nov 2020 11:05:36 +0200
Subject: [PATCH] count assets by tenantId improvements

---
 .../org/thingsboard/server/dao/sql/asset/AssetRepository.java  | 2 +-
 .../java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
index a6e016c418..da2bc9e687 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
@@ -122,5 +122,5 @@ public interface AssetRepository extends PagingAndSortingRepository<AssetEntity,
     @Query("SELECT DISTINCT a.type FROM AssetEntity a WHERE a.tenantId = :tenantId")
     List<String> findTenantAssetTypes(@Param("tenantId") UUID tenantId);
 
-    Long countByTenantId(UUID tenantId);
+    Long countByTenantIdAndTypeIsNot(UUID tenantId, String type);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
index d2a5167b43..fd73aa2481 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
@@ -44,6 +44,7 @@ import java.util.UUID;
  */
 @Component
 public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> implements AssetDao {
+    public static final String TB_SERVICE_QUEUE = "TbServiceQueue";
 
     @Autowired
     private AssetRepository assetRepository;
@@ -179,6 +180,6 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
 
     @Override
     public Long countByTenantId(TenantId tenantId) {
-        return assetRepository.countByTenantId(tenantId.getId());
+        return assetRepository.countByTenantIdAndTypeIsNot(tenantId.getId(), TB_SERVICE_QUEUE);
     }
 }