From b990d913228c1b4ef4577df66696e94342cb74fa Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 28 Jun 2022 10:05:26 +0200
Subject: [PATCH] OZG-2566 set vorgangId as relationId for update wiedervorlage
commands
---
.../goofy/wiedervorlage/WiedervorlageCommandController.java | 3 +--
.../wiedervorlage/WiedervorlageCommandControllerTest.java | 5 +++--
2 files changed, 4 insertions(+), 4 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 e6270b5ad8..23a14b1b04 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
@@ -26,7 +26,6 @@ import de.itvsh.goofy.common.user.CurrentUserService;
public class WiedervorlageCommandController {
static final String WIEDERVORLAGE_COMMANDS = "/api/wiedervorlages/{wiedervorlageId}/commands";
- static final String NOT_SET = "-1";
@Autowired
private CommandByRelationController commandByRelationController;
@@ -48,7 +47,7 @@ public class WiedervorlageCommandController {
CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) {
var commandBuilder = CreateCommand.builder()
.order(CommandOrder.UPDATE_ATTACHED_ITEM)
- .relationId(NOT_SET)
+ .relationId(wiedervorlage.getVorgangId())
.vorgangId(wiedervorlage.getVorgangId());
switch (command.getOrder()) {
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 3e1834ad47..fc18d02497 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
@@ -1,6 +1,5 @@
package de.itvsh.goofy.wiedervorlage;
-import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -20,6 +19,8 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import static org.assertj.core.api.Assertions.*;
+
import de.itvsh.goofy.common.binaryfile.BinaryFileTestFactory;
import de.itvsh.goofy.common.command.Command;
import de.itvsh.goofy.common.command.CommandController.CommandByRelationController;
@@ -116,7 +117,7 @@ class WiedervorlageCommandControllerTest {
void shouldHaveRelationId() {
var command = callBuildCommand();
- assertThat(command.getRelationId()).isEqualTo(WiedervorlageCommandController.NOT_SET);
+ assertThat(command.getRelationId()).isEqualTo(VorgangHeaderTestFactory.ID);
}
@Test
--
GitLab