Merge pull request #6846 from deutschebank/db-contrib/waltz-6844-grid-api-bug

grid api bug

Author: davidwatkins73

waltz-data/src/main/java/org/finos/waltz/data/JooqUtilities.java

@@ -600,7 +600,7 @@ public static CommonTableFields<?> determineCommonTableFields(EntityKind kind, S
                 SurveyTemplate st = alias == null ? Tables.SURVEY_TEMPLATE : Tables.SURVEY_TEMPLATE.as(alias);
                 return ImmutableCommonTableFields
                         .builder()
-                        .entityKind(EntityKind.SURVEY_QUESTION)
+                        .entityKind(EntityKind.SURVEY_TEMPLATE)
                         .table(st)
                         .idField(st.ID)
                         .parentIdField(null)

waltz-data/src/main/java/org/finos/waltz/data/report_grid/ReportGridDao.java

@@ -80,7 +80,6 @@
 import org.jooq.SelectJoinStep;
 import org.jooq.SelectOrderByStep;
 import org.jooq.Table;
-import org.jooq.TableField;
 import org.jooq.impl.DSL;
 import org.jooq.lambda.tuple.Tuple2;
 import org.jooq.lambda.tuple.Tuple3;
@@ -111,7 +110,12 @@
 import static java.util.Comparator.comparing;
 import static java.util.Optional.ofNullable;
 import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.*;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
 import static org.finos.waltz.common.CollectionUtilities.isEmpty;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDate;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
@@ -136,7 +140,47 @@
 import static org.finos.waltz.model.report_grid.CellOption.mkCellOption;
 import static org.finos.waltz.model.survey.SurveyInstanceStatus.APPROVED;
 import static org.finos.waltz.model.survey.SurveyInstanceStatus.COMPLETED;
-import static org.finos.waltz.schema.Tables.*;
+import static org.finos.waltz.schema.Tables.APPLICATION;
+import static org.finos.waltz.schema.Tables.APPLICATION_GROUP;
+import static org.finos.waltz.schema.Tables.APPLICATION_GROUP_ENTRY;
+import static org.finos.waltz.schema.Tables.APPLICATION_GROUP_OU_ENTRY;
+import static org.finos.waltz.schema.Tables.ASSESSMENT_DEFINITION;
+import static org.finos.waltz.schema.Tables.ASSESSMENT_RATING;
+import static org.finos.waltz.schema.Tables.ATTESTATION_INSTANCE;
+import static org.finos.waltz.schema.Tables.ATTESTATION_RUN;
+import static org.finos.waltz.schema.Tables.CHANGE_INITIATIVE;
+import static org.finos.waltz.schema.Tables.COMPLEXITY;
+import static org.finos.waltz.schema.Tables.COMPLEXITY_KIND;
+import static org.finos.waltz.schema.Tables.COST;
+import static org.finos.waltz.schema.Tables.COST_KIND;
+import static org.finos.waltz.schema.Tables.ENTITY_ALIAS;
+import static org.finos.waltz.schema.Tables.ENTITY_FIELD_REFERENCE;
+import static org.finos.waltz.schema.Tables.ENTITY_HIERARCHY;
+import static org.finos.waltz.schema.Tables.ENTITY_RELATIONSHIP;
+import static org.finos.waltz.schema.Tables.ENTITY_STATISTIC_DEFINITION;
+import static org.finos.waltz.schema.Tables.ENTITY_STATISTIC_VALUE;
+import static org.finos.waltz.schema.Tables.INVOLVEMENT;
+import static org.finos.waltz.schema.Tables.MEASURABLE;
+import static org.finos.waltz.schema.Tables.MEASURABLE_CATEGORY;
+import static org.finos.waltz.schema.Tables.MEASURABLE_RATING;
+import static org.finos.waltz.schema.Tables.ORGANISATIONAL_UNIT;
+import static org.finos.waltz.schema.Tables.PERSON;
+import static org.finos.waltz.schema.Tables.RATING_SCHEME_ITEM;
+import static org.finos.waltz.schema.Tables.REPORT_GRID;
+import static org.finos.waltz.schema.Tables.REPORT_GRID_COLUMN_DEFINITION;
+import static org.finos.waltz.schema.Tables.REPORT_GRID_DERIVED_COLUMN_DEFINITION;
+import static org.finos.waltz.schema.Tables.REPORT_GRID_FIXED_COLUMN_DEFINITION;
+import static org.finos.waltz.schema.Tables.REPORT_GRID_MEMBER;
+import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE;
+import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE_OWNER;
+import static org.finos.waltz.schema.Tables.SURVEY_INSTANCE_RECIPIENT;
+import static org.finos.waltz.schema.Tables.SURVEY_QUESTION;
+import static org.finos.waltz.schema.Tables.SURVEY_QUESTION_LIST_RESPONSE;
+import static org.finos.waltz.schema.Tables.SURVEY_QUESTION_RESPONSE;
+import static org.finos.waltz.schema.Tables.SURVEY_RUN;
+import static org.finos.waltz.schema.Tables.SURVEY_TEMPLATE;
+import static org.finos.waltz.schema.Tables.TAG;
+import static org.finos.waltz.schema.Tables.TAG_USAGE;
 import static org.finos.waltz.schema.tables.DataType.DATA_TYPE;
 import static org.finos.waltz.schema.tables.DataTypeUsage.DATA_TYPE_USAGE;
 import static org.finos.waltz.schema.tables.InvolvementKind.INVOLVEMENT_KIND;