From 67f3d559549b1a6a2f97a5ef9137f5ac79d5d083 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 28 Jun 2022 10:11:41 +0200
Subject: [PATCH] OZG-2566 set vorgangId as relationId for create; set
resourceId as relationId for update
---
.../itvsh/goofy/kommentar/KommentarCommandController.java | 5 ++---
.../wiedervorlage/WiedervorlageCommandController.java | 2 +-
.../goofy/kommentar/KommentarCommandControllerTest.java | 8 +++++---
.../wiedervorlage/WiedervorlageCommandControllerTest.java | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
index b904066771..9abe64320c 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarCommandController.java
@@ -24,7 +24,6 @@ import de.itvsh.goofy.common.user.CurrentUserService;
public class KommentarCommandController {
static final String KOMMENTAR_COMMANDS = "/api/kommentars/{kommentarId}/commands";
- static final String NOT_SET = "-1";
@Autowired
private KommentarService service;
@@ -46,7 +45,7 @@ public class KommentarCommandController {
CreateCommand buildCommand(Kommentar kommentar, KommentarCommand command) {
var commandBuilder = CreateCommand.builder()
.order(CommandOrder.UPDATE_ATTACHED_ITEM)
- .relationId(NOT_SET)
+ .relationId(kommentar.getId())
.vorgangId(kommentar.getVorgangId());
return commandBuilder.body(updateKommandByCommand(kommentar, command)).build();
@@ -79,7 +78,7 @@ public class KommentarCommandController {
return CreateCommand.builder()
.vorgangId(vorgangId)
.order(CommandOrder.CREATE_ATTACHED_ITEM)
- .relationId(NOT_SET)
+ .relationId(vorgangId)
.body(buildBody(command.getKommentar()))
.build();
}
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 23a14b1b04..2121d9f584 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
@@ -47,7 +47,7 @@ public class WiedervorlageCommandController {
CreateCommand buildCommand(Wiedervorlage wiedervorlage, WiedervorlageCommand command) {
var commandBuilder = CreateCommand.builder()
.order(CommandOrder.UPDATE_ATTACHED_ITEM)
- .relationId(wiedervorlage.getVorgangId())
+ .relationId(wiedervorlage.getId())
.vorgangId(wiedervorlage.getVorgangId());
switch (command.getOrder()) {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
index 3eb84c3ec6..ce15b28615 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarCommandControllerTest.java
@@ -1,7 +1,6 @@
package de.itvsh.goofy.kommentar;
import static de.itvsh.goofy.kommentar.KommentarCommandTestFactory.*;
-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.*;
@@ -21,6 +20,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.command.CommandController.CommandByRelationController;
import de.itvsh.goofy.common.command.CommandOrder;
import de.itvsh.goofy.common.command.CommandTestFactory;
@@ -78,7 +79,7 @@ class KommentarCommandControllerTest {
assertThat(command).usingRecursiveComparison()
.ignoringFields("body", "status")
.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM)
- .relationId(KommentarCommandController.NOT_SET)
+ .relationId(VorgangHeaderTestFactory.ID)
.id(null).build());
}
@@ -132,7 +133,8 @@ class KommentarCommandControllerTest {
assertThat(command).usingRecursiveComparison()
.ignoringFields("body", "status")
.isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM)
- .relationId(KommentarCommandController.NOT_SET).id(null)
+ .relationId(KommentarTestFactory.ID)
+ .id(null)
.build());
}
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 fc18d02497..7ae31ed1e0 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
@@ -117,7 +117,7 @@ class WiedervorlageCommandControllerTest {
void shouldHaveRelationId() {
var command = callBuildCommand();
- assertThat(command.getRelationId()).isEqualTo(VorgangHeaderTestFactory.ID);
+ assertThat(command.getRelationId()).isEqualTo(WiedervorlageTestFactory.ID);
}
@Test
--
GitLab