From 4712d690125a6a591f4a0208c4a61657f69290a2 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Thu, 6 Mar 2025 15:49:20 +0100 Subject: [PATCH] WIP --- .../HsOfficeRelationEntityPatcher.java | 1 + ...HsOfficeRelationEntityPatcherUnitTest.java | 4 ++++ .../HsOfficeRelationPatcherUnitTest.java | 2 ++ ...ceDeceasedPartnerWithCommunityOfHeirs.java | 22 ++++++++++++++++--- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcher.java b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcher.java index a8b42bb1..161bcc2c 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcher.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcher.java @@ -9,6 +9,7 @@ import net.hostsharing.hsadminng.mapper.StrictMapper; import jakarta.persistence.EntityManager; import jakarta.validation.ValidationException; +// FIXME: rename to HsOfficeRelationPatcher public class HsOfficeRelationEntityPatcher implements EntityPatcher { private final StrictMapper mapper; diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java index f4acb10b..b410bcf2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationEntityPatcherUnitTest.java @@ -18,6 +18,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.openapitools.jackson.nullable.JsonNullable; import jakarta.validation.ValidationException; +import java.util.Map; import java.util.UUID; import java.util.stream.Stream; @@ -70,6 +71,9 @@ class HsOfficeRelationEntityPatcherUnitTest extends PatchUnitTestBase< private static HsOfficeContactRealEntity PATCHED_CONTACT = HsOfficeContactRealEntity.builder() .uuid(PATCHED_CONTACT_UUID) .caption("Patched-Contact-Caption") + .emailAddresses(Map.ofEntries( + Map.entry("main", "patched@exampl.org") + )) .build(); @Mock diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationPatcherUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationPatcherUnitTest.java index 72871086..3487ce89 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationPatcherUnitTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationPatcherUnitTest.java @@ -20,6 +20,8 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; +// FIXME: replace with HsOfficeRelationEntityPatcherUnitTest + @TestInstance(PER_CLASS) @ExtendWith(MockitoExtension.class) class HsOfficeRelationPatcherUnitTest extends PatchUnitTestBase< diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/ReplaceDeceasedPartnerWithCommunityOfHeirs.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/ReplaceDeceasedPartnerWithCommunityOfHeirs.java index c114809b..100bfe75 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/ReplaceDeceasedPartnerWithCommunityOfHeirs.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/ReplaceDeceasedPartnerWithCommunityOfHeirs.java @@ -104,8 +104,14 @@ public class ReplaceDeceasedPartnerWithCommunityOfHeirs extends UseCase httpGet( + "/api/hs/office/relations?relationType=EX_PARTNER&personUuid=%{Person: %{givenNameOfDeceasedPerson} %{familyNameOfDeceasedPerson}}") + .expecting(OK).expecting(JSON).expectArrayElements(1), + path("[0].anchor.tradeName").contains( + "Erbengemeinschaft %{givenNameOfDeceasedPerson} %{familyNameOfDeceasedPerson}") + ); verify( "Verify the Representative-Relation", @@ -117,6 +123,16 @@ public class ReplaceDeceasedPartnerWithCommunityOfHeirs extends UseCase httpGet( + "/api/hs/office/debitors?partnerNumber=%{partnerNumber}") + .expecting(OK).expecting(JSON).expectArrayElements(1), + path("[0].debitorRel.anchor.tradeName").contains( + "Erbengemeinschaft %{givenNameOfDeceasedPerson} %{familyNameOfDeceasedPerson}"), + path("[0].debitorRel.holder.tradeName").contains( + "Erbengemeinschaft %{givenNameOfDeceasedPerson} %{familyNameOfDeceasedPerson}") + ); } }