Add migration to remove duplicated organizations

* add contact types

* move migration to 2022 directory

Co-authored-by: Nordine Bittich <nordine@bittich.be>

config/authorization/config.ex

@@ -9,6 +9,7 @@ alias Acl.GroupSpec.GraphCleanup, as: GraphCleanup
 defmodule Acl.UserGroups.Config do
  @protected_resource_type [
                         "http://www.w3.org/ns/org#Organization",
+                        "http://data.vlaanderen.be/ns/besluit#Besluit",
                         "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
                         "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst",
                         "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
@@ -42,6 +43,7 @@ defmodule Acl.UserGroups.Config do
                         "http://lblod.data.gift/vocabularies/organisatie/TypeEredienst",
                         "http://lblod.data.gift/vocabularies/organisatie/HelftVerkiezing",
                         "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis",
+                        "http://lblod.data.gift/vocabularies/organisatie/VeranderingsgebeurtenisResultaat",
                         "http://lblod.data.gift/vocabularies/organisatie/MandatarisStatusCode",
                         "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode",
                         "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid",

config/dev-migrations/20211209101400-mock-change-events.graph

@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/organisatieportaal

config/dev-migrations/20211209101400-mock-change-events.ttl

@@ -0,0 +1,250 @@
+# Notes:
+# - current implementation has too many CE's.
+# <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> : Actief
+# <http://lblod.data.gift/concepts/abf4fee82019f88cf122f986830621ab> In oprichting
+# <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> Niet Actief
+
+#<http://lblod.data.gift/concepts/343a00884d012cee6915bc7559cd69ef>
+#  skos:prefLabel  "Erkenning niet toegekend" .
+#<http://lblod.data.gift/concepts/6651dc69b0ae8f7ff9974e8a23db1dec>
+#  skos:prefLabel  "Naamswijziging" .
+#<http://lblod.data.gift/concepts/3dd7550843eaf18e1fa1ca6c6c3f2610>
+#  skos:prefLabel  "Erkenning toegekend" .
+#<http://lblod.data.gift/concepts/4297bc56c1a874240e4566e2c5b8816f>
+#  skos:prefLabel  "Erkenning opgeheven" .
+#concepts:d7bbc0ea17fccf7ea35c552d757c905f
+#  skos:prefLabel  "Samenvoeging" .
+#<http://lblod.data.gift/concepts/9f19f14910245f9b14737f1f1a2067f2>
+#  skos:prefLabel  "Wijziging Gebiedsomschrijving" .
+
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dct: <http://purl.org/dc/terms/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX concepts: <http://lblod.data.gift/concepts/>
+PREFIX bestuur: <http://data.lblod.info/id/besturenVanDeEredienst/>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX contacthub: <http://data.lblod.info/vocabularies/contacthub/>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX ce:  <http://data.lblod.info/id/veranderingsgebeurtenissen/>
+PREFIX cer:  <http://data.lblod.info/id/veranderingsgebeurtenis-resultaten/>
+PREFIX m8g: <http://data.europa.eu/m8g/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX eli: <http://data.europa.eu/eli/ontology#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+#code is a weird prefix but that's how it's called in the domain.json file so I reused it
+PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
+
+
+
+# Extende CE for ZWALM: merger of many kerkraden
+
+<http://data.lblod.info/id/veranderingsgebeurtenissen/3940cca35440a8b51d1435fedd5b05fa>
+  rdf:type  org:ChangeEvent ;
+  contacthub:typeWijziging  concepts:d7bbc0ea17fccf7ea35c552d757c905f ; # Samenvoeging
+  org:resultingOrganization  bestuur:dc32dbe8d1f85999cd39a5c9893a9c7d ;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_1;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_2;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_3;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_4;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_5;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_6;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_7;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_8;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_9;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_10;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_11;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_12;
+  org:originalOrganization bestuur:dc32dbe8d1f85999cd39a5c9893a9c7d;
+  org:originalOrganization bestuur:6b910ac3244fb94f6ff2574cd5c91df0;
+  org:originalOrganization bestuur:cace83d9d7b40b310b43defd0acb9da5;
+  org:originalOrganization bestuur:3eb0946f3c30eeec932be0cccba15645;
+  org:originalOrganization bestuur:750db3adf47c16061911818dcbefacc2;
+  org:originalOrganization bestuur:3c8596af2a8aa4d11a6dcc0d32993c7a;
+  org:originalOrganization bestuur:57137d40d46aeb342b89ae2d50b127c3;
+  org:originalOrganization bestuur:9a1ca4b0731d15b683d116fef02f0f9e;
+  org:originalOrganization bestuur:10ccaccbbfcd79c5fad7fbd3747221a1;
+  org:originalOrganization bestuur:a6451f9c7503c2b7c56898fe12e97993;
+  org:originalOrganization bestuur:bbd46776125da4bd88e82e879863bbd6;
+  org:originalOrganization bestuur:edca1c6822af59d219d3652bd749f7fb;
+  dct:date  "2019-07-15T00:00:00"^^xsd:dateTime ;
+  m8g:hasFormalFramework <http://lblod.data.info/id/besluiten/f2ec4db3-6154-41b4-a5be-e0bc129e98d7>;
+  dct:description  "Opheffing 11 parochies, allen samengevoegd bij de parochie Alle Heiligen Nederzwalm - MB 15 juli 2019" .
+
+<http://lblod.data.info/id/besluiten/f2ec4db3-6154-41b4-a5be-e0bc129e98d7>
+  a besluit:Besluit;
+  mu:uuid "f2ec4db3-6154-41b4-a5be-e0bc129e98d7";
+  eli:date_publication  "2019-07-14T00:00:00"^^xsd:dateTime;
+  foaf:page "https://www.vlaanderen.be/agentschap-binnenlands-bestuur".
+
+cer:71879559ac2045499def_DUMMY_CER_1
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_1";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6>; #Actief
+  org:organization  bestuur:dc32dbe8d1f85999cd39a5c9893a9c7d .
+
+cer:71879559ac2045499def_DUMMY_CER_2
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_2";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:6b910ac3244fb94f6ff2574cd5c91df0 .
+
+cer:71879559ac2045499def_DUMMY_CER_3
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_3";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:cace83d9d7b40b310b43defd0acb9da5 .
+
+cer:71879559ac2045499def_DUMMY_CER_4
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_4";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:3eb0946f3c30eeec932be0cccba15645 .
+
+cer:71879559ac2045499def_DUMMY_CER_5
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_5";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:750db3adf47c16061911818dcbefacc2 .
+
+cer:71879559ac2045499def_DUMMY_CER_6
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_6";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:3c8596af2a8aa4d11a6dcc0d32993c7a .
+
+cer:71879559ac2045499def_DUMMY_CER_7
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_7";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:57137d40d46aeb342b89ae2d50b127c3 .
+
+cer:71879559ac2045499def_DUMMY_CER_8
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_8";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:9a1ca4b0731d15b683d116fef02f0f9e .
+
+cer:71879559ac2045499def_DUMMY_CER_9
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_9";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:10ccaccbbfcd79c5fad7fbd3747221a1 .
+
+cer:71879559ac2045499def_DUMMY_CER_10
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_10";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:a6451f9c7503c2b7c56898fe12e97993 .
+
+cer:71879559ac2045499def_DUMMY_CER_11
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_11";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:bbd46776125da4bd88e82e879863bbd6 .
+
+cer:71879559ac2045499def_DUMMY_CER_12
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_12";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311>; #Niet Actief
+  org:organization  bestuur:edca1c6822af59d219d3652bd749f7fb .
+
+
+# Dummy naamsverandering
+<http://data.lblod.info/id/veranderingsgebeurtenissen/3940cca35440_DUMMY_CE_A>
+  rdf:type  org:ChangeEvent ;
+  mu:uuid "3940cca35440_DUMMY_CE_A" ;
+  contacthub:typeWijziging  concepts:6651dc69b0ae8f7ff9974e8a23db1dec ; # Naamswijziging
+  org:resultingOrganization  bestuur:edca1c6822af59d219d3652bd749f7fb ;
+  dct:date  "2010-01-01T00:00:00"^^xsd:dateTime ;
+  dct:description  "Dummy CE de parochie previously known as something else" ;
+  m8g:hasFormalFramework <http://lblod.data.info/id/besluiten/db80b68d-c858-4c75-ae27-92b9125881c4>;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_A.
+
+<http://lblod.data.info/id/besluiten/db80b68d-c858-4c75-ae27-92b9125881c4>
+  a besluit:Besluit;
+  mu:uuid "db80b68d-c858-4c75-ae27-92b9125881c4";
+  eli:date_publication  "2010-01-01T00:00:00"^^xsd:dateTime;
+  foaf:page "https://www.vlaanderen.be/agentschap-binnenlands-bestuur".
+
+cer:71879559ac2045499def_DUMMY_CER_A
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_A";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6>; #Actief
+  org:organization  bestuur:edca1c6822af59d219d3652bd749f7fb .
+
+
+#Dummy erkenningen
+<http://data.lblod.info/id/veranderingsgebeurtenissen/3940cca35440_DUMMY_CE_B>
+  rdf:type  org:ChangeEvent ;
+  mu:uuid "3940cca35440_DUMMY_CE_B" ;
+  contacthub:typeWijziging  concepts:3dd7550843eaf18e1fa1ca6c6c3f2610 ; # Erkenning Toegekend
+  org:resultingOrganization  bestuur:edca1c6822af59d219d3652bd749f7fb ;
+  dct:date  "2000-01-01T00:00:00"^^xsd:dateTime ;
+  dct:description  "Dummy CE erkenning toegekend (1)" ;
+  m8g:hasFormalFramework <http://lblod.data.info/id/besluiten/7151e2ca-21f9-42a9-a657-0bbab6aeec7d>;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_B.
+
+<http://lblod.data.info/id/besluiten/7151e2ca-21f9-42a9-a657-0bbab6aeec7d>
+  a besluit:Besluit;
+  mu:uuid "7151e2ca-21f9-42a9-a657-0bbab6aeec7d";
+  eli:date_publication "2000-01-01T00:00:00"^^xsd:dateTime;
+  foaf:page "https://www.vlaanderen.be/agentschap-binnenlands-bestuur".
+  
+cer:71879559ac2045499def_DUMMY_CER_B
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_B";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6>; #Actief
+  org:organization  bestuur:edca1c6822af59d219d3652bd749f7fb .
+
+
+<http://data.lblod.info/id/veranderingsgebeurtenissen/3940cca35440_DUMMY_CE_C>
+  rdf:type  org:ChangeEvent ;
+  mu:uuid "3940cca35440_DUMMY_CE_C" ;
+  contacthub:typeWijziging  concepts:3dd7550843eaf18e1fa1ca6c6c3f2610 ; # Erkenning Toegekend
+  org:resultingOrganization  bestuur:bbd46776125da4bd88e82e879863bbd6 ;
+  dct:date  "2001-01-01T00:00:00"^^xsd:dateTime ;
+  dct:description  "Dummy CE erkenning toegekend  (2)";
+  m8g:hasFormalFramework <http://lblod.data.info/id/besluiten/3e9b2e03-2888-4397-a2df-bc5a240accc1>;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_C.
+
+<http://lblod.data.info/id/besluiten/3e9b2e03-2888-4397-a2df-bc5a240accc1>
+  a besluit:Besluit;
+  mu:uuid "3e9b2e03-2888-4397-a2df-bc5a240accc1";
+  eli:date_publication "2001-01-01T00:00:00"^^xsd:dateTime;
+  foaf:page "https://www.vlaanderen.be/agentschap-binnenlands-bestuur".
+
+cer:71879559ac2045499def_DUMMY_CER_C
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_C";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6>; #Actief
+  org:organization  bestuur:bbd46776125da4bd88e82e879863bbd6 .
+
+
+<http://data.lblod.info/id/veranderingsgebeurtenissen/3940cca35440_DUMMY_CE_D>
+  rdf:type  org:ChangeEvent ;
+  mu:uuid "3940cca35440_DUMMY_CE_D" ;
+  contacthub:typeWijziging  concepts:3dd7550843eaf18e1fa1ca6c6c3f2610 ; # Erkenning Toegekend
+  org:resultingOrganization  bestuur:dc32dbe8d1f85999cd39a5c9893a9c7d ;
+  dct:date  "2002-01-01T00:00:00"^^xsd:dateTime ;
+  dct:description  "Dummy CE erkenning toegekend  (3)";
+  m8g:hasFormalFramework <http://lblod.data.info/id/besluiten/e09c3d9e-9230-4a13-9ba7-83cf1a055a05>;
+  code:veranderingsgebeurtenisResultaat cer:71879559ac2045499def_DUMMY_CER_D.
+
+<http://lblod.data.info/id/besluiten/e09c3d9e-9230-4a13-9ba7-83cf1a055a05>
+  a besluit:Besluit;
+  mu:uuid "e09c3d9e-9230-4a13-9ba7-83cf1a055a05";
+  eli:date_publication  "2002-01-01T00:00:00"^^xsd:dateTime;
+  foaf:page "https://www.vlaanderen.be/agentschap-binnenlands-bestuur".
+
+cer:71879559ac2045499def_DUMMY_CER_D
+  a code:VeranderingsgebeurtenisResultaat;
+  mu:uuid "71879559ac2045499def_DUMMY_CER_D";
+  code:resulterendeStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6>; #Actief
+  org:organization  bestuur:dc32dbe8d1f85999cd39a5c9893a9c7d .

config/dispatcher/dispatcher.ex

@@ -128,6 +128,10 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/change-event-types/"
   end
 
+  match "/change-event-results/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://cache/change-event-results/"
+  end
+
   match "/organization-status-codes/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://cache/organization-status-codes/"
   end
@@ -186,11 +190,15 @@ defmodule Dispatcher do
   match "/site-types/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://cache/site-types/"
   end
-  
+
   match "/request-reasons/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://cache/request-reasons/"
   end
 
+  match "/decisions/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://cache/decisions/"
+  end
+
 
   ###############
   # LOGIN

config/migrations/2022/20220125185900-rename-change-event-result-relationship-predicate.sparql

@@ -0,0 +1,18 @@
+PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX org: <http://www.w3.org/ns/org#>
+
+DELETE {
+    GRAPH ?g {
+      ?changeEventResult org:organization ?organization .
+    }
+} INSERT {
+    GRAPH ?g {
+      ?changeEventResult ext:resultingOrganization ?organization .
+    }
+} WHERE {
+  GRAPH ?g {
+    ?changeEventResult a <http://lblod.data.gift/vocabularies/organisatie/VeranderingsgebeurtenisResultaat> ;
+            org:organization ?organization .
+  }
+}

config/migrations/2022/20220202120000-primary-contacts.sparql

@@ -0,0 +1,22 @@
+# cf 20220110100000-secondary-contacts.sparql for context.
+# In case it's not a secondary contactpoint (a contactpoint without an address if multiple contact points exist for one entity/mandataris)
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX schema: <http://schema.org/>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?contactPoint
+      schema:contactType "Primary"
+  }
+}
+WHERE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?contactPoint 
+      a schema:ContactPoint.
+    FILTER NOT EXISTS {
+      ?contactPoint
+        schema:contactType "Secondary"
+    }
+  }
+}

