From 49707f9cfc704a454dc9585fb55dbb0dd6b187b2 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 6 Aug 2024 17:12:50 +0300
Subject: [PATCH] Fix Timescale dao configuration

---
 .../thingsboard/server/dao/config/JpaDaoConfig.java    | 10 +++++++++-
 .../server/dao/config/TimescaleDaoConfig.java          |  2 --
 .../server/dao/config/TimescaleTsLatestDaoConfig.java  |  2 --
 3 files changed, 9 insertions(+), 5 deletions(-)

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 75bd14eaa1..86c0ed4ea3 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
@@ -69,7 +69,9 @@ public class JpaDaoConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("dataSource") DataSource dataSource,
                                                                        EntityManagerFactoryBuilder builder,
                                                                        @Autowired(required = false) SqlTsLatestDaoConfig tsLatestDaoConfig,
-                                                                       @Autowired(required = false) SqlTsDaoConfig tsDaoConfig) {
+                                                                       @Autowired(required = false) SqlTsDaoConfig tsDaoConfig,
+                                                                       @Autowired(required = false) TimescaleDaoConfig timescaleDaoConfig,
+                                                                       @Autowired(required = false) TimescaleTsLatestDaoConfig timescaleTsLatestDaoConfig) {
         List<String> packages = new ArrayList<>();
         packages.add("org.thingsboard.server.dao.model.sql");
         packages.add("org.thingsboard.server.dao.model.sqlts.dictionary");
@@ -79,6 +81,12 @@ public class JpaDaoConfig {
         if (tsDaoConfig != null) {
             packages.add("org.thingsboard.server.dao.model.sqlts.ts");
         }
+        if (timescaleDaoConfig != null) {
+            packages.add("org.thingsboard.server.dao.model.sqlts.timescale");
+        }
+        if (timescaleTsLatestDaoConfig != null) {
+            packages.add("org.thingsboard.server.dao.model.sqlts.latest");
+        }
         return builder
                 .dataSource(dataSource)
                 .packages(packages.toArray(String[]::new))
diff --git a/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java
index 05a84ca1cc..3c910778a2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao.config;
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -28,7 +27,6 @@ import org.thingsboard.server.dao.util.TimescaleDBTsDao;
 @TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
 @EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.timescale", "org.thingsboard.server.dao.sqlts.insert.timescale"}, bootstrapMode = BootstrapMode.LAZY)
-@EntityScan({"org.thingsboard.server.dao.model.sqlts.timescale"})
 @EnableTransactionManagement
 @TimescaleDBTsDao
 public class TimescaleDaoConfig {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java
index 74d0cc7ae3..f6d1e49a6e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao.config;
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -28,7 +27,6 @@ import org.thingsboard.server.dao.util.TimescaleDBTsLatestDao;
 @TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
 @EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.insert.latest.sql", "org.thingsboard.server.dao.sqlts.latest"}, bootstrapMode = BootstrapMode.LAZY)
-@EntityScan({"org.thingsboard.server.dao.model.sqlts.latest"})
 @EnableTransactionManagement
 @TimescaleDBTsLatestDao
 public class TimescaleTsLatestDaoConfig {