hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

move Parter+Debitor person+contact to related Relationsship #20

Merged
hsh-michaelhoennig merged 101 commits from remove-direct-partner-person-and-contact into master 2024-03-28 12:15:14 +01:00
Conversation 0 Commits 101 Files Changed 117 +149 -122
9 changed files with 149 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8111e092ee - Show all commits

4
src/main/resources/db/changelog/223-hs-office-relationship-rbac.sql
View File

@ -27,8 +27,8 @@ create or replace function hsOfficeRelationshipRbacRolesTrigger()
language plpgsql language plpgsql
strict as $$ strict as $$
declare declare
newAnchorPerson hs_office_person; newAnchorPerson hs_office_person;
newHolderPerson hs_office_person; newHolderPerson hs_office_person;
oldContact hs_office_contact; oldContact hs_office_contact;
newContact hs_office_contact; newContact hs_office_contact;
begin begin

25
src/main/resources/db/changelog/228-hs-office-relationship-test-data.sql
View File

@ -11,7 +11,7 @@
create or replace procedure createHsOfficeRelationshipTestData( create or replace procedure createHsOfficeRelationshipTestData(
holderPersonName varchar, holderPersonName varchar,
relationshipType HsOfficeRelationshipType, relationshipType HsOfficeRelationshipType,
anchorPersonTradeName varchar, anchorPersonName varchar,
contactLabel varchar, contactLabel varchar,
mark varchar default null) mark varchar default null)
language plpgsql as $$ language plpgsql as $$
@ -23,24 +23,28 @@ declare
contact hs_office_contact; contact hs_office_contact;
begin begin
idName := cleanIdentifier( anchorPersonTradeName || '-' || holderPersonName); idName := cleanIdentifier( anchorPersonName || '-' || holderPersonName);
currentTask := 'creating relationship test-data ' || idName; currentTask := 'creating relationship test-data ' || idName;
call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin'); call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin');
execute format('set local hsadminng.currentTask to %L', currentTask); execute format('set local hsadminng.currentTask to %L', currentTask);
select p.* from hs_office_person p where p.tradeName = anchorPersonTradeName into anchorPerson; select p.*
into anchorPerson
from hs_office_person p
where p.tradeName = anchorPersonName or p.familyName = anchorPersonName;
if anchorPerson is null then if anchorPerson is null then
raise exception 'anchorPerson "%" not found', anchorPersonTradeName; raise exception 'anchorPerson "%" not found', anchorPersonName;
end if; end if;
select p.* from hs_office_person p select p.*
where p.tradeName = holderPersonName or p.familyName = holderPersonName into holderPerson
into holderPerson; from hs_office_person p
where p.tradeName = holderPersonName or p.familyName = holderPersonName;
if holderPerson is null then if holderPerson is null then
raise exception 'holderPerson "%" not found', holderPersonName; raise exception 'holderPerson "%" not found', holderPersonName;
end if; end if;
select c.* from hs_office_contact c where c.label = contactLabel into contact; select c.* into contact from hs_office_contact c where c.label = contactLabel;
if contact is null then if contact is null then
raise exception 'contact "%" not found', contactLabel; raise exception 'contact "%" not found', contactLabel;
end if; end if;
@ -87,17 +91,22 @@ do language plpgsql $$
begin begin
call createHsOfficeRelationshipTestData('First GmbH', 'PARTNER', 'Hostsharing eG', 'first contact'); call createHsOfficeRelationshipTestData('First GmbH', 'PARTNER', 'Hostsharing eG', 'first contact');
call createHsOfficeRelationshipTestData('Firby', 'REPRESENTATIVE', 'First GmbH', 'first contact'); call createHsOfficeRelationshipTestData('Firby', 'REPRESENTATIVE', 'First GmbH', 'first contact');
call createHsOfficeRelationshipTestData('First GmbH', 'ACCOUNTING', 'First GmbH', 'first contact');
call createHsOfficeRelationshipTestData('Second e.K.', 'PARTNER', 'Hostsharing eG', 'second contact'); call createHsOfficeRelationshipTestData('Second e.K.', 'PARTNER', 'Hostsharing eG', 'second contact');
call createHsOfficeRelationshipTestData('Smith', 'REPRESENTATIVE', 'Second e.K.', 'second contact'); call createHsOfficeRelationshipTestData('Smith', 'REPRESENTATIVE', 'Second e.K.', 'second contact');
call createHsOfficeRelationshipTestData('Second e.K.', 'ACCOUNTING', 'Second e.K.', 'second contact');
call createHsOfficeRelationshipTestData('Third OHG', 'PARTNER', 'Hostsharing eG', 'third contact'); call createHsOfficeRelationshipTestData('Third OHG', 'PARTNER', 'Hostsharing eG', 'third contact');
call createHsOfficeRelationshipTestData('Tucker', 'REPRESENTATIVE', 'Third OHG', 'third contact'); call createHsOfficeRelationshipTestData('Tucker', 'REPRESENTATIVE', 'Third OHG', 'third contact');
call createHsOfficeRelationshipTestData('Third OHG', 'ACCOUNTING', 'Third OHG', 'third contact');
call createHsOfficeRelationshipTestData('Fourth eG', 'PARTNER', 'Hostsharing eG', 'fourth contact'); call createHsOfficeRelationshipTestData('Fourth eG', 'PARTNER', 'Hostsharing eG', 'fourth contact');
call createHsOfficeRelationshipTestData('Fouler', 'REPRESENTATIVE', 'Third OHG', 'third contact'); call createHsOfficeRelationshipTestData('Fouler', 'REPRESENTATIVE', 'Third OHG', 'third contact');
call createHsOfficeRelationshipTestData('Third OHG', 'ACCOUNTING', 'Third OHG', 'third contact');
call createHsOfficeRelationshipTestData('Smith', 'PARTNER', 'Hostsharing eG', 'sixth contact'); call createHsOfficeRelationshipTestData('Smith', 'PARTNER', 'Hostsharing eG', 'sixth contact');
call createHsOfficeRelationshipTestData('Smith', 'ACCOUNTING', 'Smith', 'third contact', 'members-announce');
call createHsOfficeRelationshipTestData('Smith', 'SUBSCRIBER', 'Third OHG', 'third contact', 'members-announce'); call createHsOfficeRelationshipTestData('Smith', 'SUBSCRIBER', 'Third OHG', 'third contact', 'members-announce');
end; end;
$$; $$;