config/migrations/2022/20220203100000-secondary-contacts.sparql

@@ -0,0 +1,24 @@
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX schema: <http://schema.org/>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?secondary
+      schema:contactType "Secondary"
+  }
+}
+WHERE  {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?primary 
+      a schema:ContactPoint;
+      locn:address ?a1;
+      schema:telephone ?t1.
+    ?mandataris schema:contactPoint ?primary, ?secondary.
+    ?secondary
+      schema:telephone ?t2.
+    FILTER NOT EXISTS {
+     ?secondary locn:address ?a2.
+    }
+  }
+}    

config/migrations/2022/20220304152947-delete-centraal-kerkbestuur-wachtebeke.sparql

@@ -0,0 +1,38 @@
+DELETE {
+  GRAPH ?g {
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+    ?bestuur ?pbestuur ?obestuur .
+    ?primarySite ?pprimarySite ?oprimarySite .
+    ?address ?paddress ?oaddress .
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+    ?identifier ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?bestuur {
+      <http://data.lblod.info/id/centraleBesturenVanDeEredienst/6167E3E2375CFC000A0007C2>
+      <http://data.lblod.info/id/centraleBesturenVanDeEredienst/616FE419375CFC000A000893>
+    }
+
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+
+    ?bestuur <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite ;
+      <http://www.w3.org/ns/adms#identifier> ?identifier ;
+      ?pbestuur ?obestuur .
+
+    ?primarySite <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?address ;
+      <http://www.w3.org/ns/org#siteAddress> ?contactPoint ;
+      ?pprimarySite ?oprimarySite .
+
+    ?address ?paddress ?oaddress .
+
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+    ?identifier <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+}
+

config/migrations/2022/20220307092611-update-date-change-event-Zonhoven.sparql

@@ -0,0 +1,15 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-11-28"^^xsd:date .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-12-20"^^xsd:date .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-11-28"^^xsd:date .
+  }
+}

