diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java index 2a0ef1d712c323deabf840b5beaec6fe2b3cf2fe..ad32f9c4794525c36f50f6d5ab79d82d3de45e99 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java @@ -87,7 +87,7 @@ public class CommandController { command = prepareCommandForPostfachNachricht(command, vorgangId); } - var created = service.createCommandWithValidation(command, relationVersion); + var created = service.createCommand(command, relationVersion); return ResponseEntity.created(linkTo(CommandController.class).slash(created.getId()).toUri()).build(); } @@ -118,12 +118,10 @@ public class CommandController { return vorgangController.getVorgang(vorgangId); } - // Anlegen eines Commands fuer eine neue PostfachNachricht(resend) public Command createCommandWithoutRelation(CreateCommand command) { return service.createCommandWithoutRelation(command); } - // Anlegen eines Commands fuer das erledigen/wiedereroeffnen einer Wiedervorlage public Command createCommandWithoutValidation(CreateCommand command, String itemName, long relationVersion) { return service.createCommandWithoutValidation(command, itemName, relationVersion); } diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java index d03745acf951e13343189d9b51f126def5b3ab07..a70772101744018f0ec92d7669ae7b1334fe2ffd 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandService.java @@ -26,26 +26,18 @@ public class CommandService { return remoteService.createCommand(command); } - public Command createCommand(CreateCommand command, long relationVersion) { + public Command createCommand(@Valid CreateCommand command, long relationVersion) { command = command.toBuilder().relationVersion(relationVersion).build(); return remoteService.createCommand(command); } - public Command createCommandWithValidation(@Valid CreateCommand command, long relationVersion) { - command = command.toBuilder().relationVersion(relationVersion).build(); - - return remoteService.createCommand(command); - } - - // Anlegen eines Commands fuer eine neue PostfachNachricht(resend) public Command createCommandWithoutRelation(CreateCommand command) { command = command.toBuilder().relationVersion(NO_RELATION_VERSION).build(); return remoteService.createCommand(command); } - // Anlegen eines Commands fuer das erledigen/wiedereroeffnen einer Wiedervorlage public Command createCommandWithoutValidation(CreateCommand command, String itemName, long relationVersion) { command = command.toBuilder().relationVersion(relationVersion).build(); diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java index 8d5174380b36d224183c36ba685cb0de7d246f71..a920b70120ac24cb3e397292a8ea963d49200f03 100644 --- a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java +++ b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandControllerTest.java @@ -146,7 +146,7 @@ class CommandControllerTest { @BeforeEach void initTest() { - when(service.createCommandWithValidation(any(CreateCommand.class), anyLong())).thenReturn(CommandTestFactory.create()); + when(service.createCommand(any(CreateCommand.class), anyLong())).thenReturn(CommandTestFactory.create()); } @DisplayName("should return CREATED") @@ -160,7 +160,7 @@ class CommandControllerTest { void callService() throws Exception { doRequest(); - verify(service).createCommandWithValidation(createCommandCaptor.capture(), eq(CommandTestFactory.RELATION_VERSION)); + verify(service).createCommand(createCommandCaptor.capture(), eq(CommandTestFactory.RELATION_VERSION)); assertThat(createCommandCaptor.getValue().getOrder()).isEqualTo(CommandTestFactory.ORDER); assertThat(createCommandCaptor.getValue().getVorgangId()).isEqualTo(CommandTestFactory.VORGANG_ID); assertThat(createCommandCaptor.getValue().getRelationId()).isEqualTo(CommandTestFactory.RELATION_ID); diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java index b29a56f6e78c7c7e004014286877e55f1173dd1b..4c49293df735c22d7bb628daa17870c1285aa927 100644 --- a/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java +++ b/goofy-server/src/test/java/de/itvsh/goofy/common/command/CommandServiceTest.java @@ -67,25 +67,6 @@ class CommandServiceTest { } } - @Nested - class TestWithValidation { - - @Test - void shouldCallRemoteService() { - service.createCommandWithValidation(command, CommandTestFactory.RELATION_VERSION); - - verify(remoteService).createCommand(any(CreateCommand.class)); - } - - @Test - void shouldHaveSetRelationVersion() { - service.createCommandWithValidation(command, CommandTestFactory.RELATION_VERSION); - - verify(remoteService).createCommand(createCommandCaptor.capture()); - assertThat(createCommandCaptor.getValue().getRelationVersion()).isEqualTo(CommandTestFactory.RELATION_VERSION); - } - } - @Nested class TestWithoutRelationVersion {