From 56bbb5807fed000c099625e105e78d4fa3784eeb Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 28 May 2025 14:21:47 +0300
Subject: [PATCH] Fix dao tests init

---
 .../org/thingsboard/server/controller/JobController.java    | 5 -----
 .../org/thingsboard/server/dao/config/JpaDaoConfig.java     | 2 +-
 .../thingsboard/server/dao/entity/BaseEntityService.java    | 6 +++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/JobController.java b/application/src/main/java/org/thingsboard/server/controller/JobController.java
index 55c68a461f..3f3ca5e64f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/JobController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/JobController.java
@@ -59,7 +59,6 @@ public class JobController extends BaseController {
     @GetMapping("/job/{id}")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     public Job getJobById(@PathVariable UUID id) throws ThingsboardException {
-        // todo check permissions
         return jobService.findJobById(getTenantId(), new JobId(id));
     }
 
@@ -80,7 +79,6 @@ public class JobController extends BaseController {
                                  @RequestParam(required = false) List<UUID> entities,
                                  @RequestParam(required = false) Long startTime,
                                  @RequestParam(required = false) Long endTime) throws ThingsboardException {
-        // todo check permissions
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
         JobFilter filter = JobFilter.builder()
                 .types(types)
@@ -95,21 +93,18 @@ public class JobController extends BaseController {
     @PostMapping("/job/{id}/cancel")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     public void cancelJob(@PathVariable UUID id) throws ThingsboardException {
-        // todo check permissions
         jobManager.cancelJob(getTenantId(), new JobId(id));
     }
 
     @PostMapping("/job/{id}/reprocess")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     public void reprocessJob(@PathVariable UUID id) throws ThingsboardException {
-        // todo check permissions
         jobManager.reprocessJob(getTenantId(), new JobId(id));
     }
 
     @DeleteMapping("/job/{id}")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     public void deleteJob(@PathVariable UUID id) throws ThingsboardException {
-        // todo check permissions
         jobService.deleteJob(getTenantId(), new JobId(id));
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java
index 164e4cdb3c..963a114e8f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java
@@ -45,7 +45,7 @@ import java.util.Objects;
 
 @Configuration
 @TbAutoConfiguration
-@ComponentScan({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.attributes", "org.thingsboard.server.dao.sqlts.dictionary", "org.thingsboard.server.dao.cache", "org.thingsboard.server.cache"})
+@ComponentScan({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.attributes", "org.thingsboard.server.dao.sqlts.dictionary", "org.thingsboard.server.dao.cache", "org.thingsboard.server.cache", "org.thingsboard.server.dao.entity"})
 @EnableJpaRepositories(value = {"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.sqlts.dictionary"},
         excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {EventRepository.class, AuditLogRepository.class}),
         bootstrapMode = BootstrapMode.LAZY)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index 2fca546fc9..5df926faf2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -103,7 +103,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     private EdqsApiService edqsApiService;
 
     @Autowired
-    private EdqsStatsService edqsStatsService;
+    private Optional<EdqsStatsService> edqsStatsService;
 
     @Override
     public long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query) {
@@ -123,7 +123,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
         } else {
             result = entityQueryDao.countEntitiesByQuery(tenantId, customerId, query);
         }
-        edqsStatsService.reportEntityCountQuery(tenantId, query, System.nanoTime() - startNs);
+        edqsStatsService.ifPresent(statsService -> statsService.reportEntityCountQuery(tenantId, query, System.nanoTime() - startNs));
         return result;
     }
 
@@ -157,7 +157,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
                 }
             }
         }
-        edqsStatsService.reportEntityDataQuery(tenantId, query, System.nanoTime() - startNs);
+        edqsStatsService.ifPresent(statsService -> statsService.reportEntityDataQuery(tenantId, query, System.nanoTime() - startNs));
         return result;
     }