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 b1d5c54549e867917b067088d459eb692111d467..c36561d38afa4080e10c69b1782aa37e57095400 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 6ca93ba55d4887fd639f819b0b17f998169cc223..3eb84c3ec6ae60f487ba067875086369004b81bc 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 e05a9316e3a549b332ad81d99d6239e6391574ec..74380e47bbbb5e6315f72c9cac7853d6aaf961a2 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 f6ab98bee651161b94edd7f48311cea1e66ce0cb..99abb0b24b22ca5ab6743ae4de507409dfdf0995 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); } }