From 96cf528ac2f55bb4d655e1dac826e964c14d0968 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 7 Oct 2024 12:21:51 +0200 Subject: [PATCH] OZG-6641 set postfach type bayern_id --- .../eingang/formcycle/FormCycleServiceKontoMapper.java | 2 ++ .../formcycle/FormCycleServiceKontoMapperTest.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapper.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapper.java index 3aceb9749..5185c70c9 100644 --- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapper.java +++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapper.java @@ -12,11 +12,13 @@ import org.mapstruct.ReportingPolicy; import de.ozgcloud.eingang.common.formdata.ServiceKonto; import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress; import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier; +import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory; @Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, unmappedTargetPolicy = ReportingPolicy.WARN) interface FormCycleServiceKontoMapper { @Mapping(target = "postfachAddress", ignore = true) + @Mapping(target = "type", constant = ServiceKontoFactory.POSTFACH_TYPE_BAYERN_ID) @Mapping(target = "postfachAddresses", expression = "java(fromGrpcPostfachAddresses(serviceKonto))") ServiceKonto fromGrpc(FormCycleServiceKonto serviceKonto); diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapperTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapperTest.java index b328284eb..562bd419b 100644 --- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapperTest.java +++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoMapperTest.java @@ -11,6 +11,7 @@ import org.mapstruct.factory.Mappers; import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress; import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory; import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier; +import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory; class FormCycleServiceKontoMapperTest { @@ -20,6 +21,13 @@ class FormCycleServiceKontoMapperTest { @Nested class TestFromGrpcServiceKonto { + @Test + void shouldMapType() { + var result = mapper.fromGrpc(FormCycleServiceKontoTestFactory.create()); + + assertThat(result.getType()).isEqualTo(ServiceKontoFactory.POSTFACH_TYPE_BAYERN_ID); + } + @DisplayName("trustLevel") @Nested class TestTrustLevel { -- GitLab