CaseDef extends ColumnValue

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java

@@ -394,7 +394,7 @@ public class RbacView {
         });
         importedRbacView.getGrantDefs().forEach(grantDef -> {
             if ( grantDef.grantType() == RbacGrantDefinition.GrantType.ROLE_TO_ROLE &&
-                grantDef.matchesCase(forCase) ) {
+                    (grantDef.forCases == null || grantDef.matchesCase(forCase)) ) {
                 final var importedGrantDef = findOrCreateGrantDef(
                         findRbacRole(
                                 mapper.map(grantDef.getSubRoleDef().entityAlias.aliasName),
@@ -483,7 +483,7 @@ public class RbacView {
     public void generateWithBaseFileName(final String baseFileName) {
         if (allCases.size() > 1) {
             allCases.forEach(caseDef -> {
-                final var fileName = baseFileName + (caseDef.isDefaultCase() ? "" : "-" + caseDef.val) + ".md";
+                final var fileName = baseFileName + (caseDef.isDefaultCase() ? "" : "-" + caseDef.value) + ".md";
                 new RbacViewMermaidFlowchartGenerator(this, caseDef)
                         .generateToMarkdownFile(Path.of(OUTPUT_BASEDIR, fileName));
             });
@@ -596,22 +596,12 @@ public class RbacView {
         }
 
         boolean matchesCase(final ColumnValue requestedCase) {
-            if (forCases == null) {
-                return true;
-            }
             final var noCasesDefined = forCases.isEmpty();
             final var generateForAllCases = requestedCase == null;
             final boolean isGrantedForRequestedCase = forCases.stream().anyMatch(c -> c.isCase(requestedCase));
             return  noCasesDefined || generateForAllCases || isGrantedForRequestedCase;
         }
 
-        boolean matchesCase(final CaseDef requestedCase) {
-            final var noCasesDefined = forCases.isEmpty();
-            final var generateForAllCases = requestedCase == null;
-            final boolean isGrantedForRequestedCase = forCases.contains(requestedCase);
-            return  noCasesDefined || generateForAllCases || isGrantedForRequestedCase;
-        }
-
         boolean isToCreate() {
             return toCreate;
         }
@@ -1132,14 +1122,12 @@ public class RbacView {
         }
     }
 
-    // FIXME: subclass of ColumnValue
+    public static class CaseDef extends ColumnValue {
-    public static class CaseDef {
 
-        final String val;
         final Consumer<RbacView> def;
 
         private CaseDef(final String discriminatorColumnValue, final Consumer<RbacView> def) {
-            this.val = discriminatorColumnValue;
+            super(discriminatorColumnValue);
             this.def = def;
         }
 
@@ -1154,7 +1142,7 @@ public class RbacView {
 
         @Override
         public int hashCode() {
-            return ofNullable(val).map(String::hashCode).orElse(0);
+            return ofNullable(value).map(String::hashCode).orElse(0);
         }
 
         @Override
@@ -1164,22 +1152,22 @@ public class RbacView {
             if (other == null || getClass() != other.getClass())
                 return false;
             final CaseDef caseDef = (CaseDef) other;
-            return Objects.equals(val, caseDef.val);
+            return Objects.equals(value, caseDef.value);
         }
 
         boolean isDefaultCase() {
-            return val == null;
+            return value == null;
         }
 
         @Override
         public String toString() {
             return isDefaultCase()
                 ? "inOtherCases"
-                : "inCaseOf:" + val;
+                : "inCaseOf:" + value;
         }
 
         public boolean isCase(final ColumnValue requestedCase) {
-            return Objects.equals(requestedCase.value, this.val);
+            return Objects.equals(requestedCase.value, this.value);
         }
     }
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java

@@ -165,7 +165,7 @@ public class RbacViewMermaidFlowchartGenerator {
         Files.writeString(
                 path,
                 """
-                    ### rbac %{entityAlias} %{case}
+                    ### rbac %{entityAlias}%{case}
     
                     This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manually.
     
@@ -175,7 +175,7 @@ public class RbacViewMermaidFlowchartGenerator {
                     """
                     .replace("%{entityAlias}", rbacDef.getRootEntityAlias().aliasName())
                     .replace("%{flowchart}", flowchart.toString())
-                    .replace("%{case}", forCase == null ? "" : (forCase.toString()) ),
+                    .replace("%{case}", forCase == null ? "" : " " + forCase),
                 StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
         System.out.println("Markdown-File: " + path.toAbsolutePath());
     }

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RolesGrantsAndPermissionsGenerator.java

@@ -197,8 +197,8 @@ class RolesGrantsAndPermissionsGenerator {
             plPgSql.writeLn();
             final var ifOrElsIf = new AtomicReference<>("IF ");
             rbacDef.getAllCases().forEach(caseDef -> {
-                if (caseDef.val != null) {
+                if (caseDef.value != null) {
-                    plPgSql.writeLn(ifOrElsIf + "NEW." + rbacDef.getDiscriminatorColumName() + " = '" + caseDef.val + "' THEN");
+                    plPgSql.writeLn(ifOrElsIf + "NEW." + rbacDef.getDiscriminatorColumName() + " = '" + caseDef.value + "' THEN");
                 } else {
                     plPgSql.writeLn("ELSE");
                 }

src/main/resources/db/changelog/5-hs-office/504-partner/5043-hs-office-partner-rbac.md

@@ -1,4 +1,4 @@
-### rbac partner 
+### rbac partner
 
 This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manually.
 

src/main/resources/db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.md

@@ -149,6 +149,16 @@ role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel.holderPerson:REFERRER
 role:global:ADMIN -.-> role:debitorRel.contact:OWNER
 role:debitorRel.contact:OWNER -.-> role:debitorRel.contact:ADMIN
 role:debitorRel.contact:ADMIN -.-> role:debitorRel.contact:REFERRER
+role:global:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel:OWNER -.-> role:debitorRel:ADMIN
+role:debitorRel:ADMIN -.-> role:debitorRel:AGENT
+role:debitorRel:AGENT -.-> role:debitorRel:TENANT
+role:debitorRel.contact:ADMIN -.-> role:debitorRel:TENANT
+role:debitorRel:TENANT -.-> role:debitorRel.anchorPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.holderPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.contact:REFERRER
+role:debitorRel.anchorPerson:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel:AGENT
 role:global:ADMIN -.-> role:refundBankAccount:OWNER
 role:refundBankAccount:OWNER -.-> role:refundBankAccount:ADMIN
 role:refundBankAccount:ADMIN -.-> role:refundBankAccount:REFERRER