36
src/main/resources/db/changelog/243-hs-office-bankaccount-rbac.md
View File

@ -3,38 +3,48 @@
```mermaid ```mermaid
flowchart TB flowchart TB
%%% RbacEntity.builder().forEntity(HsOfficeBankAccountEntity.class)
%%% .alias("bankAccount")
%% the global subgraph would get imported implicitly by later usage
subgraph global subgraph global
style hsOfficeBankAccount fill: #e9f7ef style global fill: #eee
role:global.admin[global.admin] role:global.admin[global.admin]
end end
subgraph hsOfficeBankAccount subgraph hsOfficeBankAccount
direction TB direction TB
style hsOfficeBankAccount fill: #e9f7ef style hsOfficeBankAccount fill: #e9f7ef
user:hsOfficeBankAccount.creator([bankAccount.creator])
user:hsOfficeBankAccount.creator([bankAccount.creator])
%%% .createRole(OWNER)
role:hsOfficeBankAccount.owner[[bankAccount.owner]] role:hsOfficeBankAccount.owner[[bankAccount.owner]]
%%% .withPermission(ALL)
%% permissions %% permissions
role:hsOfficeBankAccount.owner --> perm:hsOfficeBankAccount.*{{hsOfficeBankAccount.delete}} role:hsOfficeBankAccount.owner --> perm:hsOfficeBankAccount.*{{hsOfficeBankAccount.*}}
%% incoming %% incoming
role:global.admin --> role:hsOfficeBankAccount.owner %%% .withCreatorAsOwningUser()
user:hsOfficeBankAccount.creator ---> role:hsOfficeBankAccount.owner user:hsOfficeBankAccount.creator ---> role:hsOfficeBankAccount.owner
%%% .withIncomingSuperRole(GlobalEntity.class, ADMIN)
role:global.admin --> role:hsOfficeBankAccount.owner
%%% .createSubRole(ADMIN)
role:hsOfficeBankAccount.admin[[bankAccount.admin]] role:hsOfficeBankAccount.admin[[bankAccount.admin]]
%% permissions
%%% .withPermission(EDIT)
role:hsOfficeBankAccount.admin --> perm:hsOfficeBankAccount.edit{{hsOfficeBankAccount.edit}}
%% incoming %% incoming
role:hsOfficeBankAccount.owner ---> role:hsOfficeBankAccount.admin role:hsOfficeBankAccount.owner ---> role:hsOfficeBankAccount.admin
role:hsOfficeBankAccount.tenant[[bankAccount.tenant]] %%% .createSubRole(REFERRER)
%% incoming role:hsOfficeBankAccount.referrer[[bankAccount.referrer]]
role:hsOfficeBankAccount.admin ---> role:hsOfficeBankAccount.tenant
role:hsOfficeBankAccount.guest[[bankAccount.guest]]
%% permissions %% permissions
role:hsOfficeBankAccount.guest --> perm:hsOfficeBankAccount.view{{hsOfficeBankAccount.view}} %%% .withPermission(VIEW)
role:hsOfficeBankAccount.referrer --> perm:hsOfficeBankAccount.view{{hsOfficeBankAccount.view}}
%% incoming %% incoming
role:hsOfficeBankAccount.tenant ---> role:hsOfficeBankAccount.guest role:hsOfficeBankAccount.admin ---> role:hsOfficeBankAccount.referrer
end end
``` ```

