Revert "feat: added display name column (#36)" (#37)

This reverts commit de8eb8a.
onecx · Mar 5, 2024 · 614a722 · 614a722
1 parent de8eb8a
commit 614a722
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 38 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
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
diff --git 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
@@ -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
@@ -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",