From 84ae6dda0e2399e9715a305b2a275875f3177605 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 31 May 2022 15:26:38 +0200
Subject: [PATCH] =?UTF-8?q?OZG-1523=20Unn=C3=B6tiges=20mappen=20der=20voga?=
=?UTF-8?q?ngId=20bei=20Kommentar=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/de/itvsh/goofy/kommentar/KommentarMapper.java | 2 --
.../goofy/kommentar/KommentarCommandControllerTest.java | 2 +-
.../de/itvsh/goofy/kommentar/KommentarMapperTest.java | 8 --------
.../de/itvsh/goofy/kommentar/KommentarTestFactory.java | 9 ++-------
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
index b1d5c54549..c36561d38a 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarMapper.java
@@ -19,7 +19,6 @@ public interface KommentarMapper {
static final String TEXT = "text";
static final String CREATED_BY = "createdBy";
static final String CREATED_AT = "createdAt";
- static final String VORGANG_ID = "vorgangId";
@Mapping(target = "kommentar", ignore = true)
@ValueMapping(source = "UNRECOGNIZED", target = MappingConstants.NULL)
@@ -32,7 +31,6 @@ public interface KommentarMapper {
.createdAt(ZonedDateTime.parse((String) map.get(CREATED_AT)))
.createdBy((String) map.get(CREATED_BY))
.text((String) map.get(TEXT))
- .vorgangId((String) map.get(VORGANG_ID))
.build();
}
}
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 6ca93ba55d..3eb84c3ec6 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
@@ -107,7 +107,7 @@ class KommentarCommandControllerTest {
void init() {
mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
when(commandByRelationController.createCommand(any(), anyString())).thenReturn(CommandTestFactory.create());
- when(service.getById(any())).thenReturn(KommentarTestFactory.create());
+ when(service.getById(any())).thenReturn(KommentarTestFactory.createBuilder().vorgangId(VorgangHeaderTestFactory.ID).build());
}
@Test
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
index e05a9316e3..74380e47bb 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarMapperTest.java
@@ -39,14 +39,6 @@ class KommentarMapperTest {
assertThat(kommentar.getText()).isEqualTo(KommentarTestFactory.TEXT);
}
-
- @Test
- void shouldMapVorgangID() {
- var kommentar = map();
-
- assertThat(kommentar.getVorgangId()).isEqualTo(KommentarTestFactory.VORGANG_ID);
- }
-
}
private Kommentar map() {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
index f6ab98bee6..99abb0b24b 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarTestFactory.java
@@ -8,7 +8,6 @@ import com.thedeanda.lorem.Lorem;
import com.thedeanda.lorem.LoremIpsum;
import de.itvsh.goofy.common.user.UserProfileTestFactory;
-import de.itvsh.goofy.vorgang.VorgangHeaderTestFactory;
public class KommentarTestFactory {
@@ -22,8 +21,6 @@ public class KommentarTestFactory {
public static final String TEXT = lorem.getWords(15);
- public static final String VORGANG_ID = VorgangHeaderTestFactory.ID;
-
public static Kommentar create() {
return createBuilder().build();
}
@@ -33,8 +30,7 @@ public class KommentarTestFactory {
.id(ID)
.text(TEXT)
.createdBy(CREATED_BY)
- .createdAt(CREATED_AT)
- .vorgangId(VORGANG_ID);
+ .createdAt(CREATED_AT);
}
public static Map<String, Object> createAsMap() {
@@ -42,7 +38,6 @@ public class KommentarTestFactory {
KommentarMapper.ID, ID,
KommentarMapper.TEXT, TEXT,
KommentarMapper.CREATED_BY, CREATED_BY,
- KommentarMapper.CREATED_AT, CREATED_AT_STR,
- KommentarMapper.VORGANG_ID, VORGANG_ID);
+ KommentarMapper.CREATED_AT, CREATED_AT_STR);
}
}
--
GitLab