2
src/main/resources/db/changelog/243-hs-office-bankaccount-rbac.sql
View File

@ -75,7 +75,7 @@ execute procedure createRbacRolesForHsOfficeBankAccount();
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
call generateRbacIdentityView('hs_office_bankaccount', $idName$ call generateRbacIdentityView('hs_office_bankaccount', $idName$
target.holder target.iban || ':' || target.holder
$idName$); $idName$);
--// --//

31
src/main/resources/db/changelog/253-hs-office-sepamandate-rbac.md
View File

@ -15,19 +15,17 @@ subgraph hsOfficeBankAccount
role:hsOfficeBankAccount.owner[bankAccount.owner] role:hsOfficeBankAccount.owner[bankAccount.owner]
--> role:hsOfficeBankAccount.admin[bankAccount.admin] --> role:hsOfficeBankAccount.admin[bankAccount.admin]
--> role:hsOfficeBankAccount.tenant[bankAccount.tenant] --> role:hsOfficeBankAccount.referrer[bankAccount.referrer]
--> role:hsOfficeBankAccount.guest[bankAccount.guest]
end end
subgraph hsOfficeDebitor subgraph hsOfficeRelationship:DEBITOR
direction TB direction TB
style hsOfficeDebitor fill:#eee style hsOfficeRelationship:DEBITOR fill:#eee
role:hsOfficeDebitor.owner[debitor.admin] role:hsOfficeRelationship:DEBITOR.owner[debitorRel.owner]
--> role:hsOfficeDebitor.admin[debitor.admin] --> role:hsOfficeRelationship:DEBITOR.admin[debitorRel.admin]
--> role:hsOfficeDebitor.agent[debitor.agent] --> role:hsOfficeRelationship:DEBITOR.agent[debitorRel.agent]
--> role:hsOfficeDebitor.tenant[debitor.tenant] --> role:hsOfficeRelationship:DEBITOR.tenant[debitorRel.tenant]
--> role:hsOfficeDebitor.guest[debitor.guest]
end end
subgraph hsOfficeSepaMandate subgraph hsOfficeSepaMandate
@ -47,24 +45,17 @@ subgraph hsOfficeSepaMandate
role:hsOfficeSepaMandate.agent[sepaMandate.agent] role:hsOfficeSepaMandate.agent[sepaMandate.agent]
%% incoming %% incoming
role:hsOfficeSepaMandate.admin ---> role:hsOfficeSepaMandate.agent role:hsOfficeSepaMandate.admin ---> role:hsOfficeSepaMandate.agent
role:hsOfficeDebitor.admin --> role:hsOfficeSepaMandate.agent role:hsOfficeRelationship:DEBITOR.admin --> role:hsOfficeSepaMandate.agent
role:hsOfficeBankAccount.admin --> role:hsOfficeSepaMandate.agent role:hsOfficeBankAccount.admin --> role:hsOfficeSepaMandate.agent
%% outgoing %% outgoing
role:hsOfficeSepaMandate.agent --> role:hsOfficeDebitor.tenant role:hsOfficeSepaMandate.admin --> role:hsOfficeBankAccount.referrer
role:hsOfficeSepaMandate.admin --> role:hsOfficeBankAccount.tenant role:hsOfficeSepaMandate.agent --> role:hsOfficeRelationship:DEBITOR.tenant
role:hsOfficeSepaMandate.agent --> role:hsOfficeBankAccount.referrer
role:hsOfficeSepaMandate.tenant[sepaMandate.tenant] role:hsOfficeSepaMandate.tenant[sepaMandate.tenant]
%% incoming %% incoming
role:hsOfficeSepaMandate.agent --> role:hsOfficeSepaMandate.tenant role:hsOfficeSepaMandate.agent --> role:hsOfficeSepaMandate.tenant
%% outgoing
role:hsOfficeSepaMandate.tenant --> role:hsOfficeDebitor.guest
role:hsOfficeSepaMandate.tenant --> role:hsOfficeBankAccount.guest
role:hsOfficeSepaMandate.guest[sepaMandate.guest]
%% permissions
role:hsOfficeSepaMandate.guest --> perm:hsOfficeSepaMandate.view{{sepaMandate.view}}
%% incoming
role:hsOfficeSepaMandate.tenant --> role:hsOfficeSepaMandate.guest
end end

