From aff95a9f8c4f84e4e8c2e7a5ffdc328ce4d5aca4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sat, 2 Jul 2022 16:19:28 +0200
Subject: [PATCH] OZG-2566 OZG-2684 add Displaynames; reduce diff
---
.../wiedervorlage/WiedervorlageCommandController.java | 9 +++++----
.../attached_item/VorgangAttachedItemServiceTest.java | 6 ++++--
.../WiedervorlageCommandControllerTest.java | 8 ++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
index 1ac411298f..95eee8f642 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandController.java
@@ -36,7 +36,7 @@ public class WiedervorlageCommandController {
@PathVariable long wiedervorlageVersion) {
var commandWithUpdatedWiedervorlage = buildCommand(service.getById(wiedervorlageId), command, wiedervorlageVersion);
- var createdCommand = createByOrder(commandWithUpdatedWiedervorlage, command.getOrder(), wiedervorlageVersion);
+ var createdCommand = createByOrder(commandWithUpdatedWiedervorlage, command.getOrder());
service.updateNextFrist((Wiedervorlage) commandWithUpdatedWiedervorlage.getBody(), commandWithUpdatedWiedervorlage.getVorgangId());
@@ -62,11 +62,12 @@ public class WiedervorlageCommandController {
}
}
- Command createByOrder(CreateCommand command, CommandOrder commandOrder, long wiedervorlageVersion) {
+ Command createByOrder(CreateCommand command, CommandOrder commandOrder) {
if (shouldBeValidated(commandOrder)) {
- return service.editWiedervorlage((Wiedervorlage) command.getBody(), command.getRelationId(), wiedervorlageVersion);
+ return service.editWiedervorlage((Wiedervorlage) command.getBody(), command.getRelationId(), command.getRelationVersion());
} else {
- return commandByRelationController.createCommandWithoutValidation(command, WiedervorlageRemoteService.ITEM_NAME, wiedervorlageVersion);
+ return commandByRelationController.createCommandWithoutValidation(command, WiedervorlageRemoteService.ITEM_NAME,
+ command.getRelationVersion());
}
}
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
index bfe77f3719..81c082d760 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
@@ -35,7 +35,7 @@ class VorgangAttachedItemServiceTest {
@Mock
private CommandService commandService;
- @DisplayName("Build vorgang attached item")
+ @DisplayName("Create new wiedervorlage")
@Nested
class TestCreateNewWiedervorlage {
@@ -73,6 +73,7 @@ class VorgangAttachedItemServiceTest {
}
}
+ @DisplayName("Edit wiedervorlage")
@Nested
class TestEditWiedervorlage {
@@ -149,6 +150,7 @@ class VorgangAttachedItemServiceTest {
}
}
+ @DisplayName("Edit kommentar")
@Nested
class TestEditKommentar {
@@ -186,7 +188,7 @@ class VorgangAttachedItemServiceTest {
}
}
- @DisplayName("build createCommand")
+ @DisplayName("build vorgang attached item")
@Nested
class TestBuildVorgangAttachedItem {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
index 75b7428611..b6be6f0588 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageCommandControllerTest.java
@@ -63,7 +63,7 @@ class WiedervorlageCommandControllerTest {
@BeforeEach
void init() {
when(service.getById(any())).thenReturn(WiedervorlageTestFactory.create());
- doReturn(CommandTestFactory.create()).when(controller).createByOrder(any(), any(), anyLong());
+ doReturn(CommandTestFactory.create()).when(controller).createByOrder(any(), any());
}
@Test
@@ -77,7 +77,7 @@ class WiedervorlageCommandControllerTest {
void shouldCallCreateByOrderController() throws Exception {
doRequest();
- verify(controller).createByOrder(any(), any(), anyLong());
+ verify(controller).createByOrder(any(), any());
}
@Test
@@ -277,8 +277,8 @@ class WiedervorlageCommandControllerTest {
}
private Command createCommandByOrder(CommandOrder order) {
- return controller.createByOrder(CommandTestFactory.createCreateCommandBuilder().body(WiedervorlageTestFactory.create()).build(),
- order, WiedervorlageTestFactory.VERSION);
+ return controller.createByOrder(
+ CommandTestFactory.createCreateCommandBuilder().body(WiedervorlageTestFactory.create()).build(), order);
}
}
}
--
GitLab