config/migrations/2022/20220307104523-update-change-event-glabbeek.sparql

@@ -0,0 +1,26 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
+      dct:date "2021-02-04"^^xsd:date .
+    <http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> . # Actief
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
+      dct:date "2022-02-04"^^xsd:date .
+    <http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
+      regorg:orgStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> . # Niet Actief
+
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
+      dct:date "2021-02-04"^^xsd:date .
+    <http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
+  }
+}

config/migrations/2022/20220307140756-remove-duplicated-bestuurseenheden.sparql

@@ -0,0 +1,77 @@
+# Splitting the query in two because of execution time
+
+## Links to the bestuur
+
+
+
+DELETE {
+  GRAPH ?g {
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+    ?orgaanInTijd ?porgaanInTijd ?oorgaanInTijd .
+    ?orgaan ?porgaan ?oorgaan .
+    ?betrokken ?pbetrokken ?obetrokken .
+    ?eenheid <http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur> ?betrokken .
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?bestuur {
+      <http://data.lblod.info/id/besturenVanDeEredienst/6183A207375CFC000A000933>
+      <http://data.lblod.info/id/besturenVanDeEredienst/61AE0A9B3C1A230C43B44FFF>
+    }
+
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+
+    OPTIONAL {
+      ?orgaanInTijd <http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuur ;
+        ?porgaanInTijd ?oorgaanInTijd .
+      
+      ?orgaan <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan> ?orgaanInTijd ;
+        ?porgaan ?oorgaan .
+    }
+
+    OPTIONAL {
+      ?betrokken <http://www.w3.org/ns/org#organization> ?bestuur ;
+        ?pbetrokken ?obetrokken .
+      ?eenheid <http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur> ?betrokken .
+    }
+  }
+}
+
+;
+
+## Links from the bestuur
+
+DELETE {
+  GRAPH ?g {
+    ?bestuur ?pbestuur ?obestuur .
+    ?primarySite ?pprimarySite ?oprimarySite .
+    ?address ?paddress ?oaddress .
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+    ?identifier ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?bestuur {
+      <http://data.lblod.info/id/besturenVanDeEredienst/6183A207375CFC000A000933>
+      <http://data.lblod.info/id/besturenVanDeEredienst/61AE0A9B3C1A230C43B44FFF>
+    }
+
+    ?bestuur <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite ;
+      <http://www.w3.org/ns/adms#identifier> ?identifier ;
+      ?pbestuur ?obestuur .
+
+    ?primarySite <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?address ;
+      <http://www.w3.org/ns/org#siteAddress> ?contactPoint ;
+      ?pprimarySite ?oprimarySite .
+
+    ?address ?paddress ?oaddress .
+
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+    ?identifier <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+}

config/migrations/20220110120000-delete-old-change-events.sparql

@@ -0,0 +1,8 @@
+delete { GRAPH ?g {?s ?p ?o} }
+
+where {
+ GRAPH ?g {
+    ?s a ?type; ?p ?o.
+    filter(?type = <http://www.w3.org/ns/org#ChangeEvent> || ?p = <http://www.w3.org/ns/org#resultedFrom>)
+ }
+}

config/migrations/20220120100418-remove-old-reasons.sparql

@@ -0,0 +1,11 @@
+DELETE {
+  GRAPH  <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?s ?p ?o
+  }
+}
+ WHERE {
+  GRAPH  <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?s a <http://mu.semte.ch/vocabularies/ext/ReasonCode>;
+        ?p ?o.
+  }
+}

