Merge pull request #405 from hashmapinc/revert-401-Tempus-400

Revert "Tempus-400"
hashmapinc · Jun 4, 2018 · 61f4f57 · 61f4f57
2 parents f8eb770 + 032ba1f
commit 61f4f57
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 80 deletions.
diff --git a/application/src/main/java/com/hashmapinc/server/install/TempusInstallService.java b/application/src/main/java/com/hashmapinc/server/install/TempusInstallService.java
@@ -123,13 +123,12 @@ public void performInstall() {
 
                 componentDiscoveryService.discoverComponents();
 
-                systemDataLoaderService.loadSystemThemes();
                 systemDataLoaderService.createSysAdmin();
                 systemDataLoaderService.createAdminSettings();
                 systemDataLoaderService.loadSystemWidgets();
                 systemDataLoaderService.loadSystemPlugins();
                 systemDataLoaderService.loadSystemRules();
-
+                systemDataLoaderService.loadSystemThemes();
 
                 if (loadDemo) {
                     log.info("Loading demo data...");

diff --git a/...n/src/main/java/com/hashmapinc/server/service/install/DefaultSystemDataLoaderService.java b/...n/src/main/java/com/hashmapinc/server/service/install/DefaultSystemDataLoaderService.java
@@ -176,24 +176,18 @@ public void createAdminSettings() throws Exception {
 
     public void loadSystemThemes() throws Exception {
 
-        List<Theme> theme = themeService.findAll();
-
-        if(theme.size() < 2) {
-
-            log.info("Loading theme  data...");
-            Theme theme1 = new Theme();
-            theme1.setThemeName("Tempus Blue");
-            theme1.setThemeValue("themeBlue");
-            theme1.setThemeStatus(false);
-            themeService.saveTheme(theme1);
-
-            Theme theme2 = new Theme();
-            theme2.setThemeName("Tempus Dark");
-            theme2.setThemeValue("themeDark");
-            theme2.setThemeStatus(true);
-            themeService.saveTheme(theme2);
-
-        }
+        log.info("Loading theme  data...");
+        Theme theme1 = new Theme();
+        theme1.setThemeName("Tempus Blue");
+        theme1.setThemeValue("themeBlue");
+        theme1.setThemeStatus(false);
+        themeService.saveTheme(theme1);
+
+        Theme theme2 = new Theme();
+        theme2.setThemeName("Tempus Dark");
+        theme2.setThemeValue("themeDark");
+        theme2.setThemeStatus(true);
+        themeService.saveTheme(theme2);
 
 
     }

diff --git a/application/src/test/java/com/hashmapinc/server/controller/ControllerNoSqlTestSuite.java b/application/src/test/java/com/hashmapinc/server/controller/ControllerNoSqlTestSuite.java
@@ -45,11 +45,6 @@ private static List<CQLDataSet> getDataSetLists(){
         dataSets.addAll(Arrays.asList(
                 new ClassPathCQLDataSet("cassandra/upgrade/1.cql", false, false)
         ));
-
-        dataSets.addAll(Arrays.asList(
-                new ClassPathCQLDataSet("cassandra/upgrade/2.cql", false, false)
-        ));
-
         return dataSets;
     }
 

diff --git a/application/src/test/java/com/hashmapinc/server/controller/ControllerSqlTestSuite.java b/application/src/test/java/com/hashmapinc/server/controller/ControllerSqlTestSuite.java
@@ -33,6 +33,6 @@ public class ControllerSqlTestSuite {
             Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
             "sql/drop-all-tables.sql",
             "sql-test.properties",
-            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql", "sql/upgrade/3.sql")
+            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql")
     );
 }
diff --git a/application/src/test/java/com/hashmapinc/server/mqtt/MqttSqlTestSuite.java b/application/src/test/java/com/hashmapinc/server/mqtt/MqttSqlTestSuite.java
@@ -32,5 +32,5 @@ public class MqttSqlTestSuite {
             Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
             "sql/drop-all-tables.sql",
             "sql-test.properties",
-            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql","sql/upgrade/3.sql"));
+            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql"));
 }
diff --git a/application/src/test/java/com/hashmapinc/server/system/SystemSqlTestSuite.java b/application/src/test/java/com/hashmapinc/server/system/SystemSqlTestSuite.java
@@ -34,7 +34,7 @@ public class SystemSqlTestSuite {
             Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
             "sql/drop-all-tables.sql",
             "sql-test.properties",
-            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql", "sql/upgrade/3.sql")
+            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql")
     );
 
 

diff --git a/dao/src/main/resources/cassandra/schema.cql b/dao/src/main/resources/cassandra/schema.cql
@@ -781,3 +781,10 @@ CREATE TABLE IF NOT EXISTS tempus.audit_log_by_tenant_id_partitions (
 ) WITH CLUSTERING ORDER BY ( partition ASC )
 AND compaction = { 'class' :  'LeveledCompactionStrategy'  };
 
+CREATE TABLE IF NOT EXISTS tempus.theme (
+  id uuid,
+  name text,
+  value text,
+  is_enabled boolean,
+  PRIMARY KEY (id,name)
+);
diff --git a/dao/src/main/resources/cassandra/upgrade/2.cql b/dao/src/main/resources/cassandra/upgrade/2.cql
diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql
@@ -362,6 +362,12 @@ CREATE TABLE IF NOT EXISTS computation_job (
     tenant_id varchar(31)
 );
 
+CREATE TABLE IF NOT EXISTS theme (
+    id varchar (31) NOT NULL CONSTRAINT theme_pkey PRIMARY KEY,
+    name varchar,
+    value varchar,
+    is_enabled boolean
+ );
 
 
 

diff --git a/dao/src/main/resources/sql/upgrade/3.sql b/dao/src/main/resources/sql/upgrade/3.sql
diff --git a/dao/src/test/java/com/hashmapinc/server/dao/JpaDaoTestSuite.java b/dao/src/test/java/com/hashmapinc/server/dao/JpaDaoTestSuite.java
@@ -33,7 +33,7 @@ public class JpaDaoTestSuite {
             Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
             "sql/drop-all-tables.sql",
             "sql-test.properties",
-            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql", "sql/upgrade/3.sql")
+            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql")
     );
 
 }
diff --git a/dao/src/test/java/com/hashmapinc/server/dao/NoSqlDaoServiceTestSuite.java b/dao/src/test/java/com/hashmapinc/server/dao/NoSqlDaoServiceTestSuite.java
@@ -45,10 +45,6 @@ private static List<CQLDataSet> getDataSetLists(){
         dataSets.addAll(Arrays.asList(
                 new ClassPathCQLDataSet("cassandra/upgrade/1.cql", false, false)
         ));
-        dataSets.addAll(Arrays.asList(
-                new ClassPathCQLDataSet("cassandra/upgrade/2.cql", false, false)
-        ));
-
         return dataSets;
     }
 

diff --git a/dao/src/test/java/com/hashmapinc/server/dao/SqlDaoServiceTestSuite.java b/dao/src/test/java/com/hashmapinc/server/dao/SqlDaoServiceTestSuite.java
@@ -33,6 +33,6 @@ public class SqlDaoServiceTestSuite {
             Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
             "sql/drop-all-tables.sql",
             "sql-test.properties",
-            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql","sql/upgrade/3.sql")
+            Arrays.asList("sql/upgrade/1.sql", "sql/upgrade/2.sql")
     );
 }