Merge pull request #7323 from deutschebank/db-contrib/waltz-7322-merge-issue-resolution

jain-shreyans-db · web-flow · commit 9c230f502834 · 2025-07-31T13:33:15.000+05:30
Db contrib/waltz 7322 merge issue resolution
diff --git a/.github/ISSUE_TEMPLATE/Meeting.md b/.github/ISSUE_TEMPLATE/Meeting.md
@@ -8,11 +8,11 @@ Monday DD MMM yyyy - 8am EST / 1pm UK
 Occurs the second Monday of every month 
 
 ## Zoom 
-Join Zoom Meeting
-https://zoom.us/j/98495304665
+[Join Zoom Meeting](
+https://zoom-lfx.platform.linuxfoundation.org/meeting/96950469863?password=a4229b81-221e-4262-8d22-f7ba73ca007f)
 
-Meeting ID: 984 9530 4665
-Passcode: 202795
+
+Register for the meeting [here](https://zoom-lfx.platform.linuxfoundation.org/meeting/96950469863?password=a4229b81-221e-4262-8d22-f7ba73ca007f&invite=true)
 
 Find your local number: https://zoom.us/u/aeyTu3Q7E8
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,8 +9,10 @@ services:
       - postgres
 
   postgres:
-    image: postgres:11
+    image: postgres:16
     environment:
       POSTGRES_USER: waltz
       POSTGRES_DB: waltz
       POSTGRES_PASSWORD: waltz
+    ports:
+      - 5432:5432
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>org.finos</groupId>
     <artifactId>waltz</artifactId>
-    <version>1.72-SNAPSHOT</version>
+    <version>1.73.0-SNAPSHOT</version>
     <modules>
         <module>waltz-common</module>
         <module>waltz-model</module>
@@ -99,6 +99,7 @@
         <pcollections.version>4.0.1</pcollections.version>
         <poi.version>5.2.4</poi.version>
         <slf4j.version>2.0.7</slf4j.version>
+        <snakeyaml.version>1.33</snakeyaml.version>
         <spark.version>2.9.1</spark.version> <!-- 2.9.3 causes issues with tomcat -->
         <spark-freemarker.version>2.7.1</spark-freemarker.version>
         <spring.version>5.3.30</spring.version>
@@ -109,7 +110,7 @@
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <playwright.skip>true</playwright.skip>
-        <jetty.version>9.4.55.v20240627</jetty.version>
+        <jetty.version>9.4.57.v20241219</jetty.version>
     </properties>
 
 
@@ -321,6 +322,11 @@
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
+                        <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
 
 
             <!-- test -->
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.72-SNAPSHOT</version>
+        <version>1.73.0-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.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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.72-SNAPSHOT</version>
+        <version>1.73.0-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.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -71,6 +71,11 @@
             <version>${poi.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-jexl3</artifactId>
diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/PhysicalFlowGenerator.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/generators/PhysicalFlowGenerator.java
@@ -93,6 +93,7 @@ private static List<PhysicalFlowRecord> mkPhysicalFlowRecords(PhysicalSpecificat
                     record.setLastUpdatedBy("admin");
                     record.setCreatedBy("admin");
                     record.setCreatedAt(nowUtcTimestamp());
+                    record.setName(String.format("Physical Flow: Spec: [%s], Logical Flow: [%s]", spec.name(), logicalFlowId));
                     return record;
                 })
                 .collect(Collectors.toList());
diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/importers/licence/finos/FinosLicenceComplianceImporter.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/tools/importers/licence/finos/FinosLicenceComplianceImporter.java
@@ -319,6 +319,7 @@ private List<LicenceCompliance> parseData(String directoryPath) throws IOExcepti
 
     private Optional<LicenceCompliance> parseCompliance(Path path) {
         try {
+            System.out.println("Parsing: " + path);
             LicenceCompliance compliance = getYamlMapper().readValue(path.toFile(), LicenceCompliance.class);
             return Optional.of(compliance);
         } catch (IOException e) {
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.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-ng/client/measurable-rating/components/panel/measurable-rating-panel.html b/waltz-ng/client/measurable-rating/components/panel/measurable-rating-panel.html
@@ -109,6 +109,22 @@
                 <div class="waltz-visibility-parent"
                      ng-if="$ctrl.selected.rating">
                     <hr>
+                    <div class="row">
+                        <div class="col-sm-3 waltz-display-field-label">
+                            Primary:
+                        </div>
+                        <div class="col-sm-9">
+                            <waltz-toggle 
+                                icon-on="star"
+                                state="$ctrl.selected.rating.isPrimary"
+                                icon-off="star-o"
+                                label-on="Primary"
+                                label-off="Not Primary"
+                                read-only="true"
+                            >
+                            </waltz-toggle>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-sm-3 waltz-display-field-label">
                             Rating:
diff --git a/waltz-ng/package.json b/waltz-ng/package.json
@@ -1,6 +1,6 @@
 {
     "name": "waltz-ng",
-    "version": "1.72.0",
+    "version": "1.73.0",
     "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.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.73.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.73.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ 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.73.xml">
+
+    <changeSet id="v1-72-tag"
+               author="patidev">
+        <tagDatabase tag="v1.72"/> <!-- tag the current db version, i.e. the last  -->
+    </changeSet>
+
+    <!--  Adding index to hierarchy table -->
+
+    <changeSet author="jindkul"
+               id="20250708-4213-1">
+        <createIndex indexName="id_idx"
+                     tableName="entity_hierarchy">
+            <column name="id"/>
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="jindkul"
+               id="20250708-4213-2">
+        <createIndex indexName="level_idx"
+                     tableName="entity_hierarchy">
+            <column name="level"/>
+        </createIndex>
+    </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
@@ -245,4 +245,8 @@
 
     <include file="db.changelog-1.72.xml"
              relativeToChangelogFile="true"/>
+
+    <include file="db.changelog-1.73.xml"
+             relativeToChangelogFile="true"/>
+
 </databaseChangeLog>
diff --git a/waltz-service/pom.xml b/waltz-service/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-test-common/pom.xml b/waltz-test-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/waltz-web/pom.xml b/waltz-web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>waltz</artifactId>
         <groupId>org.finos</groupId>
-        <version>1.72-SNAPSHOT</version>
+        <version>1.73.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>waltz-web</artifactId>
