Merge branch 'OZG-7573-use-xzufi-id-for-weiterleitung' into 'main'

OZG-7573 Use xzufi-id for weiterleitung

See merge request !23

alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java

@@ -32,7 +32,7 @@ import de.ozgcloud.alfa.collaboration.OrganisationsEinheit;
 @Mapper
 interface ForwardVorgangCommandBodyMapper {
 
-	@Mapping(target = "organisationEinheitId", ignore = true)
+	@Mapping(target = "organisationEinheitId", source = "xzufiId.id")
 	@Mapping(target = ".", source = "anschrift")
 	ForwardVorgangCommandBody updateFromOrganisationEinheit(OrganisationsEinheit organisationsEinheit, @MappingTarget ForwardVorgangCommandBody commandBody);
 }

alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapperTest.java

@@ -49,15 +49,7 @@ class ForwardVorgangCommandBodyMapperTest {
 		void shouldUpdateFromOrganisationEinheit() {
 			mapper.updateFromOrganisationEinheit(OrganisationsEinheitTestFactory.create(), body);
 
-			assertThat(body).usingRecursiveComparison().ignoringFields("organisationEinheitId")
-					.isEqualTo(ForwardVorgangCommandBodyTestFactory.create());
-		}
-
-		@Test
-		void shouldPreserveId() {
-			mapper.updateFromOrganisationEinheit(OrganisationsEinheitTestFactory.create(), body);
-
-			assertThat(body.getOrganisationEinheitId()).isEqualTo(ORGANISATIONS_EINHEIT_ID);
+			assertThat(body).usingRecursiveComparison().isEqualTo(ForwardVorgangCommandBodyTestFactory.create());
 		}
 	}
 }

alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyTestFactory.java

@@ -35,7 +35,7 @@ class ForwardVorgangCommandBodyTestFactory {
 
 	static ForwardVorgangCommandBodyBuilder createBuilder() {
 		return ForwardVorgangCommandBody.builder()
-				.organisationEinheitId(OrganisationsEinheitTestFactory.ID)
+				.organisationEinheitId(OrganisationsEinheitTestFactory.XZUFI_ID.getId())
 				.name(OrganisationsEinheitTestFactory.NAME)
 				.strasse(AnschriftTestFactory.STRASSE)
 				.ort(AnschriftTestFactory.ORT)