20
src/main/resources/db/changelog/253-hs-office-sepamandate-rbac.sql
View File

@ -28,11 +28,13 @@ create or replace function hsOfficeSepaMandateRbacRolesTrigger()
strict as $$ strict as $$
declare declare
newHsOfficeDebitor hs_office_debitor; newHsOfficeDebitor hs_office_debitor;
newhsOfficeRelationship:DEBITOR hs_office_relationship;
newHsOfficeBankAccount hs_office_bankAccount; newHsOfficeBankAccount hs_office_bankAccount;
begin begin
call enterTriggerForObjectUuid(NEW.uuid); call enterTriggerForObjectUuid(NEW.uuid);
select * from hs_office_debitor as p where p.uuid = NEW.debitorUuid into newHsOfficeDebitor; select * from hs_office_debitor as p where p.uuid = NEW.debitorUuid into newHsOfficeDebitor;
select * from hs_office_relationship as r where r.uuid = newHsOfficeDebitor.debitorRelUuid into newhsOfficeRelationship:DEBITOR;
select * from hs_office_bankAccount as c where c.uuid = NEW.bankAccountUuid into newHsOfficeBankAccount; select * from hs_office_bankAccount as c where c.uuid = NEW.bankAccountUuid into newHsOfficeBankAccount;
if TG_OP = 'INSERT' then if TG_OP = 'INSERT' then
@ -48,20 +50,28 @@ begin
perform createRoleWithGrants( perform createRoleWithGrants(
hsOfficeSepaMandateAdmin(NEW), hsOfficeSepaMandateAdmin(NEW),
permissions => array['edit'], permissions => array['edit'],
incomingSuperRoles => array[hsOfficeSepaMandateOwner(NEW)], incomingSuperRoles => array[
outgoingSubRoles => array[hsOfficeBankAccountTenant(newHsOfficeBankAccount)] hsOfficeSepaMandateOwner(NEW)],
outgoingSubRoles => array[
hsOfficeBankAccountTenant(newHsOfficeBankAccount)]
); );
perform createRoleWithGrants( perform createRoleWithGrants(
hsOfficeSepaMandateAgent(NEW), hsOfficeSepaMandateAgent(NEW),
incomingSuperRoles => array[hsOfficeSepaMandateAdmin(NEW), hsOfficeDebitorAdmin(newHsOfficeDebitor), hsOfficeBankAccountAdmin(newHsOfficeBankAccount)], incomingSuperRoles => array[
outgoingSubRoles => array[hsOfficeDebitorTenant(newHsOfficeDebitor)] hsOfficeSepaMandateAdmin(NEW),
hsOfficeRelationshipAdmin(newhsOfficeRelationship:DEBITOR),
hsOfficeBankAccountAdmin(newHsOfficeBankAccount)],
outgoingSubRoles => array[
hsOfficeRelationshipTenant(newhsOfficeRelationship:DEBITOR)]
); );
perform createRoleWithGrants( perform createRoleWithGrants(
hsOfficeSepaMandateTenant(NEW), hsOfficeSepaMandateTenant(NEW),
incomingSuperRoles => array[hsOfficeSepaMandateAgent(NEW)], incomingSuperRoles => array[hsOfficeSepaMandateAgent(NEW)],
outgoingSubRoles => array[hsOfficeDebitorGuest(newHsOfficeDebitor), hsOfficeBankAccountGuest(newHsOfficeBankAccount)] outgoingSubRoles => array[
hsOfficeRelationshipReferrer(newhsOfficeRelationship:DEBITOR),
hsOfficeBankAccountGuest(newHsOfficeBankAccount)]
); );
perform createRoleWithGrants( perform createRoleWithGrants(

12
src/main/resources/db/changelog/258-hs-office-sepamandate-test-data.sql
View File

@ -23,12 +23,14 @@ begin
call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin'); call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin');
execute format('set local hsadminng.currentTask to %L', currentTask); execute format('set local hsadminng.currentTask to %L', currentTask);
select debitor.* select debitor.* into relatedDebitor
from hs_office_debitor debitor from hs_office_debitor debitor
left join hs_office_partner partner on debitor.partneruuid = partner.uuid join hs_office_relationship debitorRel on debitorRel.uuid = debitor.debitorRelUuid
where partner.partnerNumber = forPartnerNumber and debitor.debitorNumberSuffix = forDebitorSuffix join hs_office_relationship partnerRel on partnerRel.relHolderUuid = debitorRel.relAnchorUuid
into relatedDebitor; join hs_office_partner partner on partner.partnerRoleUuid = partnerRel.uuid
select b.* from hs_office_bankAccount b where b.iban = forIban into relatedBankAccount; where partner.partnerNumber = forPartnerNumber and debitor.debitorNumberSuffix = forDebitorSuffix;
select b.* into relatedBankAccount
from hs_office_bankAccount b where b.iban = forIban;
raise notice 'creating test SEPA-mandate: %', forPartnerNumber::text || forDebitorSuffix::text; raise notice 'creating test SEPA-mandate: %', forPartnerNumber::text || forDebitorSuffix::text;
raise notice '- using debitor (%): %', relatedDebitor.uuid, relatedDebitor; raise notice '- using debitor (%): %', relatedDebitor.uuid, relatedDebitor;

101
src/main/resources/db/changelog/273-hs-office-debitor-rbac.sql
View File

@ -36,71 +36,70 @@ begin
debitorUuid := NEW.uuid; debitorUuid := NEW.uuid;
select * into newDebitorRel select * into newDebitorRel
from hs_office_relationship as r where r.relType = 'DEBITOR' and r.relHolderUuid = NEW.debitorRelUuid; from hs_office_relationship as r where r.relType = 'ACCOUNTING' and r.relHolderUuid = NEW.debitorRelUuid;
select * into newPartnerRel select * into newPartnerRel
from hs_office_relationship as r from hs_office_relationship as partnerRel
join hs_office_partner as p on p.partnerRoleUuid = r.uuid where newDebitorRel.relAnchorUuid = partnerRel.relHolderUuid;
where r.relType = 'PARTNER' and r.relHolderUuid = newPartnerRel;
select * from hs_office_bankaccount as b where b.uuid = NEW.refundBankAccountUuid select * into newBankAccount
into newBankAccount; from hs_office_bankaccount as b where b.uuid = NEW.refundBankAccountUuid;
if TG_OP = 'INSERT' then if TG_OP = 'INSERT' then
-- Permissions and Grants for Debitor -- Permissions and Grants for Debitor
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipOwner(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipOwner(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['*']) -- createPermissions(partnerUuid, array ['*'])
); -- );
--
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['edit']) -- createPermissions(partnerUuid, array ['edit'])
); -- );
--
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['view']) -- createPermissions(partnerUuid, array ['view'])
); -- );
-- Grants to and from related Partner Relationship -- Grants to and from related Partner Relationship
call grantRoleToRole(hsOfficeRelationshipAdmin(newDebitorRel), hsOfficeRelationshipAdmin(newPartnerRel), true); -- call grantRoleToRole(hsOfficeRelationshipAdmin(newDebitorRel), hsOfficeRelationshipAdmin(newPartnerRel), true);
call grantRoleToRole(hsOfficeRelationshipAgent(newPartnerRel), hsOfficeRelationshipAdmin(newDebitorRel), true); -- call grantRoleToRole(hsOfficeRelationshipAgent(newPartnerRel), hsOfficeRelationshipAdmin(newDebitorRel), true);
--
call grantRoleToRole(hsOfficeRelationshipAgent(newDebitorRel), hsOfficeRelationshipAgent(newPartnerRel), true); -- call grantRoleToRole(hsOfficeRelationshipAgent(newDebitorRel), hsOfficeRelationshipAgent(newPartnerRel), true);
call grantRoleToRole(hsOfficeRelationshipTenant(newPartnerRel), hsOfficeRelationshipAgent(newDebitorRel), true); -- call grantRoleToRole(hsOfficeRelationshipTenant(newPartnerRel), hsOfficeRelationshipAgent(newDebitorRel), true);
-- Grants to and from refundBankAccount -- Grants to and from refundBankAccount
if newBankAccount is not null then -- if newBankAccount is not null then
call grantRoleToRole(hsOfficeBankAccountReferrer(newBankAccount), hsOfficeRelationshipAgent(newDebitorRel), true); -- call grantRoleToRole(hsOfficeBankAccountReferrer(newBankAccount), hsOfficeRelationshipAgent(newDebitorRel), true);
call grantRoleToRole(hsOfficeRelationshipAgent(newDebitorRel), hsOfficeBankAccountAdmin(newBankAccount), true); -- call grantRoleToRole(hsOfficeRelationshipAgent(newDebitorRel), hsOfficeBankAccountAdmin(newBankAccount), true);
end if; -- end if;
elsif TG_OP = 'UPDATE' then elsif TG_OP = 'UPDATE' then
if OLD.debitorRelUuid is distinct from NEW.debitorRelUuid then if OLD.debitorRelUuid is distinct from NEW.debitorRelUuid then
select * into oldDebitorRel select * into oldDebitorRel
from hs_office_relationship as r where r.relType = 'DEBITOR' and r.relHolderUuid = NEW.debitorRelUuid; from hs_office_relationship as r where r.relType = 'ACCOUNTING' and r.relHolderUuid = NEW.debitorRelUuid;
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipOwner(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipOwner(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['*']) -- createPermissions(partnerUuid, array ['*'])
); -- );
--
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipAdmin(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['edit']) -- createPermissions(partnerUuid, array ['edit'])
); -- );
--
call grantPermissionsToRole( -- call grantPermissionsToRole(
getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'), -- getRoleId(hsOfficeRelationshipTenant(newDebitorRel), 'fail'),
createPermissions(partnerUuid, array ['view']) -- createPermissions(partnerUuid, array ['view'])
); -- );
end if; end if;
@ -182,10 +181,13 @@ execute procedure hsOfficeDebitorPartnerRelRbacRolesTrigger();
--changeset hs-office-debitor-rbac-IDENTITY-VIEW:1 endDelimiter:--// --changeset hs-office-debitor-rbac-IDENTITY-VIEW:1 endDelimiter:--//
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
call generateRbacIdentityView('hs_office_debitor', $idName$ call generateRbacIdentityView('hs_office_debitor', $idName$
'#' || '#' || (select partner.partnerNumber
(select partnerNumber from hs_office_partner p where p.uuid = target.partnerUuid) || from hs_office_partner partner
to_char(debitorNumberSuffix, 'fm00') || join hs_office_relationship partnerRel on partnerRel.uuid = partner.partnerRoleUUid and partnerRel.relType = 'PARTNER'
':' || (select split_part(idName, ':', 2) from hs_office_partner_iv pi where pi.uuid = target.partnerUuid) join hs_office_relationship debitorRel on debitorRel.relAnchorUuid = partnerRel.relHolderUuid and partnerRel.relType = 'ACCOUNTING'
where debitorRel.uuid = target.debitorRelUuid)
|| to_char(debitorNumberSuffix, 'fm00')
|| ':' || (select split_part(idName, ':', 2) from hs_office_relationship_iv ri where ri.uuid = target.debitorRelUuid)
$idName$); $idName$);
--// --//
@ -195,10 +197,9 @@ call generateRbacIdentityView('hs_office_debitor', $idName$
-- ---------------------------------------------------------------------------- -- ----------------------------------------------------------------------------
call generateRbacRestrictedView('hs_office_debitor', 'target.debitorNumberSuffix', call generateRbacRestrictedView('hs_office_debitor', 'target.debitorNumberSuffix',
$updates$ $updates$
partnerUuid = new.partnerUuid, -- TODO: remove? should never do anything debitorRel = new.debitorRel,
billable = new.billable, billable = new.billable,
billingContactUuid = new.billingContactUuid, billingContactUuid = new.billingContactUuid,
debitorNumberSuffix = new.debitorNumberSuffix, -- TODO: Should it be allowed to updated this value?
refundBankAccountUuid = new.refundBankAccountUuid, refundBankAccountUuid = new.refundBankAccountUuid,
vatId = new.vatId, vatId = new.vatId,
vatCountryCode = new.vatCountryCode, vatCountryCode = new.vatCountryCode,

40
src/main/resources/db/changelog/278-hs-office-debitor-test-data.sql
View File

@ -9,37 +9,41 @@
Creates a single debitor test record. Creates a single debitor test record.
*/ */
create or replace procedure createHsOfficeDebitorTestData( create or replace procedure createHsOfficeDebitorTestData(
debitorNumberSuffix numeric(5), withDebitorNumberSuffix numeric(5),
partnerTradeName varchar, forPartnerPersonName varchar,
billingContactLabel varchar, forBillingContactLabel varchar,
defaultPrefix varchar withDefaultPrefix varchar
) )
language plpgsql as $$ language plpgsql as $$
declare declare
currentTask varchar; currentTask varchar;
idName varchar; idName varchar;
relatedPartner hs_office_partner; relatedDebitorRelUuid uuid;
relatedContact hs_office_contact;
relatedBankAccountUuid uuid; relatedBankAccountUuid uuid;
begin begin
idName := cleanIdentifier( partnerTradeName|| '-' || billingContactLabel); idName := cleanIdentifier( forPartnerPersonName|| '-' || forBillingContactLabel);
currentTask := 'creating debitor test-data ' || idName; currentTask := 'creating debitor test-data ' || idName;
call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin'); call defineContext(currentTask, null, 'superuser-alex@hostsharing.net', 'global#global.admin');
execute format('set local hsadminng.currentTask to %L', currentTask); execute format('set local hsadminng.currentTask to %L', currentTask);
select partner.* from hs_office_partner partner select debitorRel.uuid
join hs_office_relationship rel on rel.uuid = partner.partnerRoleUuid into relatedDebitorRelUuid
join hs_office_person person on person.uuid = rel.relHolderUuid from hs_office_relationship debitorRel
where person.tradeName = partnerTradeName into relatedPartner; join hs_office_person person on person.uuid = debitorRel.relHolderUuid
select c.* from hs_office_contact c where c.label = billingContactLabel into relatedContact; and (person.tradeName = forPartnerPersonName or person.familyName = forPartnerPersonName)
select b.uuid from hs_office_bankaccount b where b.holder = partnerTradeName into relatedBankAccountUuid; where debitorRel.relType = 'ACCOUNTING';
raise notice 'creating test debitor: % (#%)', idName, debitorNumberSuffix; select b.uuid
raise notice '- using partner (%): %', relatedPartner.uuid, relatedPartner; into relatedBankAccountUuid
raise notice '- using billingContact (%): %', relatedContact.uuid, relatedContact; from hs_office_bankaccount b
where b.holder = forPartnerPersonName;
raise notice 'creating test debitor: % (#%)', idName, withDebitorNumberSuffix;
-- raise exception 'creating test debitor: (uuid=%, debitorRelUuid=%, debitornumbersuffix=%, billable=%, vatbusiness=%, vatreversecharge=%, refundbankaccountuuid=%, defaultprefix=%)',
-- uuid_generate_v4(), relatedDebitorRelUuid, withDebitorNumberSuffix, true, true, false, relatedBankAccountUuid, withDefaultPrefix;
insert insert
into hs_office_debitor (uuid, partneruuid, debitornumbersuffix, billable, billingcontactuuid, vatbusiness, vatreversecharge, refundbankaccountuuid, defaultprefix) into hs_office_debitor (uuid, debitorRelUuid, debitornumbersuffix, billable, vatbusiness, vatreversecharge, refundbankaccountuuid, defaultprefix)
values (uuid_generate_v4(), relatedPartner.uuid, debitorNumberSuffix, true, relatedContact.uuid, true, false, relatedBankAccountUuid, defaultPrefix); values (uuid_generate_v4(), relatedDebitorRelUuid, withDebitorNumberSuffix, true, true, false, relatedBankAccountUuid, withDefaultPrefix);
end; $$; end; $$;
--// --//