Skip to content
Snippets Groups Projects
Commit b990d913 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-2566 set vorgangId as relationId for update wiedervorlage commands

parent 08e99e7f
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,6 @@ import de.itvsh.goofy.common.user.CurrentUserService; ...@@ -26,7 +26,6 @@ import de.itvsh.goofy.common.user.CurrentUserService;
public class WiedervorlageCommandController { public class WiedervorlageCommandController {
static final String WIEDERVORLAGE_COMMANDS = "/api/wiedervorlages/{wiedervorlageId}/commands"; static final String WIEDERVORLAGE_COMMANDS = "/api/wiedervorlages/{wiedervorlageId}/commands";
static final String NOT_SET = "-1";
@Autowired @Autowired
private CommandByRelationController commandByRelationController; private CommandByRelationController commandByRelationController;
...@@ -48,7 +47,7 @@ public class WiedervorlageCommandController { ...@@ -48,7 +47,7 @@ public class WiedervorlageCommandController {
CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) { CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) {
var commandBuilder = CreateCommand.builder() var commandBuilder = CreateCommand.builder()
.order(CommandOrder.UPDATE_ATTACHED_ITEM) .order(CommandOrder.UPDATE_ATTACHED_ITEM)
.relationId(NOT_SET) .relationId(wiedervorlage.getVorgangId())
.vorgangId(wiedervorlage.getVorgangId()); .vorgangId(wiedervorlage.getVorgangId());
switch (command.getOrder()) { switch (command.getOrder()) {
......
package de.itvsh.goofy.wiedervorlage; package de.itvsh.goofy.wiedervorlage;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*; import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
...@@ -20,6 +19,8 @@ import org.springframework.test.web.servlet.MockMvc; ...@@ -20,6 +19,8 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders; 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.binaryfile.BinaryFileTestFactory;
import de.itvsh.goofy.common.command.Command; import de.itvsh.goofy.common.command.Command;
import de.itvsh.goofy.common.command.CommandController.CommandByRelationController; import de.itvsh.goofy.common.command.CommandController.CommandByRelationController;
...@@ -116,7 +117,7 @@ class WiedervorlageCommandControllerTest { ...@@ -116,7 +117,7 @@ class WiedervorlageCommandControllerTest {
void shouldHaveRelationId() { void shouldHaveRelationId() {
var command = callBuildCommand(); var command = callBuildCommand();
assertThat(command.getRelationId()).isEqualTo(WiedervorlageCommandController.NOT_SET); assertThat(command.getRelationId()).isEqualTo(VorgangHeaderTestFactory.ID);
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment