OZG-4713 OZG-4926 Add some more integration tests

alfa-service/src/test/java/de/ozgcloud/alfa/historie/VorgangChangeHistoryServiceITCase.java

@@ -8,6 +8,7 @@ import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -64,7 +65,40 @@ public class VorgangChangeHistoryServiceITCase {
 	}
 
 	@Test
-	void shouldSetBeforeAndAfterValuesInStatusChangeHistory_untilAbgeschlossen() {
+	void shouldReturnNonEmptyHistories() {
+		givenHistorieServiceReturnsCommands(createMixedCommands());
+		givenUserServiceReturnsUser1Profile();
+
+		var history = service.createVorgangChangeHistory(vorgangWithEingang);
+
+		assertThat(history.getStatusChangeHistory()).hasSize(1);
+		assertThat(history.getAktenzeichenChangeHistory()).hasSize(1);
+		assertThat(history.getAssignedUserChangeHistory()).hasSize(1);
+	}
+
+	@Test
+	void shouldSetCreatedByName() {
+		givenHistorieServiceReturnsCommands(List.of(new CommandFactory().sc(CommandOrder.VORGANG_ANNEHMEN)));
+
+		var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
+
+		assertThat(history.get(0).getCreatedByName()).isEqualTo(userFullNameAndOrgaIDText(USER_1_FULL_NAME));
+	}
+
+	@Test
+	void shouldSetFinishedAt() {
+		var command = new CommandFactory().sc(CommandOrder.VORGANG_ANNEHMEN);
+		givenHistorieServiceReturnsCommands(List.of(command));
+
+		var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
+
+		assertThat(history.get(0).getFinishedAt()).isNotNull().isEqualTo(command.getFinishedAt());
+	}
+
+	@Nested
+	class TestStatusChangeHistory {
+		@Test
+		void shouldSetBeforeAndAfterValues_untilAbgeschlossen() {
 			givenHistorieServiceReturnsCommands(createStatusChangeCommandsUntilAbgeschlossen());
 
 			var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
@@ -79,7 +113,7 @@ public class VorgangChangeHistoryServiceITCase {
 		}
 
 		@Test
-	void shouldSetBeforeAndAfterValuesInStatusChangeHistory_untilVerworfen() {
+		void shouldSetBeforeAndAfterValues_untilVerworfen() {
 			givenHistorieServiceReturnsCommands(createStatusChangeCommandsUntilVerworfen());
 
 			var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
@@ -91,7 +125,7 @@ public class VorgangChangeHistoryServiceITCase {
 		}
 
 		@Test
-	void shouldSetBeforeAndAfterValuesInStatusChangeHistory_untilZurueckholen() {
+		void shouldSetBeforeAndAfterValues_untilZurueckholen() {
 			givenHistorieServiceReturnsCommands(createStatusChangeCommandsUntilZurueckholen());
 
 			var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
@@ -102,7 +136,21 @@ public class VorgangChangeHistoryServiceITCase {
 		}
 
 		@Test
-	void shouldSetBeforeAndAfterValuesInAktenzeichenChangeHistory() {
+		void shouldSetOrder() {
+			var command = new CommandFactory().sc(CommandOrder.VORGANG_ANNEHMEN);
+			givenHistorieServiceReturnsCommands(List.of(command));
+
+			var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
+
+			assertThat(history.get(0).getOrder()).isNotNull().isEqualTo(CommandOrder.VORGANG_ANNEHMEN);
+		}
+	}
+
+	@Nested
+	class TestAktenzeichenChangeHistory {
+
+		@Test
+		void shouldSetBeforeAndAfterValues() {
 			givenHistorieServiceReturnsCommands(createAktenzeichenChangeCommands());
 
 			var history = service.createVorgangChangeHistory(vorgangWithEingang).getAktenzeichenChangeHistory();
@@ -114,7 +162,21 @@ public class VorgangChangeHistoryServiceITCase {
 		}
 
 		@Test
-	void shouldSetBeforeAndAfterValuesInAssignedUserChangeHistory() {
+		void shouldSetOrder() {
+			var command = new CommandFactory().ac(AKTENZEICHEN_1);
+			givenHistorieServiceReturnsCommands(List.of(command));
+
+			var history = service.createVorgangChangeHistory(vorgangWithEingang).getAktenzeichenChangeHistory();
+
+			assertThat(history.get(0).getOrder()).isNotNull().isEqualTo(CommandOrder.SET_AKTENZEICHEN);
+		}
+	}
+
+	@Nested
+	class TestAssignedUserChangeHistory {
+
+		@Test
+		void shouldSetBeforeAndAfterValues() {
 			givenHistorieServiceReturnsCommands(createUserChangeCommands());
 			givenUserServiceReturnsUserProfiles();
 
@@ -126,22 +188,15 @@ public class VorgangChangeHistoryServiceITCase {
 		}
 
 		@Test
-	void shouldSetCreatedByNameInVorgangChange() {
-		givenHistorieServiceReturnsCommands(List.of(new CommandFactory().sc(CommandOrder.VORGANG_ANNEHMEN)));
-
-		var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
-
-		assertThat(history.get(0).getCreatedByName()).isEqualTo(userFullNameAndOrgaIDText(USER_1_FULL_NAME));
-	}
-
-	@Test
-	void shouldSetFinishedAtInVorgangChange() {
-		var command = new CommandFactory().sc(CommandOrder.VORGANG_ANNEHMEN);
+		void shouldSetOrder() {
+			var command = new CommandFactory().uc(USER_1_ID.toString());
 			givenHistorieServiceReturnsCommands(List.of(command));
+			givenUserServiceReturnsUser1Profile();
 
-		var history = service.createVorgangChangeHistory(vorgangWithEingang).getStatusChangeHistory();
+			var history = service.createVorgangChangeHistory(vorgangWithEingang).getAssignedUserChangeHistory();
 
-		assertThat(history.get(0).getFinishedAt()).isNotNull().isEqualTo(command.getFinishedAt());
+			assertThat(history.get(0).getOrder()).isNotNull().isEqualTo(CommandOrder.ASSIGN_USER);
+		}
 	}
 
 	private void checkBeforeAndAfterValues(VorgangChange vorgangChange, String expectedBefore, String expectedAfter) {
@@ -154,7 +209,15 @@ public class VorgangChangeHistoryServiceITCase {
 	}
 
 	private void givenUserServiceReturnsUserProfiles() {
+		givenUserServiceReturnsUser1Profile();
+		givenUserServiceReturnsUser2Profile();
+	}
+
+	private void givenUserServiceReturnsUser1Profile() {
 		when(userService.getById(USER_1_ID)).thenReturn(userProfile(USER_1_FIRST_NAME, USER_1_LAST_NAME));
+	}
+
+	private void givenUserServiceReturnsUser2Profile() {
 		when(userService.getById(USER_2_ID)).thenReturn(userProfile(USER_2_FIRST_NAME, USER_2_LAST_NAME));
 	}
 
@@ -214,6 +277,15 @@ public class VorgangChangeHistoryServiceITCase {
 		);
 	}
 
+	private List<Command> createMixedCommands() {
+		var f = new CommandFactory();
+		return List.of(
+				f.sc(CommandOrder.VORGANG_ANNEHMEN),
+				f.ac(AKTENZEICHEN_1),
+				f.uc(USER_1_ID.toString())
+		);
+	}
+
 	private static class CommandFactory {
 
 		private ZonedDateTime dateTime = ZonedDateTime.now(ZoneId.of("UTC"));