From 4776cd2647be3df70ead2f02e2feaf27050e05aa Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Mon, 24 Mar 2025 15:33:46 +0100
Subject: [PATCH] OZG-7573 Use xzufi-id for weiterleitung
---
.../forwarding/ForwardVorgangCommandBodyMapper.java | 2 +-
.../ForwardVorgangCommandBodyMapperTest.java | 10 +---------
.../ForwardVorgangCommandBodyTestFactory.java | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java
index bd36a44d24..d6d0cf677b 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapper.java
+++ b/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);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapperTest.java
index 084a164b9d..d926625637 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyMapperTest.java
+++ b/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());
}
}
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyTestFactory.java
index abf89a2543..de7f68117a 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardVorgangCommandBodyTestFactory.java
+++ b/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)
--
GitLab