From 1e688a389254ff1a338582ad7d46e5719d6700ae Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 19 Feb 2024 17:31:55 +0100
Subject: [PATCH] OZG-4713 OZG-4927 use command service for finding commands
---
.../historie/VorgangChangeHistoryService.java | 4 +++-
.../java/de/ozgcloud/alfa/common/TestUtils.java | 1 +
.../VorgangChangeHistoryServiceITCase.java | 5 +++--
.../historie/VorgangChangeHistoryServiceTest.java | 15 ++++++++++++---
4 files changed, 19 insertions(+), 6 deletions(-)
rename {alfa-xdomea => alfa-service}/src/test/java/de/ozgcloud/alfa/common/TestUtils.java (99%)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryService.java
index f855cc97a4..bcc71eaf47 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryService.java
@@ -7,6 +7,7 @@ import java.util.stream.Stream;
import org.springframework.stereotype.Service;
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.vorgang.Eingang;
import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
@@ -19,9 +20,10 @@ public class VorgangChangeHistoryService {
private final HistorieService historieService;
private final UserService userService;
+ private final CommandService commandService;
public VorgangChangeHistory createVorgangChangeHistory(VorgangWithEingang vorgang) {
- var commands = historieService.findFinishedCommands(vorgang.getId()).toList();
+ var commands = commandService.findFinishedCommands(vorgang.getId()).toList();
return VorgangChangeHistory.builder()
.statusChangeHistory(createStatusChangeHistory(vorgang, commands).toList())
.aktenzeichenChangeHistory(createAktenzeichenChangeHistory(vorgang, commands).toList())
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/TestUtils.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/TestUtils.java
similarity index 99%
rename from alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/TestUtils.java
rename to alfa-service/src/test/java/de/ozgcloud/alfa/common/TestUtils.java
index 098eb70e6f..14f1cb54f6 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/common/TestUtils.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/TestUtils.java
@@ -19,4 +19,5 @@ public class TestUtils {
when(mockStream.toList()).thenReturn(list);
mock.accept(mockStream);
}
+
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java
index 2d29753b49..c7adce6f28 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java
@@ -17,6 +17,7 @@ import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.alfa.common.command.Command;
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.user.UserId;
import de.ozgcloud.alfa.common.user.UserProfile;
@@ -45,7 +46,7 @@ public class VorgangChangeHistoryServiceITCase {
private final VorgangWithEingang vorgangWithEingang = VorgangWithEingangTestFactory.create();
@Mock
- private HistorieService historieService;
+ private CommandService commandService;
@Mock
private UserService userService;
@@ -226,7 +227,7 @@ public class VorgangChangeHistoryServiceITCase {
}
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() {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceTest.java
index 4e1d9d4dfd..f582a35ec8 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceTest.java
@@ -1,5 +1,6 @@
package de.ozgcloud.alfa.historie;
+import static de.ozgcloud.alfa.common.TestUtils.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -23,12 +24,12 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
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.UserProfile;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
import de.ozgcloud.alfa.common.user.UserService;
import de.ozgcloud.alfa.vorgang.EingangTestFactory;
-import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangWithEingang;
import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
import de.ozgcloud.alfa.vorgang.ZustaendigeStelleTestFactory;
@@ -56,6 +57,8 @@ public class VorgangChangeHistoryServiceTest {
private UserService userService;
@Mock
private HistorieService historieService;
+ @Mock
+ private CommandService commandService;
@Spy
@InjectMocks
@@ -63,11 +66,17 @@ public class VorgangChangeHistoryServiceTest {
@Nested
class TestCreateVorgangChangeHistory {
- private final Stream<Command> commandStream = commands.stream();
@BeforeEach
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
--
GitLab