DDL small changes

- remove approval_status from licence table - add unique idx to cost table - entity ref, kind and year - increase size of inclusion_predicate col on survey_instance table
finos · Dec 7, 2023 · 450a57d · 450a57d
1 parent 9076aec
commit 450a57d
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 35 deletions.
diff --git a/.../src/main/java/org/finos/waltz/jobs/tools/importers/licence/spdx/SpdxLicenceImporter.java b/.../src/main/java/org/finos/waltz/jobs/tools/importers/licence/spdx/SpdxLicenceImporter.java
@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.finos.waltz.common.DateTimeUtilities;
 import org.finos.waltz.data.licence.LicenceDao;
-import org.finos.waltz.model.ApprovalStatus;
 import org.finos.waltz.model.EntityKind;
 import org.finos.waltz.schema.tables.records.BookmarkRecord;
 import org.finos.waltz.schema.tables.records.LicenceRecord;
@@ -101,7 +100,6 @@ private void importData(String path) throws IOException, URISyntaxException {
                     record.setName(l.name());
                     record.setExternalId(l.licenseId());
                     record.setProvenance(PROVENANCE);
-                    record.setApprovalStatus(ApprovalStatus.PENDING_APPROVAL.name());
                     record.setCreatedAt(now);
                     record.setCreatedBy("admin");
                     record.setLastUpdatedAt(now);

diff --git a/waltz-model/src/main/java/org/finos/waltz/model/ApprovalStatus.java b/waltz-model/src/main/java/org/finos/waltz/model/ApprovalStatus.java
diff --git a/waltz-ng/client/technology/components/group-technology-summary.js b/waltz-ng/client/technology/components/group-technology-summary.js
@@ -39,8 +39,7 @@ const initialState = {
     environmentDescription: "",
     licenseGridCols:  [
         mkLinkGridCell("Name", "name", "id", "main.licence.view"),
-        {field: "externalId", displayName: "External Id"},
-        {field: "approvalStatus", displayName: "Approval Status", cellFilter: "toDisplayName:'ApprovalStatus'"},
+        {field: "externalId", displayName: "External Id"}
     ],
     visibility: {
         servers: false,

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.57.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.57.xml
@@ -25,4 +25,27 @@
         <tagDatabase tag="v1.56"/> <!-- tag the current db version, i.e. the last  -->
     </changeSet>
 
+    <changeSet id="20231207-6033-1"
+               author="woodjes">
+        <comment>6033: increase survey predicate column size</comment>
+        <modifyDataType columnName="inclusion_predicate"
+                        newDataType="${long-expression.type}"
+                        tableName="survey_question" />
+    </changeSet>
+
+    <changeSet id="20231207-5254-1"
+               author="woodjes">
+        <comment>5254: add unique constraint to cost on entity, type and year</comment>
+        <addUniqueConstraint columnNames="cost_kind_id, entity_kind, entity_id, year"
+                             constraintName="idx_cost_entity_year_kind_unique"
+                             tableName="cost"/>
+    </changeSet>
+
+    <changeSet id="20231207-6825-1"
+               author="woodjes">
+        <comment>6825: remove approval_status field from licence</comment>
+        <dropColumn tableName="licence"
+                    columnName="approval_status" />
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/waltz-schema/src/main/resources/liquibase/db.properties.xml b/waltz-schema/src/main/resources/liquibase/db.properties.xml
@@ -94,6 +94,7 @@
     <property name="email.type" value="VARCHAR(255)"></property>
     <property name="enum.type" value="VARCHAR(64)"></property>
     <property name="expression.type" value="VARCHAR(500)"></property>
+    <property name="long-expression.type" value="${longvarchar.type}"></property>
     <property name="external-id.type" value="VARCHAR(200)"></property>
     <property name="group.type" value="VARCHAR(128)"></property>
     <property name="guid.type" value="VARCHAR(64)"></property>

diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LicencesExtractor.java
@@ -24,6 +24,7 @@
 import org.finos.waltz.web.WebUtilities;
 import org.jooq.DSLContext;
 import org.jooq.Record1;
+import org.jooq.Record7;
 import org.jooq.Record8;
 import org.jooq.Select;
 import org.jooq.SelectConditionStep;
@@ -61,13 +62,12 @@ public void register() {
             IdSelectionOptions selectionOptions = mkOpts(entityRef);
             Select<Record1<Long>> appIdSelector = applicationIdSelectorFactory.apply(selectionOptions);
 
-            SelectConditionStep<Record8<Long, String, String, String, String, Timestamp, String, String>> qry = dsl
+            SelectConditionStep<Record7<Long, String, String, String, Timestamp, String, String>> qry = dsl
                     .selectDistinct(
                             LICENCE.ID.as("Licence Id"),
                             LICENCE.NAME.as("Licence Name"),
                             LICENCE.DESCRIPTION.as("Description"),
                             LICENCE.EXTERNAL_ID.as("External Id"),
-                            LICENCE.APPROVAL_STATUS.as("Approval Status"),
                             LICENCE.LAST_UPDATED_AT.as("Last Updated At"),
                             LICENCE.LAST_UPDATED_BY.as("Last Updated By"),
                             LICENCE.PROVENANCE.as("Provenance"))