Skip to content
Snippets Groups Projects
Commit 29273c40 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'OZG-5183-missing-vorgangnummer' into release

parents 13cbae71 b846d92b
No related branches found
No related tags found
No related merge requests found
......@@ -91,7 +91,7 @@ public class VorgangService {
}
String getVorgangNummer(@NonNull EingangHeader header) {
return Optional.ofNullable(header.getVorgangNummer())
return Optional.ofNullable(header.getVorgangNummer()).filter(StringUtils::isNotBlank)
.orElseGet(header::getRequestId);
}
......
......@@ -36,6 +36,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullAndEmptySource;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
......@@ -203,6 +205,7 @@ class VorgangServiceTest {
@Nested
class getVorgangNummer {
@Test
void shouldReturnGivenNummer() {
var result = service.getVorgangNummer(EingangHeaderTestFactory.create());
......@@ -210,9 +213,11 @@ class VorgangServiceTest {
assertThat(result).isEqualTo(EingangHeaderTestFactory.VORGANG_NUMMER);
}
@Test
void shouldReturnRequestId() {
var header = EingangHeaderTestFactory.createBuilder().vorgangNummer(null).build();
@DisplayName("should return requestId")
@ParameterizedTest(name = "when vorgangNummer {0}")
@NullAndEmptySource
void shouldReturnRequestId(String vorgangNummer) {
var header = EingangHeaderTestFactory.createBuilder().vorgangNummer(vorgangNummer).build();
var result = service.getVorgangNummer(header);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment