Replace sh:hasValue with sh:in

Otherwise it doesn't work with the currently implemented missing data detection logic
Citizen-Knowledge-Graph · Aug 11, 2024 · c7c0a96 · c7c0a96
1 parent ab785de
commit c7c0a96
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 58 deletions.
diff --git a/sozialplattform/shacl/01-hilfe-zum-lebensunterhalt.ttl b/sozialplattform/shacl/01-hilfe-zum-lebensunterhalt.ttl
@@ -19,23 +19,23 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:erwerbsfaehig_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:erwerbsfaehig_neu-ao-nein-weniger-6-monate ;
+        sh:in (ff:erwerbsfaehig_neu-ao-nein-weniger-6-monate) ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:beruf_neu-ao-alg ;
+            sh:in (ff:beruf_neu-ao-alg) ;
         ] ;
     ] ;
     sh:property [

diff --git a/sozialplattform/shacl/02-kindergeld.ttl b/sozialplattform/shacl/02-kindergeld.ttl
@@ -15,32 +15,38 @@ ff:kindergeld a ff:RequirementProfile ;
 
 ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:targetClass ff:Citizen ;
+    sh:property [
+        sh:path ff:kinder_unter_18 ;
+        sh:minCount 1 ;
+    ] ;
+    sh:property [
+        sh:path ff:kinder_18_25 ;
+        sh:minCount 1 ;
+    ] ;
     sh:property [
         sh:path ff:kinder ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:or ([
         sh:property [
             sh:path ff:kinder_18_25 ;
-            sh:minCount 1 ;
-            sh:hasValue true ;
+            sh:in (true) ;
         ]
     ] [
         sh:property [
             sh:path ff:kinder_unter_18 ;
-            sh:minCount 1 ;
-            sh:hasValue true ;
+            sh:in (true) ;
         ]
     ]) ;
     sh:property [
@@ -60,5 +66,5 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:kindergeld ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] .
diff --git a/sozialplattform/shacl/03-kinderzuschlag.ttl b/sozialplattform/shacl/03-kinderzuschlag.ttl
@@ -15,55 +15,61 @@ ff:kinderzuschlag a ff:RequirementProfile ;
 
 ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:targetClass ff:Citizen ;
+    sh:property [
+        sh:path ff:kinder_unter_18 ;
+        sh:minCount 1 ;
+    ] ;
+    sh:property [
+        sh:path ff:kinder_18_25 ;
+        sh:minCount 1 ;
+    ] ;
     sh:property [
         sh:path ff:aufenthalt ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:kinder ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:lebenssituation ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:lebenssituation-ao-allein ;
+            sh:in (ff:lebenssituation-ao-allein) ;
         ] ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_familie ;
         sh:minCount 1 ;
-        sh:hasValue ff:einkommen_familie-ao-monatsbrutto-ueber-900-600 ;
+        sh:in (ff:einkommen_familie-ao-monatsbrutto-ueber-900-600) ;
     ] ;
     sh:or ([
         sh:property [
             sh:path ff:kinder_18_25 ;
-            sh:minCount 1 ;
-            sh:hasValue true ;
+            sh:in (true) ;
         ]
     ] [
         sh:property [
             sh:path ff:kinder_unter_18 ;
-            sh:minCount 1 ;
-            sh:hasValue true ;
+            sh:in (true) ;
         ]
     ]) ;
     sh:property [
         sh:path ff:kindergeld ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_neu ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:einkommen_neu-ao-alg-ii ;
+            sh:in (ff:einkommen_neu-ao-alg-ii) ;
         ] ;
     ] .
diff --git a/sozialplattform/shacl/04-bafoeg.ttl b/sozialplattform/shacl/04-bafoeg.ttl
@@ -23,29 +23,29 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:lebenslage ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:krankenversicherung ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:pflegeversicherung ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:erwerbsfaehig_neu ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:erwerbsfaehig_neu-ao-nein-greater-6-monate ;
+            sh:in (ff:erwerbsfaehig_neu-ao-nein-greater-6-monate) ;
         ] ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:beruf_neu-ao-ausbildung ;
