From dba1ada5e26b5f512272b14f0bf70d58fce9d22c Mon Sep 17 00:00:00 2001
From: felix <ruiz.felixruiz@gmail.com>
Date: Fri, 17 Jan 2025 14:42:54 +0100
Subject: [PATCH] Updated mapping rules

---
 .../mapping/queries/dl2op/pass/person.sparql  |  3 ++-
 .../dl2op/predicate/person-foaf-name.sparql   | 21 +++++++++++++++++++
 ...es.rq => person-gebruikte-voornaam.sparql} | 10 ++++-----
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-foaf-name.sparql
 rename config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/{names.rq => person-gebruikte-voornaam.sparql} (77%)

diff --git a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/person.sparql b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/person.sparql
index 3433dba..02b21ea 100644
--- a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/person.sparql
+++ b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/person.sparql
@@ -6,7 +6,8 @@ CONSTRUCT {
 
   FILTER (?p IN (
     <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>,
-    <http://xmlns.com/foaf/0.1/familyName>
+    <http://xmlns.com/foaf/0.1/familyName>,
+    <http://mu.semte.ch/vocabularies/core/uuid>
     ))
 
   FILTER NOT EXISTS {
diff --git a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-foaf-name.sparql b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-foaf-name.sparql
new file mode 100644
index 0000000..0347ec9
--- /dev/null
+++ b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-foaf-name.sparql
@@ -0,0 +1,21 @@
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
+PREFIX persoon_loket: <http://data.vlaanderen.be/ns/persoon#>
+PREFIX person: <http://www.w3.org/ns/person#>
+
+# DL and OP both use persoon:gebruikteVoornaam but with different semantics (!)
+
+# First name: persoon:gebruikteVoornaam => foaf:givenName
+# Alternatieve voornaam: foaf:name => persoon:gebruikteVoornaam
+
+# We do both in one query with an OPTIONAL because they need to happen simultaneously
+# not to end up in a loop
+
+# Part 1
+
+CONSTRUCT {
+  ?s persoon:gebruikteVoornaam ?name .
+} WHERE {
+  ?s a person:Person;
+    foaf:name ?name .
+}
diff --git a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/names.rq b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-gebruikte-voornaam.sparql
similarity index 77%
rename from config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/names.rq
rename to config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-gebruikte-voornaam.sparql
index eee2571..87c6463 100644
--- a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/names.rq
+++ b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/predicate/person-gebruikte-voornaam.sparql
@@ -11,13 +11,11 @@ PREFIX person: <http://www.w3.org/ns/person#>
 # We do both in one query with an OPTIONAL because they need to happen simultaneously
 # not to end up in a loop
 
+# Part 2
+
 CONSTRUCT {
   ?s foaf:givenName ?gebruikteVoornaam .
-  ?s persoon:gebruikteVoornaam ?name .
 } WHERE {
-  ?s a person:Person .
-
-  OPTIONAL { ?s persoon_loket:gebruikteVoornaam ?gebruikteVoornaam . }
-  OPTIONAL { ?s foaf:name ?name . }
-
+  ?s a person:Person ;
+    persoon_loket:gebruikteVoornaam ?gebruikteVoornaam .
 }