Waltz 6948 test data

.github/workflows/maven.yml

@@ -12,7 +12,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:11
+        image: postgres:15
         env:
           POSTGRES_USER: postgres
           POSTGRES_DB: waltz

README.md

@@ -13,9 +13,10 @@ Learn more
 Getting started
  - [Building](docs/development/build.md) 
  - [Running](waltz-web/README.md)
- - [Docker](docker/DOCKER.md)
+ - [Docker](docker/README.md)
 
 ---
+[![FINOS Hosted Platform - Waltz Demo](https://img.shields.io/badge/FINOS%20Hosted%20Platform-Waltz%20Demo-blue)](https://demo.waltz.finos.org/)
 [![postgres build](https://github.com/finos/waltz/actions/workflows/maven.yml/badge.svg)](https://github.com/finos/waltz/actions)
 [![Latest Version](https://badgers.space/github/release/finos/waltz)](https://github.com/finos/waltz/releases)
 [![Language Grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/khartec/waltz.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/khartec/waltz/context:javascript) 
@@ -67,10 +68,10 @@ progress and done issues.
 
 **Provisional** dates for upcoming releases:
 
-| Release | Date          | Provisional Change Summary                            |
-|---------|---------------|-------------------------------------------------------|
-| 1.57    | Jan 16th 2024 | Primary Ratings, Entity Stats, Measurable Rating page |
-| 1.58    | Feb 13th 2024 | tbd                                                   |
+| Release | Date          | Provisional Change Summary                                            |
+|---------|---------------|-----------------------------------------------------------------------|
+| 1.58.1  | Feb 27th 2024 | Minor fixes                                                           |
+| 1.59    | Mar 26th 2024 | Flow classification rules for aggregator apps (not just distributors) |
 
 See the [releases](https://github.com/finos/waltz/releases) page for historic versions.
 

pom.xml

@@ -31,7 +31,7 @@
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.57-SNAPSHOT</version>
+    <version>1.59-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>

waltz-common/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.57-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

waltz-data/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.57-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -106,20 +106,27 @@ private static Map<EntityKind, Tuple3<Table, Field<Long>, Field<String>>> mkName
         mappings.put(EntityKind.APPLICATION, tuple(APPLICATION, APPLICATION.ID, APPLICATION.NAME));
         mappings.put(EntityKind.APP_GROUP, tuple(APPLICATION_GROUP, APPLICATION_GROUP.ID, APPLICATION_GROUP.NAME));
         mappings.put(EntityKind.CHANGE_INITIATIVE, tuple(CHANGE_INITIATIVE, CHANGE_INITIATIVE.ID, CHANGE_INITIATIVE.NAME));
+        mappings.put(EntityKind.CHANGE_SET, tuple(CHANGE_SET, CHANGE_SET.ID, CHANGE_SET.NAME));
         mappings.put(EntityKind.DATA_TYPE, tuple(DATA_TYPE, DATA_TYPE.ID, DATA_TYPE.NAME));
-        mappings.put(EntityKind.FLOW_DIAGRAM, tuple(FLOW_DIAGRAM, FLOW_DIAGRAM.ID, FLOW_DIAGRAM.NAME));
         mappings.put(EntityKind.END_USER_APPLICATION, tuple(END_USER_APPLICATION, END_USER_APPLICATION.ID, END_USER_APPLICATION.NAME));
+        mappings.put(EntityKind.ENTITY_RELATIONSHIP, tuple(ENTITY_RELATIONSHIP, ENTITY_RELATIONSHIP.ID, DSL.val("Entity Relationship")));
         mappings.put(EntityKind.ENTITY_STATISTIC, tuple(ENTITY_STATISTIC_DEFINITION, ENTITY_STATISTIC_DEFINITION.ID, ENTITY_STATISTIC_DEFINITION.NAME));
+        mappings.put(EntityKind.FLOW_CLASSIFICATION_RULE, tuple(FLOW_CLASSIFICATION_RULE, FLOW_CLASSIFICATION_RULE.ID, DSL.val("Flow Classification Rule")));
+        mappings.put(EntityKind.FLOW_DIAGRAM, tuple(FLOW_DIAGRAM, FLOW_DIAGRAM.ID, FLOW_DIAGRAM.NAME));
+        mappings.put(EntityKind.INVOLVEMENT_KIND, tuple(INVOLVEMENT_KIND, INVOLVEMENT_KIND.ID, INVOLVEMENT_KIND.NAME));
         mappings.put(EntityKind.LEGAL_ENTITY, tuple(LEGAL_ENTITY, LEGAL_ENTITY.ID, LEGAL_ENTITY.NAME));
+        mappings.put(EntityKind.LEGAL_ENTITY_RELATIONSHIP, tuple(LEGAL_ENTITY_RELATIONSHIP, LEGAL_ENTITY_RELATIONSHIP.ID, DSL.val("Legal Entity Relationship")));
+        mappings.put(EntityKind.LICENCE, tuple(LICENCE, LICENCE.ID, LICENCE.NAME));
         mappings.put(EntityKind.LOGICAL_DATA_FLOW, tuple(LOGICAL_FLOW, LOGICAL_FLOW.ID, DSL.val("Logical Flow")));
         mappings.put(EntityKind.MEASURABLE, tuple(MEASURABLE, MEASURABLE.ID, MEASURABLE.NAME));
+        mappings.put(EntityKind.MEASURABLE_RATING, tuple(MEASURABLE_RATING, MEASURABLE_RATING.ID, DSL.val("Measurable Rating")));
         mappings.put(EntityKind.MEASURABLE_CATEGORY, tuple(MEASURABLE_CATEGORY, MEASURABLE_CATEGORY.ID, MEASURABLE_CATEGORY.NAME));
         mappings.put(EntityKind.ORG_UNIT, tuple(ORGANISATIONAL_UNIT, ORGANISATIONAL_UNIT.ID, ORGANISATIONAL_UNIT.NAME));
         mappings.put(EntityKind.PERSON, tuple(PERSON, PERSON.ID, PERSON.DISPLAY_NAME));
         mappings.put(EntityKind.PHYSICAL_FLOW, tuple(PHYSICAL_FLOW, PHYSICAL_FLOW.ID, DSL.val("Physical Flow")));
         mappings.put(EntityKind.PHYSICAL_SPECIFICATION, tuple(PHYSICAL_SPECIFICATION, PHYSICAL_SPECIFICATION.ID, PHYSICAL_SPECIFICATION.NAME));
         mappings.put(EntityKind.SERVER, tuple(SERVER_INFORMATION, SERVER_INFORMATION.ID, SERVER_INFORMATION.HOSTNAME));
-        mappings.put(EntityKind.LICENCE, tuple(LICENCE, LICENCE.ID, LICENCE.NAME));
+        mappings.put(EntityKind.SOFTWARE, tuple(SOFTWARE_PACKAGE, SOFTWARE_PACKAGE.ID, SOFTWARE_PACKAGE.NAME));
         return mappings;
     }
 
@@ -142,15 +149,18 @@ private static Map<EntityKind,Tuple3<Table,Field<Long>,Field<String>>> mkExterna
         mappings.put(EntityKind.ACTOR, tuple(ACTOR, ACTOR.ID, ACTOR.EXTERNAL_ID));
         mappings.put(EntityKind.APPLICATION, tuple(APPLICATION, APPLICATION.ID, APPLICATION.ASSET_CODE));
         mappings.put(EntityKind.CHANGE_INITIATIVE, tuple(CHANGE_INITIATIVE, CHANGE_INITIATIVE.ID, CHANGE_INITIATIVE.EXTERNAL_ID));
+        mappings.put(EntityKind.CHANGE_SET, tuple(CHANGE_SET, CHANGE_SET.ID, CHANGE_SET.EXTERNAL_ID));
         mappings.put(EntityKind.DATA_TYPE, tuple(DATA_TYPE, DATA_TYPE.ID, DATA_TYPE.CODE));
         mappings.put(EntityKind.END_USER_APPLICATION, tuple(END_USER_APPLICATION, END_USER_APPLICATION.ID, END_USER_APPLICATION.EXTERNAL_ID));
+        mappings.put(EntityKind.LOGICAL_DATA_FLOW, tuple(LOGICAL_FLOW, LOGICAL_FLOW.ID, LOGICAL_FLOW.EXTERNAL_ID));
         mappings.put(EntityKind.LEGAL_ENTITY, tuple(LEGAL_ENTITY, LEGAL_ENTITY.ID, LEGAL_ENTITY.EXTERNAL_ID));
         mappings.put(EntityKind.MEASURABLE, tuple(MEASURABLE, MEASURABLE.ID, MEASURABLE.EXTERNAL_ID));
         mappings.put(EntityKind.MEASURABLE_CATEGORY, tuple(MEASURABLE_CATEGORY, MEASURABLE_CATEGORY.ID, MEASURABLE_CATEGORY.EXTERNAL_ID));
         mappings.put(EntityKind.PERSON, tuple(PERSON, PERSON.ID, PERSON.EMPLOYEE_ID));
         mappings.put(EntityKind.PHYSICAL_FLOW, tuple(PHYSICAL_FLOW, PHYSICAL_FLOW.ID, PHYSICAL_FLOW.EXTERNAL_ID));
         mappings.put(EntityKind.PHYSICAL_SPECIFICATION, tuple(PHYSICAL_SPECIFICATION, PHYSICAL_SPECIFICATION.ID, PHYSICAL_SPECIFICATION.EXTERNAL_ID));
         mappings.put(EntityKind.SERVER, tuple(SERVER_INFORMATION, SERVER_INFORMATION.ID, SERVER_INFORMATION.EXTERNAL_ID));
+        mappings.put(EntityKind.SOFTWARE, tuple(SOFTWARE_PACKAGE, SOFTWARE_PACKAGE.ID, SOFTWARE_PACKAGE.EXTERNAL_ID));
         return mappings;
     }
 

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

@@ -40,11 +40,14 @@
 import org.finos.waltz.schema.tables.CostKind;
 import org.finos.waltz.schema.tables.DataType;
 import org.finos.waltz.schema.tables.EntityStatisticDefinition;
+import org.finos.waltz.schema.tables.FlowClassification;
+import org.finos.waltz.schema.tables.FlowClassificationRule;
 import org.finos.waltz.schema.tables.InvolvementKind;
 import org.finos.waltz.schema.tables.Measurable;
 import org.finos.waltz.schema.tables.MeasurableCategory;
 import org.finos.waltz.schema.tables.MeasurableRating;
 import org.finos.waltz.schema.tables.OrganisationalUnit;
+import org.finos.waltz.schema.tables.PhysicalFlow;
 import org.finos.waltz.schema.tables.SurveyQuestion;
 import org.finos.waltz.schema.tables.SurveyTemplate;
 import org.finos.waltz.schema.tables.records.ChangeLogRecord;
@@ -537,6 +540,30 @@ public static CommonTableFields<?> determineCommonTableFields(EntityKind kind, S
                         .descriptionField(esd.DESCRIPTION)
                         .externalIdField(esd.EXTERNAL_ID)
                         .build();
+            case FLOW_CLASSIFICATION_RULE:
+                    FlowClassificationRule fcr = alias == null ? Tables.FLOW_CLASSIFICATION_RULE : Tables.FLOW_CLASSIFICATION_RULE.as(alias);
+                    return ImmutableCommonTableFields
+                        .builder()
+                        .entityKind(EntityKind.FLOW_CLASSIFICATION_RULE)
+                        .table(fcr)
+                        .idField(fcr.ID)
+                        .parentIdField(null)
+                        .nameField(null)
+                        .descriptionField(null)
+                        .externalIdField(null)
+                        .build();
+            case FLOW_CLASSIFICATION:
+                    FlowClassification fc = alias == null ? Tables.FLOW_CLASSIFICATION : Tables.FLOW_CLASSIFICATION.as(alias);
+                    return ImmutableCommonTableFields
+                        .builder()
+                        .entityKind(EntityKind.FLOW_CLASSIFICATION)
+                        .table(fc)
+                        .idField(fc.ID)
+                        .parentIdField(null)
+                        .nameField(fc.NAME)
+                        .descriptionField(fc.DESCRIPTION)
+                        .externalIdField(fc.CODE)
+                        .build();
             case INVOLVEMENT_KIND:
                 InvolvementKind ik = alias == null ? Tables.INVOLVEMENT_KIND : Tables.INVOLVEMENT_KIND.as(alias);
                 return ImmutableCommonTableFields
@@ -621,6 +648,18 @@ public static CommonTableFields<?> determineCommonTableFields(EntityKind kind, S
                         .descriptionField(st.DESCRIPTION)
                         .externalIdField(st.EXTERNAL_ID)
                         .build();
+            case PHYSICAL_FLOW:
+                PhysicalFlow pf = alias == null ? Tables.PHYSICAL_FLOW : Tables.PHYSICAL_FLOW.as(alias);
+                return ImmutableCommonTableFields
+                        .builder()
+                        .entityKind(EntityKind.PHYSICAL_FLOW)
+                        .table(pf)
+                        .idField(pf.ID)
+                        .parentIdField(null)
+                        .nameField(pf.NAME)
+                        .descriptionField(pf.DESCRIPTION)
+                        .externalIdField(pf.EXTERNAL_ID)
+                        .build();
             default:
                 throw new UnsupportedOperationException("Cannot determine table fields for entity kind:" + kind);
         }

waltz-data/src/main/java/org/finos/waltz/data/data_type/DataTypeDao.java

@@ -98,6 +98,17 @@ public List<EntityReference> findByIdSelectorAsEntityReference(Select<Record1<Lo
     }
 
 
+    public Set<DataType> findByIdSelector(Select<Record1<Long>> selector) {
+        checkNotNull(selector, "selector cannot be null");
+
+        return dsl
+                .select(DATA_TYPE.asterisk())
+                .from(DATA_TYPE)
+                .where(DATA_TYPE.ID.in(selector))
+                .fetchSet(TO_DOMAIN);
+    }
+
+
     public DataType getByCode(String code) {
         checkNotEmpty(code, "Code cannot be null/empty");
         return dsl

waltz-data/src/main/java/org/finos/waltz/data/flow_classification_rule/FlowClassificationDao.java

@@ -18,6 +18,8 @@
 
 package org.finos.waltz.data.flow_classification_rule;
 
+import org.finos.waltz.model.FlowDirection;
+import org.finos.waltz.model.Severity;
 import org.finos.waltz.schema.tables.records.FlowClassificationRecord;
 import org.finos.waltz.model.flow_classification.FlowClassification;
 import org.finos.waltz.model.flow_classification.ImmutableFlowClassification;
@@ -49,6 +51,9 @@ public class FlowClassificationDao {
                 .position(record.getPosition())
                 .isCustom(record.getIsCustom())
                 .userSelectable(record.getUserSelectable())
+                .direction(FlowDirection.valueOf(record.getDirection()))
+                .defaultMessage(record.getDefaultMessage())
+                .messageSeverity(Severity.valueOf(record.getMessageSeverity()))
                 .build();
     };
 
@@ -77,6 +82,15 @@ public FlowClassification getById(long id) {
     }
 
 
+    public Set<FlowClassification> findByIds(Set<Long> classificationRuleIds) {
+        return dsl
+                .select(FLOW_CLASSIFICATION.fields())
+                .from(FLOW_CLASSIFICATION)
+                .where(FLOW_CLASSIFICATION.ID.in(classificationRuleIds))
+                .fetchSet(TO_DOMAIN_MAPPER);
+    }
+
+
     public int remove(long id) {
         return dsl
                 .delete(FLOW_CLASSIFICATION)

waltz-data/src/main/java/org/finos/waltz/data/flow_classification_rule/FlowClassificationRuleDao.java

@@ -22,6 +22,7 @@
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.model.ImmutableEntityReference;
+import org.finos.waltz.model.Severity;
 import org.finos.waltz.model.flow_classification_rule.DiscouragedSource;
 import org.finos.waltz.model.flow_classification_rule.FlowClassificationRule;
 import org.finos.waltz.model.flow_classification_rule.FlowClassificationRuleCreateCommand;
@@ -160,6 +161,8 @@ public class FlowClassificationRuleDao {
                 .lastUpdatedBy(record.getLastUpdatedBy())
                 .externalId(Optional.ofNullable(record.getExternalId()))
                 .isReadonly(record.getIsReadonly())
+                .message(record.getMessage())
+                .messageSeverity(Severity.valueOf(record.getMessageSeverity()))
                 .build();
     };
 

waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowDao.java

@@ -80,6 +80,7 @@ public class PhysicalFlowDao {
         PhysicalFlowRecord record = r.into(PHYSICAL_FLOW);
         return ImmutablePhysicalFlow.builder()
                 .id(record.getId())
+                .name(record.getName())
                 .provenance(record.getProvenance())
                 .specificationId(record.getSpecificationId())
                 .basisOffset(record.getBasisOffset())
@@ -196,7 +197,12 @@ public List<PhysicalFlow> findBySelector(Select<Record1<Long>> selector) {
 
     public List<PhysicalFlow> findByAttributesAndSpecification(PhysicalFlow flow) {
 
+        Condition nameCondition = flow.name() == null
+                ? PHYSICAL_FLOW.NAME.isNull()
+                :PHYSICAL_FLOW.NAME.eq(flow.name());
+
         Condition sameFlow = PHYSICAL_FLOW.SPECIFICATION_ID.eq(flow.specificationId())
+                .and(nameCondition)
                 .and(PHYSICAL_FLOW.BASIS_OFFSET.eq(flow.basisOffset()))
                 .and(PHYSICAL_FLOW.FREQUENCY.eq(flow.frequency().value()))
                 .and(PHYSICAL_FLOW.TRANSPORT.eq(flow.transport().value()))
@@ -301,6 +307,7 @@ public long create(PhysicalFlow flow) {
         PhysicalFlowRecord record = dsl.newRecord(PHYSICAL_FLOW);
         record.setLogicalFlowId(flow.logicalFlowId());
 
+        record.setName(flow.name());
         record.setFrequency(flow.frequency().value());
         record.setTransport(flow.transport().value());
         record.setBasisOffset(flow.basisOffset());