diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilder.java
index db75ab13a8f3b04a378f95dc18768c7f9df5ebed..35d9f2883c2e69931e93e5014491d27c11fc5208 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilder.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilder.java
@@ -32,6 +32,7 @@ public class StatusChangeHistoryBuilder extends ChangeHistoryBuilder<StatusChang
CommandOrder.VORGANG_BESCHEIDEN,
CommandOrder.VORGANG_ABSCHLIESSEN,
CommandOrder.VORGANG_ZUM_LOESCHEN_MARKIEREN,
+ CommandOrder.VORGANG_WIEDEREROEFFNEN,
CommandOrder.VORGANG_LOESCHEN,
CommandOrder.VORGANG_ZURUECKSTELLEN);
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 f855cc97a4cfcadd6511c91ec289c383934830ef..bcc71eaf47a9f1d83bcd198df36b3dbe908587ed 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 098eb70e6f0fa46f2fff02c0cd9ab19f95ba0d17..14f1cb54f665838fdc1938fc5da84962ca16d1c8 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/StatusChangeHistoryBuilderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilderTest.java
index a1616f1a22a508790191315f61d77fbaa2f2b675..ddf9c1e21c5d2ed0d886ae48a21479264c72bbdc 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilderTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/StatusChangeHistoryBuilderTest.java
@@ -40,7 +40,8 @@ public class StatusChangeHistoryBuilderTest {
class TestIsRelevant {
@EnumSource(mode = Mode.INCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN",
- "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN" })
+ "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN",
+ "VORGANG_WIEDEREROEFFNEN" })
@ParameterizedTest
void shouldReturnTrue(CommandOrder order) {
var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build());
@@ -49,7 +50,8 @@ public class StatusChangeHistoryBuilderTest {
}
@EnumSource(mode = Mode.EXCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN",
- "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN" })
+ "VORGANG_BESCHEIDEN", "VORGANG_ABSCHLIESSEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN", "VORGANG_LOESCHEN", "VORGANG_ZURUECKSTELLEN",
+ "VORGANG_WIEDEREROEFFNEN" })
@ParameterizedTest
void shouldReturnFalse(CommandOrder order) {
var isStatusChangeCommand = builder.isRelevant(CommandTestFactory.createBuilder().order(order).build());
@@ -64,7 +66,8 @@ public class StatusChangeHistoryBuilderTest {
private static final String EXPECTED_STATUS_BEFORE_CHANGE = LoremIpsum.getInstance().getWords(2);
private static final String EXPECTED_STATUS_AFTER_CHANGE = LoremIpsum.getInstance().getWords(2);
- private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build();
+ private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
+ .previous(previousCommand).build();
@BeforeEach
void init() {
@@ -101,8 +104,10 @@ public class StatusChangeHistoryBuilderTest {
@Nested
class TestGetStatusBeforeChange {
- private final CommandWithPrevious commandWithoutPrevious = CommandWithPreviousTestFactory.createBuilder().command(previousCommand).previous(null).build();
- private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build();
+ private final CommandWithPrevious commandWithoutPrevious = CommandWithPreviousTestFactory.createBuilder().command(previousCommand)
+ .previous(null).build();
+ private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
+ .previous(previousCommand).build();
@Test
void shouldReturnStatusBeforeChange() {
@@ -125,7 +130,8 @@ public class StatusChangeHistoryBuilderTest {
@Nested
class TestGetStatusAfterChange {
- private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command).previous(previousCommand).build();
+ private final CommandWithPrevious commandWithPrevious = CommandWithPreviousTestFactory.createBuilder().command(command)
+ .previous(previousCommand).build();
@Test
void shouldReturnStatusAfterChange() {
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 2d29753b49568b416448a85371e608dd38b7e99c..c7adce6f28f185465b435fa45c0f9bbf55ddbb4b 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 4e1d9d4dfdc3639e69f7ea725d696aeaabf2d79d..f582a35ec8ec508c9219aa47705eed47070709a2 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