config/migrations/20220120101318-insert-new-reasons.sparql

@@ -0,0 +1,37 @@
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+
+ INSERT DATA {
+  GRAPH  <http://mu.semte.ch/graphs/organisatieportaal> {
+    <http://data.lblod.info/id/information-request-reason/3aeec145-acf3-4b6e-9c00-5b8e285736e0> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3aeec145-acf3-4b6e-9c00-5b8e285736e0";
+        skos:prefLabel "Aanmaken van een persoon".
+
+    <http://data.lblod.info/id/information-request-reason/3beec145-acf3-4b6e-9c00-5b8e285736e1> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3beec145-acf3-4b6e-9c00-5b8e285736e1";
+        skos:prefLabel "In het kader van administratief toezicht".
+
+    <http://data.lblod.info/id/information-request-reason/3beec145-acf3-4b6e-9c00-5b8e285736e2> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3beec145-acf3-4b6e-9c00-5b8e285736e2";
+        skos:prefLabel "In het kader van een screeningsdossier".
+
+    <http://data.lblod.info/id/information-request-reason/3beec145-acf3-4b6e-9c00-5b8e285736e3> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3beec145-acf3-4b6e-9c00-5b8e285736e3";
+        skos:prefLabel "In het kader van een erkenningsdossier".
+
+    <http://data.lblod.info/id/information-request-reason/3beec145-acf3-4b6e-9c00-5b8e285736e4> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3beec145-acf3-4b6e-9c00-5b8e285736e4";
+        skos:prefLabel "In het kader van een wijzigingsdossier".
+
+    <http://data.lblod.info/id/information-request-reason/3beec145-acf3-4b6e-9c00-5b8e285736e5> a ext:ReasonCode,
+        skos:Concept;
+        mu:uuid "3beec145-acf3-4b6e-9c00-5b8e285736e5";
+        skos:prefLabel "In het kader van een informatie-uitwisseling (cfr. protocol) met een overheidsinstelling".
+  }
+}

config/resources/change-events.json

@@ -0,0 +1,104 @@
+{
+  "version": "0.1",
+  "prefixes": {
+    "ch": "http://data.lblod.info/vocabularies/contacthub/",
+    "code": "http://lblod.data.gift/vocabularies/organisatie/",
+    "dc_terms": "http://purl.org/dc/terms/",
+    "euro": "http://data.europa.eu/m8g/",
+    "ext": "http://mu.semte.ch/vocabularies/ext/",
+    "org": "http://www.w3.org/ns/org#",
+    "regorg": "http://www.w3.org/ns/regorg#",
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "foaf": "http://xmlns.com/foaf/0.1/"
+  },
+  "resources": {
+    "change-events": {
+      "class": "org:ChangeEvent",
+      "attributes": {
+        "date": {
+          "type": "date",
+          "predicate": "dc_terms:date"
+        },
+        "description": {
+          "type": "string",
+          "predicate": "dc_terms:description"
+        }
+      },
+      "relationships": {
+        "type": {
+          "predicate": "ch:typeWijziging",
+          "target": "change-event-types",
+          "cardinality": "one"
+        },
+        "resulting-organizations": {
+          "predicate": "org:resultingOrganization",
+          "target": "organizations",
+          "cardinality": "many"
+        },
+        "original-organizations": {
+          "predicate": "org:originalOrganization",
+          "target": "organizations",
+          "cardinality": "many"
+        },
+        "results": {
+          "predicate": "code:veranderingsgebeurtenisResultaat",
+          "target": "change-event-results",
+          "cardinality": "many"
+        },
+        "decision": {
+          "predicate": "http://data.europa.eu/m8g/hasFormalFramework",
+          "target": "decisions",
+          "cardinality": "one"
+        }
+      },
+      "new-resource-base": "http://data.lblod.info/id/veranderingsgebeurtenissen/"
+    },
+    "change-event-results": {
+      "class": "code:VeranderingsgebeurtenisResultaat",
+      "attributes": {},
+      "relationships": {
+        "resulting-organization": {
+          "predicate": "ext:resultingOrganization",
+          "target": "organizations",
+          "cardinality": "one"
+        },
+        "status": {
+          "predicate": "code:resulterendeStatus",
+          "target": "organization-status-codes",
+          "cardinality": "one"
+        },
+        "result-from": {
+          "predicate": "code:veranderingsgebeurtenisResultaat",
+          "target": "change-events",
+          "cardinality": "one",
+          "inverse": true
+        }
+      },
+      "new-resource-base": "http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/"
+    },
+    "change-event-types": {
+      "class": "code:Veranderingsgebeurtenis",
+      "attributes": {
+        "label": {
+          "type": "string",
+          "predicate": "skos:prefLabel"
+        }
+      },
+      "new-resource-base": "http://lblod.data.gift/concepts/"
+    },
+    "decisions": {
+      "class": "http://data.vlaanderen.be/ns/besluit#Besluit",
+      "attributes": {
+        "publication-date": {
+          "type": "date",
+          "predicate": "http://data.europa.eu/eli/ontology#date_publication"
+        },
+        "document-link": {
+          "type": "url",
+          "predicate": "foaf:page"
+        }
+      },
+      "new-resource-base": "http://lblod.data.info/id/besluiten/"
+    }
+  }
+}

