Skip to content
Snippets Groups Projects
Commit 1e688a38 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4713 OZG-4927 use command service for finding commands

parent cf2f43b3
Branches
Tags
No related merge requests found
...@@ -7,6 +7,7 @@ import java.util.stream.Stream; ...@@ -7,6 +7,7 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import de.ozgcloud.alfa.common.command.Command; import de.ozgcloud.alfa.common.command.Command;
import de.ozgcloud.alfa.common.command.CommandService;
import de.ozgcloud.alfa.common.user.UserService; import de.ozgcloud.alfa.common.user.UserService;
import de.ozgcloud.alfa.vorgang.Eingang; import de.ozgcloud.alfa.vorgang.Eingang;
import de.ozgcloud.alfa.vorgang.VorgangWithEingang; import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
...@@ -19,9 +20,10 @@ public class VorgangChangeHistoryService { ...@@ -19,9 +20,10 @@ public class VorgangChangeHistoryService {
private final HistorieService historieService; private final HistorieService historieService;
private final UserService userService; private final UserService userService;
private final CommandService commandService;
public VorgangChangeHistory createVorgangChangeHistory(VorgangWithEingang vorgang) { public VorgangChangeHistory createVorgangChangeHistory(VorgangWithEingang vorgang) {
var commands = historieService.findFinishedCommands(vorgang.getId()).toList(); var commands = commandService.findFinishedCommands(vorgang.getId()).toList();
return VorgangChangeHistory.builder() return VorgangChangeHistory.builder()
.statusChangeHistory(createStatusChangeHistory(vorgang, commands).toList()) .statusChangeHistory(createStatusChangeHistory(vorgang, commands).toList())
.aktenzeichenChangeHistory(createAktenzeichenChangeHistory(vorgang, commands).toList()) .aktenzeichenChangeHistory(createAktenzeichenChangeHistory(vorgang, commands).toList())
......
...@@ -19,4 +19,5 @@ public class TestUtils { ...@@ -19,4 +19,5 @@ public class TestUtils {
when(mockStream.toList()).thenReturn(list); when(mockStream.toList()).thenReturn(list);
mock.accept(mockStream); mock.accept(mockStream);
} }
} }
...@@ -17,6 +17,7 @@ import com.thedeanda.lorem.LoremIpsum; ...@@ -17,6 +17,7 @@ import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.alfa.common.command.Command; import de.ozgcloud.alfa.common.command.Command;
import de.ozgcloud.alfa.common.command.CommandOrder; import de.ozgcloud.alfa.common.command.CommandOrder;
import de.ozgcloud.alfa.common.command.CommandService;
import de.ozgcloud.alfa.common.command.CommandTestFactory; import de.ozgcloud.alfa.common.command.CommandTestFactory;
import de.ozgcloud.alfa.common.user.UserId; import de.ozgcloud.alfa.common.user.UserId;
import de.ozgcloud.alfa.common.user.UserProfile; import de.ozgcloud.alfa.common.user.UserProfile;
...@@ -45,7 +46,7 @@ public class VorgangChangeHistoryServiceITCase { ...@@ -45,7 +46,7 @@ public class VorgangChangeHistoryServiceITCase {
private final VorgangWithEingang vorgangWithEingang = VorgangWithEingangTestFactory.create(); private final VorgangWithEingang vorgangWithEingang = VorgangWithEingangTestFactory.create();
@Mock @Mock
private HistorieService historieService; private CommandService commandService;
@Mock @Mock
private UserService userService; private UserService userService;
...@@ -226,7 +227,7 @@ public class VorgangChangeHistoryServiceITCase { ...@@ -226,7 +227,7 @@ public class VorgangChangeHistoryServiceITCase {
} }
private void givenHistorieServiceReturnsCommands(List<Command> commands) { private void givenHistorieServiceReturnsCommands(List<Command> commands) {
when(historieService.findFinishedCommands(VorgangHeaderTestFactory.ID)).thenReturn(commands.stream()); when(commandService.findFinishedCommands(VorgangHeaderTestFactory.ID)).thenReturn(commands.stream());
} }
private void givenUserServiceReturnsUserProfiles() { private void givenUserServiceReturnsUserProfiles() {
......
package de.ozgcloud.alfa.historie; package de.ozgcloud.alfa.historie;
import static de.ozgcloud.alfa.common.TestUtils.*;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
...@@ -23,12 +24,12 @@ import org.mockito.Spy; ...@@ -23,12 +24,12 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum; import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.alfa.common.command.Command; import de.ozgcloud.alfa.common.command.Command;
import de.ozgcloud.alfa.common.command.CommandService;
import de.ozgcloud.alfa.common.user.UserId; import de.ozgcloud.alfa.common.user.UserId;
import de.ozgcloud.alfa.common.user.UserProfile; import de.ozgcloud.alfa.common.user.UserProfile;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory; import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
import de.ozgcloud.alfa.common.user.UserService; import de.ozgcloud.alfa.common.user.UserService;
import de.ozgcloud.alfa.vorgang.EingangTestFactory; import de.ozgcloud.alfa.vorgang.EingangTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangWithEingang; import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory; import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
import de.ozgcloud.alfa.vorgang.ZustaendigeStelleTestFactory; import de.ozgcloud.alfa.vorgang.ZustaendigeStelleTestFactory;
...@@ -56,6 +57,8 @@ public class VorgangChangeHistoryServiceTest { ...@@ -56,6 +57,8 @@ public class VorgangChangeHistoryServiceTest {
private UserService userService; private UserService userService;
@Mock @Mock
private HistorieService historieService; private HistorieService historieService;
@Mock
private CommandService commandService;
@Spy @Spy
@InjectMocks @InjectMocks
...@@ -63,11 +66,17 @@ public class VorgangChangeHistoryServiceTest { ...@@ -63,11 +66,17 @@ public class VorgangChangeHistoryServiceTest {
@Nested @Nested
class TestCreateVorgangChangeHistory { class TestCreateVorgangChangeHistory {
private final Stream<Command> commandStream = commands.stream();
@BeforeEach @BeforeEach
void init() { void init() {
when(historieService.findFinishedCommands(VorgangHeaderTestFactory.ID)).thenReturn(commandStream); mockStreamToList(commands, stream -> when(commandService.findFinishedCommands(vorgang.getId())).thenReturn(stream));
}
@Test
void shouldFindFinishedCommands() {
callService();
verify(commandService).findFinishedCommands(vorgang.getId());
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment