From 682bd442e91cceab23dd6133019a3fd1697b9060 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 19 Feb 2024 12:27:20 +0100 Subject: [PATCH] OZG-4713 OZG-4926 Rename field VorgangChange.createdByName --- .../java/de/ozgcloud/alfa/historie/ChangeHistoryBuilder.java | 2 +- .../src/main/java/de/ozgcloud/alfa/historie/VorgangChange.java | 2 +- .../de/ozgcloud/alfa/historie/ChangeHistoryBuilderTest.java | 2 +- .../alfa/historie/VorgangChangeHistoryServiceITCase.java | 2 +- .../de/ozgcloud/alfa/historie/VorgangChangeTestFactory.java | 2 +- .../java/de/ozgcloud/alfa/historie/ExportHistorieService.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilder.java index c7c1aa820f..d41f7c5b46 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilder.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilder.java @@ -70,7 +70,7 @@ abstract class ChangeHistoryBuilder<T extends ChangeHistoryBuilder<T>> { return VorgangChange.builder() .valueBeforeChange(commandChangeValues.valueBeforeChange()) .valueAfterChange(commandChangeValues.valueAfterChange()) - .createdByName(getUserText(commandChangeValues.command().getCreatedByName())) + .authorFullName(getUserText(commandChangeValues.command().getCreatedByName())) .finishedAt(commandChangeValues.command().getFinishedAt()) .order(commandChangeValues.command().getOrder()) .build(); diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChange.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChange.java index ec6af20366..72bb89db85 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChange.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChange.java @@ -17,7 +17,7 @@ public class VorgangChange { private String valueBeforeChange; private String valueAfterChange; - private String createdByName; // TODO: authorFullName + private String authorFullName; private ZonedDateTime finishedAt; private CommandOrder order; private String organisationseinheitenId; diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilderTest.java index 535ed884a5..5311e96ac0 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilderTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/ChangeHistoryBuilderTest.java @@ -167,7 +167,7 @@ public class ChangeHistoryBuilderTest { void shouldSetCreatedByName() { var historieEntry = callBuilder(); - assertThat(historieEntry.getCreatedByName()).isEqualTo(USER_TEXT); + assertThat(historieEntry.getAuthorFullName()).isEqualTo(USER_TEXT); } @Test diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java index 91e9ecdbc1..bd30614f27 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java @@ -82,7 +82,7 @@ public class VorgangChangeHistoryServiceITCase { var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory(); - assertThat(history.get(0).getCreatedByName()).isEqualTo(userFullNameAndOrgaIDText(USER_1_FULL_NAME)); + assertThat(history.get(0).getAuthorFullName()).isEqualTo(userFullNameAndOrgaIDText(USER_1_FULL_NAME)); } @Test diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeTestFactory.java index c94cae7b27..293ee18876 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeTestFactory.java @@ -21,7 +21,7 @@ class VorgangChangeTestFactory { return VorgangChange.builder() .valueBeforeChange(VALUE_BEFORE_CHANGE) .valueAfterChange(VALUE_AFTER_CHANGE) - .createdByName(CREATED_BY_NAME) + .authorFullName(CREATED_BY_NAME) .finishedAt(FINISHED_AT) .order(ORDER) .organisationseinheitenId(ORGANISATIONSEINHEITEN_ID); diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/historie/ExportHistorieService.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/historie/ExportHistorieService.java index 00aad71b66..1f91af5e5f 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/historie/ExportHistorieService.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/historie/ExportHistorieService.java @@ -36,7 +36,7 @@ public class ExportHistorieService { } String createAkteur(VorgangChange vorgangChange) { - return vorgangChange.getCreatedByName() + "; " + vorgangChange.getOrganisationseinheitenId(); + return vorgangChange.getAuthorFullName() + "; " + vorgangChange.getOrganisationseinheitenId(); } } -- GitLab