diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java index 79357045680ca8699dfed084c791f48032e6b577..ab2f7588d424a1358a4d8bcd01d360e705917e86 100644 --- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java +++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java @@ -13,6 +13,7 @@ public class ServiceKonto { private String type; @Singular private List<PostfachAddress> postfachAddresses; + private String trustLevel; @Getter @Builder diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java index eaa45e45b2b3265b3a0227fd126cacfdd5384a84..9cc248f5806dffcfde00af9baf6085c73e88266e 100644 --- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java +++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java @@ -3,14 +3,16 @@ package de.ozgcloud.eingang.common.formdata; public class ServiceKontoTestFactory { public static final String TYPE = "OSI"; + public static final String TRUST_LEVEL = "STORK-QAA-Level-2"; public static ServiceKonto create() { return createBuilder().build(); } - private static ServiceKonto.ServiceKontoBuilder createBuilder() { + public static ServiceKonto.ServiceKontoBuilder createBuilder() { return ServiceKonto.builder() .type(TYPE) + .trustLevel(TRUST_LEVEL) .postfachAddress(PostfachAddressTestFactory.create()); } } diff --git a/pom.xml b/pom.xml index 0129beaf92cd1583b84d88093499f3adb53cbf97..f923b6f81df6cd01a0d39f22a21a95e82e1d36bf 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ </modules> <properties> - <vorgang-manager.version>2.4.0</vorgang-manager.version> + <vorgang-manager.version>2.6.0-SNAPSHOT</vorgang-manager.version> <jsoup.version>1.14.3</jsoup.version> <xmlschema.version>2.3.0</xmlschema.version> diff --git a/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java index e2f2ac2425b3b9cb61fe704f68c9659cff583481..d822731a00d89a44c7e896c14f57ef13a12dc027 100644 --- a/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java +++ b/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java @@ -2,6 +2,7 @@ package de.ozgcloud.eingang.router; import java.util.List; import java.util.Map; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -18,6 +19,8 @@ import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto; @Component class ServiceKontoMapper { + static final String DEFAULT_TRUST_LEVEL = "STORK-QAA-Level-1"; + @Autowired private GrpcObjectMapper grpcObjectMapper; @@ -25,6 +28,7 @@ class ServiceKontoMapper { return GrpcServiceKonto.newBuilder() .setType(serviceKonto.getType()) .addAllPostfachAddresses(getPostfachAddresses(serviceKonto)) + .setTrustLevel(Optional.ofNullable(serviceKonto.getTrustLevel()).orElse(DEFAULT_TRUST_LEVEL)) .build(); } diff --git a/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java index 8eacf40f68dd002117fdd3390b308aaafefbd5a8..3b521610b7c7070da0ec8b3db6fd8e8776f6efdf 100644 --- a/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java +++ b/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java @@ -64,6 +64,20 @@ class ServiceKontoMapperTest { assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoTestFactory.TYPE); } + @Test + void shouldContainsDefaultTrustLevel() { + var serviceKonto = mapper.toServiceKonto(ServiceKontoTestFactory.createBuilder().trustLevel(null).build()); + + assertThat(serviceKonto.getTrustLevel()).isEqualTo(ServiceKontoMapper.DEFAULT_TRUST_LEVEL); + } + + @Test + void shouldContainsTrustLevel() { + var serviceKonto = getServiceKontoFromMappedEingang(); + + assertThat(serviceKonto.getTrustLevel()).isEqualTo(ServiceKontoTestFactory.TRUST_LEVEL); + } + @DisplayName("postfach address") @Nested class TestPostfachAddress {