From 19839d5744d6e39fca9a7df3e6613e9950cdf4fa Mon Sep 17 00:00:00 2001
From: Benjamin Degenhart <b.degenhart.work@gmail.com>
Date: Wed, 8 May 2024 22:51:34 +0200
Subject: [PATCH] Update dev RPs for better demo

---
 shacl/dev-daemmung.ttl   | 20 --------------------
 shacl/dev-eauto.ttl      | 35 ++++-------------------------------
 shacl/dev-kindergeld.ttl | 18 ------------------
 shacl/dev-solar.ttl      | 31 ++++---------------------------
 shacl/dev-wohngeld.ttl   | 34 +++++-----------------------------
 5 files changed, 13 insertions(+), 125 deletions(-)

diff --git a/shacl/dev-daemmung.ttl b/shacl/dev-daemmung.ttl
index 93252b4..e5169c9 100644
--- a/shacl/dev-daemmung.ttl
+++ b/shacl/dev-daemmung.ttl
@@ -14,23 +14,3 @@ ff:MainPersonShape a sh:NodeShape ;
         sh:minCount 1 ;
         sh:maxCount 1 ;
     ] .
-
-ff:CitizenOwnsHouseShape
-    a sh:NodeShape ;
-    sh:targetClass ff:Citizen ;
-    sh:property [
-          sh:path ff:ownsHouse ;
-          sh:class ff:House ;
-          sh:minCount 1 ;
-      ] .
-
-ff:HouseEligibleForInsulationBonusShape
-    a sh:NodeShape ;
-    sh:targetClass ff:House ;
-    sh:property [
-          sh:path ff:roofArea ;
-          sh:minCount 1 ;
-          sh:datatype xsd:integer ;
-          sh:minInclusive 50 ;
-          sh:message "50" ;
-      ] .
diff --git a/shacl/dev-eauto.ttl b/shacl/dev-eauto.ttl
index a9c3ee5..b540b64 100644
--- a/shacl/dev-eauto.ttl
+++ b/shacl/dev-eauto.ttl
@@ -7,36 +7,9 @@ ff:eautoRP a ff:RequirementProfile ;
     ff:title "E-Auto Zuschuss" ;
     ff:category ff:Klimaschutz .
 
-ff:CitizenOwnsElectricCarShape
-    a sh:NodeShape ;
+ff:MainPersonShape a sh:NodeShape ;
     sh:targetClass ff:Citizen ;
     sh:property [
-                    sh:path ff:ownsCar ;
-                    sh:qualifiedValueShape ff:ElectricCarShape ;
-                    sh:qualifiedMinCount 1 ;
-                ] ;
-    sh:property [
-                    sh:path ff:hasResidence ;
-                    sh:in ("Berlin") ;
-                ] ;
-    sh:property [
-                    sh:path ff:hasDrivingLicense ;
-                    sh:in (true) ;
-                ] .
-
-ff:ElectricCarShape
-    a sh:NodeShape ;
-    sh:targetClass ff:Car ;
-    sh:property [
-                    sh:path rdf:type ;
-                    sh:hasValue ff:Car ;
-                ] ;
-    sh:property [
-                    sh:path ff:carType ;
-                    sh:hasValue "Electric" ;
-                ] ;
-    sh:property [
-                    sh:path ff:carAge ;
-                    sh:maxInclusive 5 ;
-                    sh:datatype xsd:integer ;
-                ] .
+        sh:path ff:hasResidence ;
+        sh:in ("Berlin") ;
+    ]  .
diff --git a/shacl/dev-kindergeld.ttl b/shacl/dev-kindergeld.ttl
index 7e87801..1d001d0 100644
--- a/shacl/dev-kindergeld.ttl
+++ b/shacl/dev-kindergeld.ttl
@@ -13,22 +13,4 @@ ff:MainPersonShape a sh:NodeShape ;
         sh:path ff:hasIncomeBrutto ;
         sh:minCount 1 ;
         sh:maxCount 1 ;
-    ] ;
-    sh:property [
-        sh:path ff:hasIncomeNetto ;
-        sh:minCount 1 ;
-        sh:maxCount 1 ;
     ] .
