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 c7c1aa820fed706f2bf7a6daeffb7e3189469eab..d41f7c5b46016b949a6cebe49f9768d4794418ce 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 ec6af20366ab7eb6cdd87a9a91c91b616b4456c9..72bb89db8507dbef61c015a7af843d3bfdf63571 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 535ed884a55e1d74f3b2d2da0b754dbad7d7abf6..5311e96ac02659a7aa5c96efccbdf8e63d670865 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 91e9ecdbc1e20b9d5ff1ac8143e5b73f26ac7fa0..bd30614f272118f4d152b46726b7bf320a8838c9 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 c94cae7b2766f7b7fc3f099a49d2c50f2b40e519..293ee18876238b8867ec1413e026dabee509d3f7 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 00aad71b6635cfa85064d031fd2dbd2ea2a429bc..1f91af5e5f82dd4a5911d9a3fd757f5bd87c838b 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(); } }