config/resources/domain.json

@@ -63,11 +63,11 @@
       "class": "ch:AgentInPositie",
       "attributes": {
         "agent-start-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "ch:startdatum"
         },
         "agent-end-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "ch:eindedatum"
         }
       },
@@ -117,11 +117,11 @@
       "super": ["agents-in-position"],
       "attributes": {
         "start-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "mandaat:start"
         },
         "end-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "mandaat:einde"
         }
       },
@@ -165,7 +165,7 @@
       "super": ["mandatories"],
       "attributes": {
         "expected-end-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "ere:geplandeEinddatumAanstelling"
         },
         "reason-stopped": {
@@ -210,6 +210,10 @@
         "website": {
           "type": "uri",
           "predicate": "foaf:page"
+        },
+        "type": {
+          "type": "string",
+          "predicate": "schema:contactType"
         }
       }, 
       "relationships": {
@@ -299,14 +303,22 @@
           "cardinality": "many"
         },
         "changed-by": {
-          "predicate": "org:changedBy",
+          "predicate": "org:originalOrganization",
           "target": "change-events",
-          "cardinality": "many"
+          "cardinality": "many",
+          "inverse": true
         },
         "resulted-from": {
-          "predicate": "org:resultedFrom",
+          "predicate": "org:resultingOrganization",
           "target": "change-events",
-          "cardinality": "many"
+          "cardinality": "many",
+          "inverse": true
+        },
+        "change-event-results": {
+          "predicate": "ext:resultingOrganization",
+          "target": "change-event-results",
+          "cardinality": "many",
+          "inverse": true
         },
         "positions": {
           "predicate": "org:hasPost",
@@ -454,11 +466,11 @@
       "class": "besluit:Bestuursorgaan",
       "attributes": {
         "start-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "mandaat:bindingStart"
         },
         "end-date": {
-          "type": "datetime",
+          "type": "date",
           "predicate": "mandaat:bindingEinde"
         }
       },
