Merge pull request #7035 from deutschebank/db-contrib/waltz-7032-flow-classifications-add-directionality

davidwatkins73 · web-flow · commit c49a2c247211 · 2024-03-19T15:54:26.000Z
Db contrib/waltz 7032 flow classifications add directionality
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.58.2-SNAPSHOT</version>
+    <version>1.59-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>
diff --git a/waltz-common/pom.xml b/waltz-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-data/pom.xml b/waltz-data/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/JooqUtilities.java b/waltz-data/src/main/java/org/finos/waltz/data/JooqUtilities.java
@@ -40,6 +40,8 @@
 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;
@@ -538,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
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/flow_classification_rule/FlowClassificationDao.java b/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();
     };
 
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/flow_classification_rule/FlowClassificationRuleDao.java b/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();
     };
 
diff --git a/waltz-integration-test/pom.xml b/waltz-integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-jobs/pom.xml b/waltz-jobs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/waltz-model/pom.xml b/waltz-model/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-model/src/main/java/org/finos/waltz/model/flow_classification/FlowClassification.java b/waltz-model/src/main/java/org/finos/waltz/model/flow_classification/FlowClassification.java
@@ -17,6 +17,18 @@ public abstract class FlowClassification implements IdProvider, NameProvider, De
     public abstract boolean isCustom();
     public abstract boolean userSelectable();
 
+    @Value.Default
+    public FlowDirection direction() {
+        return FlowDirection.INBOUND;
+    }
+
+    @Nullable
+    public abstract String defaultMessage();
+
+    @Value.Default
+    public Severity messageSeverity() {
+        return Severity.INFORMATION;
+    }
     @Value.Default
     public EntityKind kind() {
         return EntityKind.FLOW_CLASSIFICATION_RULE;
diff --git a/waltz-model/src/main/java/org/finos/waltz/model/flow_classification_rule/FlowClassificationRule.java b/waltz-model/src/main/java/org/finos/waltz/model/flow_classification_rule/FlowClassificationRule.java
@@ -42,6 +42,7 @@ public abstract class FlowClassificationRule implements
 
     public abstract EntityReference vantagePointReference();
 
+    @Nullable
     public abstract Long dataTypeId();
 
     public abstract Long classificationId();
@@ -61,5 +62,13 @@ public boolean isReadonly() {
         return false;
     }
 
+    @Nullable
+    public abstract String message();
+
+    @Value.Default
+    public Severity messageSeverity() {
+        return Severity.INFORMATION;
+    }
+
 
 }
diff --git a/waltz-ng/client/common/services/enums/flow-direction.js b/waltz-ng/client/common/services/enums/flow-direction.js
@@ -0,0 +1,34 @@
+/*
+ * Waltz - Enterprise Architecture
+ * Copyright (C) 2016, 2017, 2018, 2019 Waltz open source project
+ * See README.md for more information
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific
+ *
+ */
+
+export const flowDirection = {
+    INBOUND: {
+        key: "INBOUND",
+        name: "Inbound",
+        icon: null,
+        description: null,
+        position: 10
+    },
+    OUTBOUND: {
+        key: "OUTBOUND",
+        name: "Outbound",
+        icon: null,
+        description: null,
+        position: 20
+    }
+};
diff --git a/waltz-ng/client/data-types/components/data-type-decorator-section/context-panel/FlowClassificationRuleViewTable.svelte b/waltz-ng/client/data-types/components/data-type-decorator-section/context-panel/FlowClassificationRuleViewTable.svelte
@@ -41,7 +41,11 @@
     <tr>
         <td>Data Type</td>
         <td>
-            <EntityLink ref={dataType}/>
+            {#if dataType}
+                <EntityLink ref={dataType}/>
+            {:else}
+                -
+            {/if}
         </td>
     </tr>
     <tr>
diff --git a/waltz-ng/client/flow-classification-rule/components/svelte/FlowClassificationRuleOverview.svelte b/waltz-ng/client/flow-classification-rule/components/svelte/FlowClassificationRuleOverview.svelte
@@ -16,6 +16,7 @@
     import {dynamicSections} from "../../../dynamic-section/dynamic-section-definitions";
     import Markdown from "../../../common/svelte/Markdown.svelte";
     import {primaryEntityReference} from "../../../assessments/components/rating-editor/rating-store";
+    import {flowDirection} from "../../../common/services/enums/flow-direction";
 
     export let primaryEntityRef;
 
@@ -27,8 +28,8 @@
 
     let datatypes = [];
     let datatypesById = {};
-    let datatype = null;
-    let datatypeName = null;
+    let dataType = null;
+    let dataTypeName = null;
     let rating = null;
 
     let datatypesCall = null;
@@ -46,8 +47,8 @@
     $: datatypes = $datatypesCall?.data || [];
 
     $: classificationsById = _.keyBy(classifications, d => d.id);
-    $: datatype = _.find(datatypes, dt => dt.id === classificationRule?.dataTypeId);
-    $: datatypeName = _.get(datatype, ["name"], "Unknown");
+    $: dataType = _.find(datatypes, dt => dt.id === classificationRule?.dataTypeId);
+    $: dataTypeName = _.get(dataType, ["name"], "Unknown");
     $: rating = _.get(classificationsById, [classificationRule?.classificationId], unknownRating);
 
     $: $primaryEntityReference = primaryEntityRef;
@@ -57,15 +58,21 @@
 {#if classificationRule}
     <PageHeader icon="shield"
                 name={`Flow Classification Rule: ${classificationRule?.subjectReference?.name}`}
-                small={datatypeName}>
+                small={dataTypeName}>
         <div slot="breadcrumbs">
             <ol class="waltz-breadcrumbs">
                 <li><ViewLink state="main">Home</ViewLink></li>
                 <li><ViewLink state="main.system.list">Flow Classification Rule</ViewLink></li>
                 <li>
                     <EntityLink ref={classificationRule?.subjectReference}/>
                 </li>
-                <li><EntityLink ref={datatype}/></li>
+                <li>
+                    {#if dataType}
+                        <EntityLink ref={dataType}/>
+                    {:else}
+                        -
+                    {/if}
+                </li>
             </ol>
         </div>
     </PageHeader>
@@ -89,7 +96,6 @@
                         </div>
                     </div>
 
-
                     <div class="row">
                         <div class="col-sm-4 waltz-display-field-label">
                             Rating Description:
@@ -99,6 +105,17 @@
                         </div>
                     </div>
 
+                    <div class="row">
+                        <div class="col-sm-4 waltz-display-field-label">
+                            Direction:
+                        </div>
+                        <div class="col-sm-8">
+                            <span>
+                                {_.get(flowDirection, [rating?.direction, "name"], "Unknown")}
+                            </span>
+                        </div>
+                    </div>
+
                     <div class="row">
                         <div class="col-sm-4 waltz-display-field-label">
                             Source Entity:
@@ -113,7 +130,11 @@
                             Datatype:
                         </div>
                         <div class="col-sm-8">
-                            <EntityLink ref={datatype}/>
+                            {#if dataType}
+                                <EntityLink ref={dataType}/>
+                            {:else}
+                                -
+                            {/if}
                         </div>
                     </div>
 
@@ -122,7 +143,7 @@
                             Datatype Description:
                         </div>
                         <div class="col-sm-8">
-                            {datatype?.description || "-"}
+                            {dataType?.description || "-"}
                         </div>
                     </div>
 
diff --git a/waltz-ng/package.json b/waltz-ng/package.json
@@ -1,6 +1,6 @@
 {
     "name": "waltz-ng",
-    "version": "1.58.2",
+    "version": "1.59",
     "description": "To start test server run: `npm run dev-server` and ensure java backend is running on 8443",
     "main": "client/main.js",
     "browserslist": [
diff --git a/waltz-schema/pom.xml b/waltz-schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.58.2-SNAPSHOT</version>
+        <version>1.59-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.59.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.59.xml
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml
diff --git a/waltz-service/pom.xml b/waltz-service/pom.xml
diff --git a/waltz-test-common/pom.xml b/waltz-test-common/pom.xml
diff --git a/waltz-web/pom.xml b/waltz-web/pom.xml
