Merge pull request #6970 from finos/revert-6947-revert-6946-logical-f…

…low-external-ID Revert "Revert "Logical flow external ID""
finos · Feb 1, 2024 · c1dd5e5 · c1dd5e5
2 parents f891a8a + f6095c4
commit c1dd5e5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java
@@ -109,6 +109,7 @@ public class LogicalFlowDao {
 
         return ImmutableLogicalFlow.builder()
                 .id(record.getId())
+                .externalId(Optional.ofNullable(record.getExternalId()))
                 .source(ImmutableEntityReference.builder()
                         .kind(EntityKind.valueOf(record.getSourceEntityKind()))
                         .id(record.getSourceEntityId())

diff --git a/waltz-model/src/main/java/org/finos/waltz/model/logical_flow/LogicalFlow.java b/waltz-model/src/main/java/org/finos/waltz/model/logical_flow/LogicalFlow.java
@@ -31,6 +31,7 @@ public abstract class LogicalFlow implements
         CreatedUserTimestampProvider,
         EntityLifecycleStatusProvider,
         IdProvider,
+        ExternalIdProvider,
         ProvenanceProvider,
         LastUpdatedProvider,
         LastAttestedProvider,

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.58.xml
@@ -0,0 +1,37 @@
+<!--
+  ~ 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
+  ~
+  -->
+<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"
+                   logicalFilePath="db.changelog-1.58.xml">
+    <changeSet id="v1-57-tag"
+               author="OscarGreen03">
+        <tagDatabase tag="v1.57"/> <!-- tag the current db version, i.e. the last  -->
+    </changeSet>
+
+    <changeSet id="20240119-6944-1"
+               author="OscarGreen03">
+        <comment>6944: add external_id to logical_flow table</comment>
+        <addColumn tableName="logical_flow">
+            <column name="external_id"
+                    type="${external-id.type}">
+                <constraints nullable="true" unique="true"/>
+            </column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-master.xml
@@ -201,4 +201,7 @@
     <include file="db.changelog-1.57.xml"
              relativeToChangelogFile="true"/>
 
+    <include file="db.changelog-1.58.xml"
+                relativeToChangelogFile="true"/>
+
 </databaseChangeLog>