@@ -628,49 +640,6 @@
       },
       "new-resource-base": "http://data.lblod.info/id/vestigingen/"
     },
-    "change-events": {
-      "class": "org:ChangeEvent",
-      "attributes": {
-        "date": {
-          "type": "datetime",
-          "predicate": "dc_terms:date"
-        },
-        "description": {
-          "type": "string",
-          "predicate": "dc_terms:description"
-        }
-      },
-      "relationships": {
-        "type": {
-          "predicate": "ch:typeWijziging",
-          "target": "change-event-types",
-          "cardinality": "one"
-        },
-        "resulting-organization": {
-          "predicate": "org:resultedFrom",
-          "target": "organizations",
-          "cardinality": "many",
-          "inverse": true
-        },
-        "original-organization": {
-          "predicate": "org:changedBy",
-          "target": "organizations",
-          "cardinality": "many",
-          "inverse": true
-        }
-      },
-      "new-resource-base": "http://data.lblod.info/id/veranderingsgebeurtenissen/"
-    },
-    "change-event-types": {
-      "class": "code:Veranderingsgebeurtenis",
-      "attributes": {
-        "label": {
-          "type": "string",
-          "predicate": "skos:prefLabel"
-        }
-      },
-      "new-resource-base": "http://lblod.data.gift/concepts/"
-    },
     "concepts": {
       "class": "skos:Concept",
       "attributes": {

config/resources/domain.lisp

@@ -12,6 +12,7 @@
 
 (read-domain-file "domain.json")
 (read-domain-file "auth.json")
+(read-domain-file "change-events.json")
 (read-domain-file "files-domain.lisp")
 (read-domain-file "dcat.json")
 (read-domain-file "privacy-centric-service.json")

docker-compose.yml

@@ -79,7 +79,7 @@ services:
     restart: always
     logging: *default-logging
   kalliope-api:
-    image: lblod/jsonld-delta-service:0.5.1
+    image: lblod/jsonld-delta-service:0.5.4
     volumes:
       - ./config/kalliope:/config
       - ./data/files:/share
@@ -137,7 +137,7 @@ services:
     restart: always
     logging: *default-logging
   privacy:
-    image: lblod/privacy-centric-service:0.2.0
+    image: lblod/privacy-centric-service:0.3.0
     labels:
       - "logging=true"
     environment:
@@ -146,6 +146,7 @@ services:
       LOGGING_LEVEL: "INFO"
       DEFAULT_GRAPH: "http://mu.semte.ch/graphs/privacy-centric-graph"
       SESSION_GRAPH: "http://mu.semte.ch/graphs/sessions"
+      APP_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
     labels:
       - "logging=true"
     restart: always
@@ -157,7 +158,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-contact-hub:1.3.0
+    image: lblod/frontend-contact-hub:1.6.0
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment:
@@ -280,7 +281,7 @@ services:
       DUMP_FILE_CREATION_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations'
       INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations'
       HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations'
-      CRON_PATTERN_DUMP_JOB: '30 9 8-18/2 * 1-5' # At second :30, at minute :09, every 2 hours between hours 08:00-18:00, on every Monday to Friday
+      CRON_PATTERN_DUMP_JOB: '30 9 8-18/2 * * MON-FRI' # At second :30, at minute :09, every 2 hours between hours 08am and 18pm, every day between Monday and Friday, every month
       CRON_PATTERN_HEALING_JOB: '0 0 4 * * *' # everyday at 4 AM
       START_INITIAL_SYNC: 'false' # prefer to disable it now. We want to have feeling with how the DB acts.
     labels: