Merge pull request #512 from lblod/fix/mkissing-formatting-dates-consumers

Add dates mapping rules for mandatarissen and leidinggevenden consumers

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/datetime-format/mandaat-einde.rq

@@ -0,0 +1,11 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+CONSTRUCT {
+  ?s mandaat:einde ?endDateTime .
+} WHERE {
+  ?s mandaat:einde ?endDate .
+
+  BIND(SUBSTR(STR(?endDate), 1, 10) as ?endDateWithoutTimezone)
+  BIND(STRDT(CONCAT(?endDateWithoutTimezone, 'T02:00:00'), xsd:dateTime) as ?endDateTime)
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/datetime-format/mandaat-start.rq

@@ -0,0 +1,11 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+CONSTRUCT {
+  ?s mandaat:start ?startDateTime .
+} WHERE {
+  ?s mandaat:start ?startDate .
+
+  BIND(SUBSTR(STR(?startDate), 1, 10) as ?startDateWithoutTimezone)
+  BIND(STRDT(CONCAT(?startDateWithoutTimezone, 'T02:00:00'), xsd:dateTime) as ?startDateTime)
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/Agent.rq

@@ -11,5 +11,4 @@ CONSTRUCT {
     lblodlg:Functionaris
     person:Person
   }
-
 }

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/AgentInPositie.rq

@@ -5,6 +5,7 @@ CONSTRUCT {
   ?s a ch:AgentInPositie .
 } WHERE {
   ?s a ?type .
+
   VALUES ?type {
     lblodlg:Functionaris
   }

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/address.sparql

@@ -7,4 +7,4 @@ CONSTRUCT {
   FILTER NOT EXISTS {
     ?s ?p "" .
   }
-}
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/bestuursfunctie.sparql

@@ -4,4 +4,4 @@ CONSTRUCT {
 WHERE {
   ?s a <http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie>.
   ?s <http://schema.org/contactPoint> ?contactpoint.
-}
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/contactpoint.sparql

@@ -8,4 +8,4 @@ CONSTRUCT {
  FILTER NOT EXISTS {
    ?s ?p "" .
  }
-}
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/functionaris.sparql

@@ -1,10 +1,14 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+
 CONSTRUCT {
   ?s ?p ?o.
 } WHERE {
   ?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris>;
     ?p ?o.
 
- FILTER NOT EXISTS {
-   ?s ?p "" .
- }
-}
+  FILTER (?p NOT IN (mandaat:start, mandaat:einde))
+
+  FILTER NOT EXISTS {
+    ?s ?p "" .
+  }
+}

config/loket-consumer/leidinggevenden/mapping/queries/dl2op/pass/person.sparql

@@ -13,4 +13,4 @@ CONSTRUCT {
   FILTER NOT EXISTS {
    ?s ?p "" .
   }
-}
+}

config/loket-consumer/mandatarissen/mapping/queries/dl2op/datetime-format/mandaat-einde.rq

@@ -0,0 +1,11 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+CONSTRUCT {
+  ?s mandaat:einde ?endDateTime .
+} WHERE {
+  ?s mandaat:einde ?endDate .
+
+  BIND(SUBSTR(STR(?endDate), 1, 10) as ?endDateWithoutTimezone)
+  BIND(STRDT(CONCAT(?endDateWithoutTimezone, 'T02:00:00'), xsd:dateTime) as ?endDateTime)
+}

config/loket-consumer/mandatarissen/mapping/queries/dl2op/datetime-format/mandaat-start.rq

@@ -0,0 +1,11 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+CONSTRUCT {
+  ?s mandaat:start ?startDateTime .
+} WHERE {
+  ?s mandaat:start ?startDate .
+
+  BIND(SUBSTR(STR(?startDate), 1, 10) as ?startDateWithoutTimezone)
+  BIND(STRDT(CONCAT(?startDateWithoutTimezone, 'T02:00:00'), xsd:dateTime) as ?startDateTime)
+}

config/loket-consumer/mandatarissen/mapping/queries/dl2op/pass/mandataris.sparql

@@ -1,3 +1,5 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+
 CONSTRUCT {
   ?s ?p ?o.
 } WHERE {
@@ -19,6 +21,8 @@ CONSTRUCT {
     <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000003>
   ))
 
+  FILTER (?p NOT IN (mandaat:start, mandaat:einde))
+
   FILTER NOT EXISTS {
     ?s ?p "" .
   }