From 614a722e7604571111fdecf5cc4f421dd1b9dd50 Mon Sep 17 00:00:00 2001
From: Andrej Petras <andrej@lorislab.org>
Date: Tue, 5 Mar 2024 11:47:04 +0100
Subject: [PATCH] Revert "feat: added display name column (#36)" (#37)

This reverts commit de8eb8a5db1d8b49cfc6b062e71907d2aaf3ce56.
---
 .../onecx/workspace/domain/models/Product.java    |  3 ---
 .../rs/internal/mappers/ProductMapper.java        |  1 -
 src/main/openapi/di-workspace-v1.yaml             |  2 --
 .../openapi/onecx-workspace-internal-openapi.yaml |  6 ------
 src/main/openapi/onecx-workspace-v1-openapi.yaml  |  2 --
 src/main/resources/db/changeLog.xml               |  2 --
 .../db/v1/2024-03-05-add-product-display-name.xml | 15 ---------------
 src/test/resources/data/testdata-external.xml     |  6 +++---
 src/test/resources/data/testdata-internal.xml     |  4 ++--
 src/test/resources/import/workspace-import.json   |  2 --
 10 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/resources/db/v1/2024-03-05-add-product-display-name.xml

diff --git a/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java b/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java
index 10510b8..f16436b 100644
--- a/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java
+++ b/src/main/java/org/tkit/onecx/workspace/domain/models/Product.java
@@ -29,9 +29,6 @@ public class Product extends TraceableEntity {
     @Column(name = "PRODUCT_NAME")
     private String productName;
 
-    @Column(name = "DISPLAY_NAME")
-    private String displayName;
-
     @Column(name = "BASE_URL", unique = true)
     private String baseUrl;
 
diff --git a/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java b/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java
index 78ef3d2..39cd359 100644
--- a/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java
+++ b/src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java
@@ -44,7 +44,6 @@ default Product create(CreateProductRequestDTO dto, Workspace workspace) {
 
     @Mapping(target = "workspace", ignore = true)
     @Mapping(target = "productName", ignore = true)
-    @Mapping(target = "displayName", ignore = true)
     @Mapping(target = "persisted", ignore = true)
     @Mapping(target = "modificationUser", ignore = true)
     @Mapping(target = "modificationDate", ignore = true)
diff --git a/src/main/openapi/di-workspace-v1.yaml b/src/main/openapi/di-workspace-v1.yaml
index 1edcb56..547cf78 100644
--- a/src/main/openapi/di-workspace-v1.yaml
+++ b/src/main/openapi/di-workspace-v1.yaml
@@ -161,8 +161,6 @@ components:
       properties:
         productName:
           type: string
-        displayName:
-          type: string
         baseUrl:
           type: string
         microfrontends:
diff --git a/src/main/openapi/onecx-workspace-internal-openapi.yaml b/src/main/openapi/onecx-workspace-internal-openapi.yaml
index 84250a1..5c32fc1 100644
--- a/src/main/openapi/onecx-workspace-internal-openapi.yaml
+++ b/src/main/openapi/onecx-workspace-internal-openapi.yaml
@@ -746,8 +746,6 @@ components:
           type: string
         productName:
           type: string
-        displayName:
-          type: string
         baseUrl:
           type: string
     RoleSearchCriteria:
@@ -1385,8 +1383,6 @@ components:
           type: string
         productName:
           type: string
-        displayName:
-          type: string
         baseUrl:
           type: string
         microfrontends:
@@ -1446,8 +1442,6 @@ components:
           type: string
         productName:
           type: string
-        displayName:
-          type: string
         baseUrl:
           type: string
         microfrontends:
diff --git a/src/main/openapi/onecx-workspace-v1-openapi.yaml b/src/main/openapi/onecx-workspace-v1-openapi.yaml
index 5f1d667..6656e70 100644
--- a/src/main/openapi/onecx-workspace-v1-openapi.yaml
+++ b/src/main/openapi/onecx-workspace-v1-openapi.yaml
@@ -181,8 +181,6 @@ components:
       properties:
         productName:
           type: string
-        displayName:
-          type: string
         baseUrl:
           type: string
         microfrontends:
diff --git a/src/main/resources/db/changeLog.xml b/src/main/resources/db/changeLog.xml
index c830630..53b5b80 100644
--- a/src/main/resources/db/changeLog.xml
+++ b/src/main/resources/db/changeLog.xml
@@ -6,7 +6,5 @@
     <include relativeToChangelogFile="true" file="v1/2023-11-09-create-tables.xml"/>
     <include relativeToChangelogFile="true" file="v1/2023-11-09-data-import-log.xml"/>
     <include relativeToChangelogFile="true" file="v1/2024-02-22-create-table-image.xml"/>
-    <include relativeToChangelogFile="true" file="v1/2024-03-05-add-product-display-name.xml"/>
-
 
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml b/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml
deleted file mode 100644
index 239da87..0000000
--- a/src/main/resources/db/v1/2024-03-05-add-product-display-name.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-
-<databaseChangeLog
-        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"
-        objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
-
-    <changeSet author="dev (generated)" id="1701968331511-1">
-        <addColumn tableName="product">
-            <column name="display_name"
-                    type="varchar(255)"/>
-        </addColumn>
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/src/test/resources/data/testdata-external.xml b/src/test/resources/data/testdata-external.xml
index f727a03..a287363 100644
--- a/src/test/resources/data/testdata-external.xml
+++ b/src/test/resources/data/testdata-external.xml
@@ -15,8 +15,8 @@
 	<MENU_ITEM_I18N menuitem_guid="33-1" language="en" i18n="EN translation"  />
 
 	<!-- PRODUCT -->
-	<PRODUCT guid="1234" optlock="0" workspace_guid="11-111" product_name="onecx-core" display_name="onecx-core" base_url="/core" tenant_id="tenant-100"/>
-	<PRODUCT guid="5678" optlock="0" workspace_guid="11-222" product_name="onecx-core" display_name="onecx-core" base_url="/test" tenant_id="tenant-100"/>
-	<PRODUCT guid="1111" optlock="0" workspace_guid="11-111" product_name="onecx-apm" display_name="onecx-core" base_url="/apm" tenant_id="tenant-100"/>
+	<PRODUCT guid="1234" optlock="0" workspace_guid="11-111" product_name="onecx-core" base_url="/core" tenant_id="tenant-100"/>
+	<PRODUCT guid="5678" optlock="0" workspace_guid="11-222" product_name="onecx-core" base_url="/test" tenant_id="tenant-100"/>
+	<PRODUCT guid="1111" optlock="0" workspace_guid="11-111" product_name="onecx-apm" base_url="/apm" tenant_id="tenant-100"/>
 
 </dataset>
diff --git a/src/test/resources/data/testdata-internal.xml b/src/test/resources/data/testdata-internal.xml
index f5baa1c..f9c27de 100644
--- a/src/test/resources/data/testdata-internal.xml
+++ b/src/test/resources/data/testdata-internal.xml
@@ -49,8 +49,8 @@
 	<SUBJECT_LINK workspace_guid="11-111" link_label="lebel_2" link_url="url-2"/>
 
 	<!-- PRODUCT -->
-	<PRODUCT guid="1234" optlock="10" workspace_guid="11-111" product_name="onecx-core" display_name="onecx-core" base_url="/core" tenant_id="tenant-100"/>
-	<PRODUCT guid="5678" optlock="10" workspace_guid="11-111" product_name="onecx-apm" display_name="onecx-apm" base_url="/apm" tenant_id="tenant-100"/>
+	<PRODUCT guid="1234" optlock="10" workspace_guid="11-111" product_name="onecx-core" base_url="/core" tenant_id="tenant-100"/>
+	<PRODUCT guid="5678" optlock="10" workspace_guid="11-111" product_name="onecx-apm" base_url="/apm" tenant_id="tenant-100"/>
 
 	<!-- MICROFRONTEND -->
 	<MICROFRONTEND guid="1234" mfe_id="menu" base_path="/menu" product_guid="1234"/>
diff --git a/src/test/resources/import/workspace-import.json b/src/test/resources/import/workspace-import.json
index 05ed441..8664b92 100644
--- a/src/test/resources/import/workspace-import.json
+++ b/src/test/resources/import/workspace-import.json
@@ -375,7 +375,6 @@
           {
             "baseUrl" : "/core",
             "productName": "onecx-core",
-            "displayName": "onecx-core",
             "microfrontends": [
               {
                 "mfeId": "menu",
@@ -443,7 +442,6 @@
             {
               "baseUrl" : "/core",
               "productName": "onecx-core",
-              "displayName": "onecx-core",
               "microfrontends": [
                 {
                   "mfeId": "menu",