From 25bed710fb8b770aa94d2c92ae35fe4079c1018a Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Wed, 26 Feb 2025 11:50:47 +0100 Subject: [PATCH] use the new partner-person for ex-partner-relation --- .../hs/office/partner/HsOfficePartnerController.java | 5 +++-- .../partner/HsOfficePartnerControllerAcceptanceTest.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java index aa8b572e..da0bbd37 100644 --- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java +++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java @@ -170,8 +170,9 @@ public class HsOfficePartnerController implements HsOfficePartnersApi { private void optionallyCreateExPartnerRelation(final HsOfficePartnerRbacEntity saved, final HsOfficeRelationRealEntity previousPartnerRel) { if (!saved.getPartnerRel().getUuid().equals(previousPartnerRel.getUuid())) { - // TODO.impl: we also need to use the new partner-person as the anchor - relationRepo.save(previousPartnerRel.toBuilder().uuid(null).type(EX_PARTNER).build()); + relationRepo.save(previousPartnerRel.toBuilder().uuid(null) + .type(EX_PARTNER).anchor(saved.getPartnerRel().getHolder()) + .build()); } } diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java index 7afd9714..4eac16e8 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerControllerAcceptanceTest.java @@ -411,10 +411,10 @@ class HsOfficePartnerControllerAcceptanceTest extends ContextBasedTestWithCleanu }); // and an ex-partner-relation got created - final var anchorpartnerPersonUUid = givenPartner.getPartnerRel().getAnchor().getUuid(); - assertThat(relationRepo.findRelationRelatedToPersonUuidRelationTypeMarkPersonAndContactData(anchorpartnerPersonUUid, EX_PARTNER, null, null, null)) + final var newPartnerPersonUuid = givenPartner.getPartnerRel().getHolder().getUuid(); + assertThat(relationRepo.findRelationRelatedToPersonUuidRelationTypeMarkPersonAndContactData(newPartnerPersonUuid, EX_PARTNER, null, null, null)) .map(HsOfficeRelation::toShortString) - .contains("rel(anchor='LP Hostsharing eG', type='EX_PARTNER', holder='UF Erben Bessler')"); + .contains("rel(anchor='NP Winkler, Paul', type='EX_PARTNER', holder='UF Erben Bessler')"); } @Test