From a9c3df6c7ca22270965e9a3d1e53e27dc49a42ee Mon Sep 17 00:00:00 2001
From: Michael Hoennig <michael@hoennig.de>
Date: Tue, 12 Mar 2024 11:51:31 +0100
Subject: [PATCH] fix membership test data

---
 .../changelog/273-hs-office-debitor-rbac.sql  | 35 +++++++++++--------
 .../308-hs-office-membership-test-data.sql    | 14 ++++++--
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql b/src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
index 74b6a82d..fe11d8bd 100644
--- a/src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
+++ b/src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
@@ -7,6 +7,13 @@ call generateRelatedRbacObject('hs_office_debitor');
 --//
 
 
+-- ============================================================================
+--changeset hs-office-debitor-rbac-ROLE-DESCRIPTORS:1 endDelimiter:--//
+-- ----------------------------------------------------------------------------
+call generateRbacRoleDescriptors('hsOfficeDebitor', 'hs_office_debitor');
+--//
+
+
 -- ============================================================================
 --changeset hs-office-debitor-rbac-ROLES-CREATION:1 endDelimiter:--//
 -- ----------------------------------------------------------------------------
@@ -49,20 +56,20 @@ begin
 
         -- Permissions and Grants for Debitor
 
---         call grantPermissionsToRole(
---                 getRoleId(hsOfficeRelationshipOwner(newDebitorRel)),
---                 createPermissions(partnerUuid, array ['DELETE'])
---              );
---
---         call grantPermissionsToRole(
---                 getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'),
---                 createPermissions(partnerUuid, array ['UPDATE'])
---              );
---
---         call grantPermissionsToRole(
---                 getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'),
---                 createPermissions(partnerUuid, array ['SELECT'])
---              );
+        call grantPermissionsToRole(
+                getRoleId(hsOfficeRelationshipOwner(newDebitorRel)),
+                createPermissions(partnerUuid, array ['DELETE'])
+             );
+
+        call grantPermissionsToRole(
+                getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'),
+                createPermissions(partnerUuid, array ['UPDATE'])
+             );
+
+        call grantPermissionsToRole(
+                getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'),
+                createPermissions(partnerUuid, array ['SELECT'])
+             );
 
         -- Grants to and from related Partner Relationship
 
diff --git a/src/main/resources/db/changelog/308-hs-office-membership-test-data.sql b/src/main/resources/db/changelog/308-hs-office-membership-test-data.sql
index 3eafeb68..f7e945ac 100644
--- a/src/main/resources/db/changelog/308-hs-office-membership-test-data.sql
+++ b/src/main/resources/db/changelog/308-hs-office-membership-test-data.sql
@@ -16,6 +16,7 @@ create or replace procedure createHsOfficeMembershipTestData(
 declare
     currentTask             varchar;
     relatedPartner          hs_office_partner;
+    relatedDebitorRel       hs_office_relationship;
     relatedDebitor          hs_office_debitor;
 begin
     currentTask := 'creating Membership test-data ' ||
@@ -27,9 +28,16 @@ begin
 
     select partner.* from hs_office_partner partner
                      where partner.partnerNumber = forPartnerNumber into relatedPartner;
-    select d.* from hs_office_debitor d
-               where d.partneruuid = relatedPartner.uuid
-                   and d.debitorNumberSuffix = forMainDebitorNumberSuffix
+    select debitorRel.* from hs_office_relationship debitorRel
+                join hs_office_relationship partnerRel
+                    on debitorRel.relAnchorUuid=partnerRel.relHolderUuid and partnerRel.relType='PARTNER'
+                join hs_office_partner partner
+                    on partner.partnerRoleUuid = partnerRel.uuid
+                where debitorRel.relType='ACCOUNTING' -- FIXME: 'DEBITOR'
+                into relatedDebitorRel;
+    select debitor.* from hs_office_debitor debitor
+               where debitor.debitorRelUuid = relatedDebitorRel.uuid
+                   and debitor.debitorNumberSuffix = forMainDebitorNumberSuffix
                into relatedDebitor;
 
     raise notice 'creating test Membership: M-% %', forPartnerNumber, newMemberNumberSuffix;