-
-ff:ChildAllowanceEligibilityShape
-    a sh:NodeShape ;
-    sh:targetClass ff:Citizen ;
-    sh:property [
-                    sh:path ff:hasChildren ;
-                    sh:minCount 1 ;
-                ] ;
-    sh:property [
-                    sh:path ff:hasIncomeNetto ;
-                    sh:maxInclusive 2000 ;
-                    sh:datatype xsd:integer ;
-                ] .
diff --git a/shacl/dev-solar.ttl b/shacl/dev-solar.ttl
index 7135dd4..ba8be90 100644
--- a/shacl/dev-solar.ttl
+++ b/shacl/dev-solar.ttl
@@ -8,35 +8,12 @@ ff:solarRP a ff:RequirementProfile ;
              ff:created "2023-10-26"^^xsd:date ;
              ff:title "Solarpanel Förderung" ;
              ff:category ff:Waermewende, ff:Klimaschutz ;
-             ff:queryType ff:dev ;
              ff:targetGroup ff:Citizen ;
              ff:fundingProvider ff:GermanState .
 
-ff:CitizenOwnsHouseShape
-    a sh:NodeShape ;
+ff:MainPersonShape a sh:NodeShape ;
     sh:targetClass ff:Citizen ;
     sh:property [
-        sh:path ff:ownsHouse ;
-        sh:qualifiedValueShape [
-            sh:class ff:House ; # Shape that values must conform to, in this case, a House
-        ] ;
-        sh:qualifiedMinCount 1 ; # At least one value must conform to the above shape
-    ] .
-
-ff:HouseEligibleForSolarFundingShape
-    a sh:NodeShape ;
-    sh:targetClass ff:House ;
-    sh:property [
-        sh:path ff:roofArea ;
-        sh:minCount 1 ;
-        sh:datatype xsd:integer ;
-        sh:minInclusive 100 ;
-        sh:message "100" ;
-    ] ;
-    sh:property [
-        sh:path ff:houseAge ;
-        sh:minCount 1 ;
-        sh:datatype xsd:integer ;
-        sh:maxInclusive 20 ;
-        sh:message "20" ;
-    ] .
+        sh:path ff:hasResidence ;
+        sh:in ("Berlin") ;
+    ]  .
diff --git a/shacl/dev-wohngeld.ttl b/shacl/dev-wohngeld.ttl
index 7fe084d..cd758d2 100644
--- a/shacl/dev-wohngeld.ttl
+++ b/shacl/dev-wohngeld.ttl
@@ -7,37 +7,13 @@ ff:wohngelddevRP a ff:RequirementProfile ;
              ff:author ff:benjaminaaron ;
              ff:created "2023-11-01"^^xsd:date ;
              ff:title "Wohngeld dev" ;
-             ff:queryType ff:dev ;
              ff:targetGroup ff:Citizen ;
              ff:fundingProvider ff:GermanState .
 
-ff:CitizenRentsFlatShape
-    a sh:NodeShape ;
+ff:MainPersonShape a sh:NodeShape ;
     sh:targetClass ff:Citizen ;
     sh:property [
-          sh:path ff:rentsFlat ;
-          sh:class ff:Flat ;
-          sh:minCount 1 ;
-      ] .
-
-ff:FlatAreaShape
-    a sh:NodeShape ;
-    sh:targetClass ff:Flat ;
-    sh:property [
-          sh:path ff:livingArea ;
-          sh:datatype xsd:integer ;
-          sh:maxInclusive 60 ;
-          sh:message "60" ;
-          sh:minCount 1 ;
-      ] .
-
-ff:IncomeShape
-    a sh:NodeShape ;
-    sh:targetClass ff:Citizen ;
-    sh:property [
-          sh:path ff:hasIncomeNetto ;
-          sh:datatype xsd:integer ;
-          sh:maxInclusive 2000 ;
-          sh:message "2000" ;
-          sh:minCount 1 ;
-      ] .
+        sh:path ff:paysRentCold ;
+        sh:minCount 1 ;
+        sh:maxCount 1 ;
+    ] .