+        sh:in (ff:beruf_neu-ao-ausbildung) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_neu ;

diff --git a/sozialplattform/shacl/05-buergergeld.ttl b/sozialplattform/shacl/05-buergergeld.ttl
@@ -18,12 +18,12 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:aufenthalt ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:hasAge ;
@@ -33,13 +33,13 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:erwerbsfaehig_neu ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:erwerbsfaehig_neu-ao-nein-greater-6-monate ;
+            sh:in (ff:erwerbsfaehig_neu-ao-nein-greater-6-monate) ;
         ] ;
     ] ;
     sh:property [

diff --git a/sozialplattform/shacl/06-arbeitslosengeld.ttl b/sozialplattform/shacl/06-arbeitslosengeld.ttl
@@ -18,27 +18,27 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:aufenthalt ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:erwerbsfaehig_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:erwerbsfaehig_neu-ao-ja ;
+        sh:in (ff:erwerbsfaehig_neu-ao-ja) ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:beruf_neu-ao-alg ;
+        sh:in (ff:beruf_neu-ao-alg) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_neu ;

diff --git a/sozialplattform/shacl/07-berufsausbildungsbeihilfe-bab.ttl b/sozialplattform/shacl/07-berufsausbildungsbeihilfe-bab.ttl
@@ -3,7 +3,7 @@
 @prefix ff: <https://foerderfunke.org/default#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-ff:hberufsausbildungsbeihilfe-bab a ff:RequirementProfile ;
+ff:berufsausbildungsbeihilfe-bab a ff:RequirementProfile ;
     ff:leikaId "99007004017000" ;
     ff:title "Berufsausbildungsbeihilfe (BAB)"@de , "Vocational training allowance (BAB)"@en ;
     ff:category ff:schule-studium-ausbildung-bc-kategorie ;
@@ -18,22 +18,22 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:pflege ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:beruf_neu-ao-ausbildung ;
+        sh:in (ff:beruf_neu-ao-ausbildung) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_neu ;

diff --git a/sozialplattform/shacl/08-wohngeld.ttl b/sozialplattform/shacl/08-wohngeld.ttl
@@ -18,7 +18,7 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:hasAge ;
@@ -28,13 +28,13 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue false ;
+        sh:in (false) ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
         sh:not [
-            sh:hasValue ff:beruf_neu-ao-ausbildung ;
+            sh:in (ff:beruf_neu-ao-ausbildung) ;
         ] ;
     ] ;
     sh:property [

diff --git a/sozialplattform/shacl/09-grundsicherung-im-alter-und-bei-erwerbsminderung.ttl b/sozialplattform/shacl/09-grundsicherung-im-alter-und-bei-erwerbsminderung.ttl
@@ -18,22 +18,22 @@ ff:MainPersonShape a sh:NodeShape, ff:EligibilityConstraint ;
     sh:property [
         sh:path ff:pensionable ;
         sh:minCount 1 ;
-        sh:hasValue true ;
+        sh:in (true) ;
     ] ;
     sh:property [
         sh:path ff:aufenthaltsort ;
         sh:minCount 1 ;
-        sh:hasValue ff:aufenthaltsort-ao-innerhalb ;
+        sh:in (ff:aufenthaltsort-ao-innerhalb) ;
     ] ;
     sh:property [
         sh:path ff:erwerbsfaehig_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:erwerbsfaehig_neu-ao-nein-greater-6-monate ;
+        sh:in (ff:erwerbsfaehig_neu-ao-nein-greater-6-monate) ;
     ] ;
     sh:property [
         sh:path ff:beruf_neu ;
         sh:minCount 1 ;
-        sh:hasValue ff:beruf_neu-ao-rente ;
+        sh:in (ff:beruf_neu-ao-rente) ;
     ] ;
     sh:property [
         sh:path ff:einkommen_neu ;