From ca03bfe84946f3a2153ccfc7b8e4b6af941a239e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 31 May 2022 14:57:27 +0200
Subject: [PATCH] OZG-1523 Bearbeiten von Kommentaren gefixed
---
.../de/itvsh/goofy/kommentar/KommentarRemoteService.java | 6 +++---
.../goofy/kommentar/KommentarCommandControllerTest.java | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
index a4a1325bb1..11ee02a8f9 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarRemoteService.java
@@ -15,8 +15,8 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
class KommentarRemoteService {
+ static final String ITEM_NAME = "Kommentar";
- public static final String ITEM_NAME = "Kommentar";
@GrpcClient(GoofyServerApplication.GRPC_CLIENT)
private VorgangAttachedItemServiceBlockingStub vorgangAttachedItemServiceStub;
@Autowired
@@ -42,8 +42,8 @@ class KommentarRemoteService {
public Kommentar getById(String kommentarId) {
var response = vorgangAttachedItemServiceStub.getById(buildRequest(kommentarId));
-
- return mapper.fromItemMap(grpcObjectMapper.mapFromGrpc(response.getVorgangAttachedItem().getItem()));
+ var kommentar = mapper.fromItemMap(grpcObjectMapper.mapFromGrpc(response.getVorgangAttachedItem().getItem()));
+ return kommentar.toBuilder().vorgangId(response.getVorgangAttachedItem().getVorgangId()).build();
}
private GrpcVorgangAttachedItemRequest buildRequest(String kommentarId) {
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 7def511e8d..18b1a52310 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
@@ -77,7 +77,9 @@ class KommentarCommandControllerTest {
assertThat(command).usingRecursiveComparison()
.ignoringFields("body", "status")
- .isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM).relationId("-1").id(null).build());
+ .isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.CREATE_ATTACHED_ITEM)
+ .relationId(KommentarCommandController.NOT_SET)
+ .id(null).build());
}
private ResultActions doRequest() throws Exception {
@@ -129,7 +131,8 @@ class KommentarCommandControllerTest {
assertThat(command).usingRecursiveComparison()
.ignoringFields("body", "status")
- .isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM).relationId("-1").id(null).build());
+ .isEqualTo(CommandTestFactory.createBuilder().order(CommandOrder.UPDATE_ATTACHED_ITEM).relationId("-1").vorgangId("-1").id(null)
+ .build());
}
@Test
--
GitLab