- visibility modifiers

#324

Author: kamransaleem

waltz-data/src/main/ddl/liquibase/db.changelog-1.0.xml

@@ -2214,5 +2214,22 @@
         </dropColumn>
     </changeSet>
 
+    <!-- 324 - Entit Stat Defn - Visibility Modifiers -->
+    <changeSet author="kamransaleem"
+               id="20160727-324-1">
+        <addColumn tableName="entity_statistic_definition">
+            <column name="entity_visibility"
+                    type="boolean"
+                    defaultValueBoolean="true">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="rollup_visibility"
+                    type="boolean"
+                    defaultValueBoolean="true">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
 
 </databaseChangeLog>

waltz-data/src/main/java/com/khartec/waltz/data/entity_statistic/EntityStatisticDefinitionDao.java

@@ -1,10 +1,10 @@
 package com.khartec.waltz.data.entity_statistic;
 
 import com.khartec.waltz.model.EntityKind;
-import com.khartec.waltz.model.StatisticCategory;
-import com.khartec.waltz.model.StatisticType;
 import com.khartec.waltz.model.entity_statistic.EntityStatisticDefinition;
 import com.khartec.waltz.model.entity_statistic.ImmutableEntityStatisticDefinition;
+import com.khartec.waltz.model.entity_statistic.StatisticCategory;
+import com.khartec.waltz.model.entity_statistic.StatisticType;
 import com.khartec.waltz.schema.tables.records.EntityStatisticDefinitionRecord;
 import org.jooq.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +38,8 @@ public class EntityStatisticDefinitionDao {
                 .historicRenderer(record.getHistoricRenderer())
                 .provenance(record.getProvenance())
                 .parentId(Optional.ofNullable(record.getParentId()))
+                .entityVisibility(record.getEntityVisibility())
+                .rollupVisibility(record.getRollupVisibility())
                 .build();
     };
 
@@ -55,6 +57,8 @@ public class EntityStatisticDefinitionDao {
         record.setRenderer(domainObj.renderer());
         record.setHistoricRenderer(domainObj.historicRenderer());
         record.setProvenance(domainObj.provenance());
+        record.setEntityVisibility(domainObj.entityVisibility());
+        record.setRollupVisibility(domainObj.rollupVisibility());
 
         return record;
     };

waltz-data/src/main/java/com/khartec/waltz/data/entity_statistic/EntityStatisticValueDao.java

@@ -2,9 +2,9 @@
 
 import com.khartec.waltz.model.EntityKind;
 import com.khartec.waltz.model.ImmutableEntityReference;
-import com.khartec.waltz.model.StatisticValueState;
 import com.khartec.waltz.model.entity_statistic.EntityStatisticValue;
 import com.khartec.waltz.model.entity_statistic.ImmutableEntityStatisticValue;
+import com.khartec.waltz.model.entity_statistic.StatisticValueState;
 import com.khartec.waltz.schema.tables.records.EntityStatisticValueRecord;
 import org.jooq.*;
 import org.springframework.beans.factory.annotation.Autowired;

waltz-jobs/src/main/java/com/khartec/waltz/jobs/sample/EntityStatisticGenerator.java

@@ -3,12 +3,11 @@
 import com.khartec.waltz.data.application.ApplicationDao;
 import com.khartec.waltz.data.entity_statistic.EntityStatisticDefinitionDao;
 import com.khartec.waltz.data.entity_statistic.EntityStatisticValueDao;
-import com.khartec.waltz.model.*;
+import com.khartec.waltz.model.EntityKind;
+import com.khartec.waltz.model.EntityReference;
+import com.khartec.waltz.model.ImmutableEntityReference;
 import com.khartec.waltz.model.application.Application;
-import com.khartec.waltz.model.entity_statistic.EntityStatisticDefinition;
-import com.khartec.waltz.model.entity_statistic.EntityStatisticValue;
-import com.khartec.waltz.model.entity_statistic.ImmutableEntityStatisticDefinition;
-import com.khartec.waltz.model.entity_statistic.ImmutableEntityStatisticValue;
+import com.khartec.waltz.model.entity_statistic.*;
 import com.khartec.waltz.service.DIConfiguration;
 import org.jooq.DSLContext;
 import org.springframework.context.ApplicationContext;
@@ -49,6 +48,8 @@ public class EntityStatisticGenerator implements SampleDataGenerator {
             .renderer("enum")
             .historicRenderer("enum")
             .name("dummy stat")
+            .entityVisibility(true)
+            .rollupVisibility(true)
             .provenance(PROVENANCE)
             .build();
 

waltz-jobs/src/main/java/com/khartec/waltz/jobs/sample/SampleData.java

@@ -17,16 +17,6 @@
 
 package com.khartec.waltz.jobs.sample;
 
-import com.khartec.waltz.common.DateTimeUtilities;
-import com.khartec.waltz.model.StatisticType;
-import com.khartec.waltz.model.StatisticValueState;
-import org.jooq.lambda.tuple.Tuple;
-import org.jooq.lambda.tuple.Tuple4;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
 public interface SampleData {
 
     String[][] jobTitles = {

waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/EntityStatisticDefinition.java

@@ -21,4 +21,6 @@ public abstract class EntityStatisticDefinition implements
     public abstract boolean active();
     public abstract String renderer();
     public abstract String historicRenderer();
+    public abstract Boolean entityVisibility();
+    public abstract Boolean rollupVisibility();
 }

…artec/waltz/model/StatisticCategory.java …/entity_statistic/StatisticCategory.javawaltz-model/src/main/java/com/khartec/waltz/model/StatisticCategory.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticCategory.java waltz-model/src/main/java/com/khartec/waltz/model/StatisticCategory.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticCategory.java

@@ -15,7 +15,7 @@
  *     along with Waltz.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.khartec.waltz.model;
+package com.khartec.waltz.model.entity_statistic;
 
 public enum StatisticCategory {
     COMPLIANCE,

…m/khartec/waltz/model/StatisticType.java …odel/entity_statistic/StatisticType.javawaltz-model/src/main/java/com/khartec/waltz/model/StatisticType.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticType.java waltz-model/src/main/java/com/khartec/waltz/model/StatisticType.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticType.java

@@ -15,7 +15,7 @@
  *     along with Waltz.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.khartec.waltz.model;
+package com.khartec.waltz.model.entity_statistic;
 
 public enum StatisticType {
 

…tec/waltz/model/StatisticValueState.java …ntity_statistic/StatisticValueState.javawaltz-model/src/main/java/com/khartec/waltz/model/StatisticValueState.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticValueState.java waltz-model/src/main/java/com/khartec/waltz/model/StatisticValueState.java renamed to waltz-model/src/main/java/com/khartec/waltz/model/entity_statistic/StatisticValueState.java

@@ -15,7 +15,7 @@
  *     along with Waltz.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.khartec.waltz.model;
+package com.khartec.waltz.model.entity_statistic;
 
 public enum StatisticValueState {
     EXEMPT,