From 4bf0f6274ecf04b8e3b1be80cf19593b4f870ace Mon Sep 17 00:00:00 2001
From: Nordine Bittich <nordine@bittich.be>
Date: Fri, 10 Mar 2023 09:45:55 +0100
Subject: [PATCH] optimize for timeouts

---
 ...0230308112615-move-privacy-data-2a.sparql} |  5 +--
 ...20230308112616-move-privacy-data-2b.sparql | 40 +++++++++++++++++++
 ...20230308112617-move-privacy-data-3.sparql} |  0
 3 files changed, 41 insertions(+), 4 deletions(-)
 rename config/migrations/2023/{20230308112615-move-privacy-data-2.sparql => 20230308112615-move-privacy-data-2a.sparql} (82%)
 create mode 100644 config/migrations/2023/20230308112616-move-privacy-data-2b.sparql
 rename config/migrations/2023/{20230308112616-move-privacy-data-3.sparql => 20230308112617-move-privacy-data-3.sparql} (100%)

diff --git a/config/migrations/2023/20230308112615-move-privacy-data-2.sparql b/config/migrations/2023/20230308112615-move-privacy-data-2a.sparql
similarity index 82%
rename from config/migrations/2023/20230308112615-move-privacy-data-2.sparql
rename to config/migrations/2023/20230308112615-move-privacy-data-2a.sparql
index 5fb62fb..2ad7d48 100644
--- a/config/migrations/2023/20230308112615-move-privacy-data-2.sparql
+++ b/config/migrations/2023/20230308112615-move-privacy-data-2a.sparql
@@ -19,11 +19,8 @@ GRAPH <http://mu.semte.ch/graphs/worship-privacy-centric-graph> {
 }
 WHERE {
  GRAPH <http://mu.semte.ch/graphs/privacy-centric-graph> {
-             ?s a ?type; <http://mu.semte.ch/vocabularies/ext/person> ?person; ?p ?o.
+             ?s a <http://mu.semte.ch/vocabularies/ext/PersonInformationUpdate>; <http://mu.semte.ch/vocabularies/ext/person> ?person; ?p ?o.
                 filter (
-(?type = <http://mu.semte.ch/vocabularies/ext/PersonInformationUpdate> || ?type = <http://mu.semte.ch/vocabularies/ext/PersonInformationRead>) 
-&&
-
                 exists
       {
         graph <http://mu.semte.ch/graphs/worship-service> {
diff --git a/config/migrations/2023/20230308112616-move-privacy-data-2b.sparql b/config/migrations/2023/20230308112616-move-privacy-data-2b.sparql
new file mode 100644
index 0000000..b296ee7
--- /dev/null
+++ b/config/migrations/2023/20230308112616-move-privacy-data-2b.sparql
@@ -0,0 +1,40 @@
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
+PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+PREFIX person: <http://www.w3.org/ns/person#>
+PREFIX session: <http://mu.semte.ch/vocabularies/session/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+
+DELETE {
+ GRAPH <http://mu.semte.ch/graphs/privacy-centric-graph> {
+              ?s ?p ?o
+ }
+}
+INSERT {
+GRAPH <http://mu.semte.ch/graphs/worship-privacy-centric-graph> {
+         ?s ?p ?o 
+ }
+}
+WHERE {
+ GRAPH <http://mu.semte.ch/graphs/privacy-centric-graph> {
+             ?s a <http://mu.semte.ch/vocabularies/ext/PersonInformationRead>; <http://mu.semte.ch/vocabularies/ext/person> ?person; ?p ?o.
+                filter (
+                exists
+      {
+        graph <http://mu.semte.ch/graphs/worship-service> {
+           ?mandatories <http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan> ?person.
+        }
+      } 
+
+     || exists {
+        graph <http://mu.semte.ch/graphs/worship-service> {
+          ?ministers <http://www.w3.org/ns/org#heldBy> ?person.
+      }
+    })
+
+ }
+}
+
+
diff --git a/config/migrations/2023/20230308112616-move-privacy-data-3.sparql b/config/migrations/2023/20230308112617-move-privacy-data-3.sparql
similarity index 100%
rename from config/migrations/2023/20230308112616-move-privacy-data-3.sparql
rename to config/migrations/2023/20230308112617-move-privacy-data-3.sparql