Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat: added display name column" #37

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Revert "feat: added display name column" #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/org/tkit/onecx/workspace/domain/models/Product.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/tkit/onecx/workspace/rs/internal/mappers/ProductMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions src/main/openapi/di-workspace-v1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ components:
properties:
productName:
type: string
displayName:
type: string
baseUrl:
type: string
microfrontends:
Expand Down
6 changes: 0 additions & 6 deletions src/main/openapi/onecx-workspace-internal-openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,8 +746,6 @@ components:
type: string
productName:
type: string
displayName:
type: string
baseUrl:
type: string
RoleSearchCriteria:
Expand Down Expand Up @@ -1385,8 +1383,6 @@ components:
type: string
productName:
type: string
displayName:
type: string
baseUrl:
type: string
microfrontends:
Expand Down Expand Up @@ -1446,8 +1442,6 @@ components:
type: string
productName:
type: string
displayName:
type: string
baseUrl:
type: string
microfrontends:
Expand Down
2 changes: 0 additions & 2 deletions src/main/openapi/onecx-workspace-v1-openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ components:
properties:
productName:
type: string
displayName:
type: string
baseUrl:
type: string
microfrontends:
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/db/changeLog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 0 additions & 15 deletions src/main/resources/db/v1/2024-03-05-add-product-display-name.xml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/resources/data/testdata-external.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions src/test/resources/data/testdata-internal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 0 additions & 2 deletions src/test/resources/import/workspace-import.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@
{
"baseUrl" : "/core",
"productName": "onecx-core",
"displayName": "onecx-core",
"microfrontends": [
{
"mfeId": "menu",
Expand Down Expand Up @@ -443,7 +442,6 @@
{
"baseUrl" : "/core",
"productName": "onecx-core",
"displayName": "onecx-core",
"microfrontends": [
{
"mfeId": "menu",
Expand Down
Loading