From 73ea6b8ccc9a7cc5ce6e9cb97750f90a0090563c Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Mon, 5 Feb 2024 08:58:59 +0100
Subject: [PATCH] amended JPQL queries, application starts

---
 .../hs/office/debitor/HsOfficeDebitorRepository.java        | 6 ++++--
 .../hs/office/partner/HsOfficePartnerRepository.java        | 5 +++--
 .../hsadminng/hs/office/migration/ImportOfficeData.java     | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
index 64be98b1..2c0f865c 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorRepository.java
@@ -25,8 +25,10 @@ public interface HsOfficeDebitorRepository extends Repository<HsOfficeDebitorEnt
     @Query("""
             SELECT debitor FROM HsOfficeDebitorEntity debitor
                 JOIN HsOfficePartnerEntity partner ON partner.uuid = debitor.partner.uuid
-                JOIN HsOfficePersonEntity person ON person.uuid = partner.person.uuid
-                JOIN HsOfficeContactEntity contact ON contact.uuid = debitor.billingContact.uuid
+                JOIN HsOfficeRelationshipEntity rel ON rel.uuid = partner.partnerRole.uuid
+                JOIN HsOfficePersonEntity person ON person.uuid = rel.relHolder.uuid
+                JOIN HsOfficeContactEntity contact
+                    ON contact.uuid = debitor.billingContact.uuid OR contact.uuid = rel.contact.uuid
                 WHERE :name is null
                     OR partner.details.birthName like concat(cast(:name as text), '%')
                     OR person.tradeName like concat(cast(:name as text), '%')
diff --git a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
index dfbd1667..665202f5 100644
--- a/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
+++ b/src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerRepository.java
@@ -13,8 +13,9 @@ public interface HsOfficePartnerRepository extends Repository<HsOfficePartnerEnt
 
     @Query("""
             SELECT partner FROM HsOfficePartnerEntity partner
-                JOIN HsOfficeContactEntity contact ON contact.uuid = partner.contact.uuid
-                JOIN HsOfficePersonEntity person ON person.uuid = partner.person.uuid
+                JOIN HsOfficeRelationshipEntity rel ON rel.uuid = partner.partnerRole.uuid
+                JOIN HsOfficeContactEntity contact ON contact.uuid = rel.contact.uuid
+                JOIN HsOfficePersonEntity person ON person.uuid = rel.relAnchor.uuid
                 WHERE :name is null
                     OR partner.details.birthName like concat(cast(:name as text), '%')
                     OR contact.label like concat(cast(:name as text), '%')
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
index 706b1902..3c580f91 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/migration/ImportOfficeData.java
@@ -161,7 +161,6 @@ public class ImportOfficeData extends ContextBasedTest {
 
     @MockBean
     HttpServletRequest request;
-
     @Test
     @Order(1010)
     void importBusinessPartners() {