Merge pull request 'OZG-6641 Vereinheitlichung Postfach-Typbezeichnung...

Merge pull request 'OZG-6641 Vereinheitlichung Postfach-Typbezeichnung BayernId' (#180) from OZG-6641-Vereinheitlichung-Postfach-Typbezeichnung-BayernId into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/eingang-manager/pulls/180


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

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);
 

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 {