diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CreateCommand.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CreateCommand.java index 485e8e26cc20a8fc19b02b62f1741ebdf4929b3d..f30aa4a4fd334507e96106ddc13d6fd5080262fd 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CreateCommand.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CreateCommand.java @@ -1,11 +1,8 @@ package de.itvsh.goofy.common.command; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnore; import de.itvsh.goofy.common.user.UserId; -import de.itvsh.goofy.kommentar.Kommentar; import de.itvsh.goofy.vorgang.RedirectRequest; import de.itvsh.goofy.wiedervorlage.Wiedervorlage; import lombok.AccessLevel; @@ -28,12 +25,7 @@ public class CreateCommand { private String relationId; private CommandOrder order; - @Valid private Wiedervorlage body; - @Valid - private Kommentar kommentar; - - @Valid private RedirectRequest redirectRequest; } \ No newline at end of file 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 b370d702315d15951853bd3470551e172c8cf9ee..2c87c2302a64c08741293bc54aacf5ea4f0e2e85 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 @@ -1,5 +1,13 @@ package de.itvsh.goofy.kommentar; +import org.springframework.stereotype.Service; + +@Service public class KommentarRemoteService { - // TODO + + public KommentarCommand sendKommentarCommand(String id, KommentarCommand command) { + return null; + // TODO Auto-generated method stub + + } } 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 38d387f747288e5c8404ffeec9ed8726c70dd15e..3994153adf7cb5e394ae76fda4627e8e480e029f 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 @@ -27,8 +27,6 @@ class KommentarCommandControllerTest { @Captor private ArgumentCaptor<KommentarCommand> commandCaptor; - private MockMvc mockMvc; - @Nested class TestCreateKommentarCommandByVorgang { @@ -75,11 +73,4 @@ class KommentarCommandControllerTest { .andExpect(status().is2xxSuccessful()); } } - - ResultActions doRequest(String content) throws Exception { - return mockMvc.perform(post(KommentarCommandController.KOMMENTAR_COMMANDS, KommentarTestFactory.ID) - .content(content).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().is2xxSuccessful()); - } - } diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..828017422c52e5c2889d9a4bef3e4225d2d0540e --- /dev/null +++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java @@ -0,0 +1,42 @@ +package de.itvsh.goofy.kommentar; + +import static de.itvsh.goofy.common.command.CommandOrder.*; +import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +import org.junit.jupiter.api.Nested; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import de.itvsh.goofy.vorgang.VorgangHeaderTestFactory; + +public class KommentarServiceTest { + + @InjectMocks + private KommentarService service; + + @Mock + private KommentarRemoteService remoteService; + + @Nested + class TestCreateCreateCommand { + + void shouldCallRemoteService() { + KommentarCommand command = KommentarCommand.builder().order(CREATE_KOMMENTAR).build(); + + service.createCreateCommand(KommentarTestFactory.ID, command); + + verify(remoteService).sendKommentarCommand(VorgangHeaderTestFactory.ID, command); + } + + void shouldReturnResult() { + KommentarCommand result = KommentarCommand.builder().order(CREATE_KOMMENTAR).build(); + when(remoteService.sendKommentarCommand(anyString(), any())).thenReturn(result); + + KommentarCommand created = service.createCreateCommand(KommentarCommandTestFactory.ID, KommentarCommandTestFactory.create()); + + assertThat(created).isSameAs(result); + } + } +}