fix regression mu search (#128)

Adds migrations to fix wrong data

.gitignore

@@ -27,3 +27,4 @@ source.json
 out.json
 security.yml
 config/proxy-https/proxy_ssl.conf
+/config/search/update-handler.store

README.md

@@ -1,6 +1,6 @@
-# Contact Hub
+# Organization portal
 
-Backend for the Contact Hub application based on the  mu.semte.ch microservices stack.
+Backend for the organization portal application, based on the mu.semte.ch microservices stack.
 
 ## How to
 

config/authorization/config.ex

@@ -10,6 +10,7 @@ defmodule Acl.UserGroups.Config do
  @protected_resource_type [
                         "http://www.w3.org/ns/org#Organization",
                         "http://data.vlaanderen.be/ns/besluit#Besluit",
+                        "https://data.vlaanderen.be/ns/besluitvorming#Beslissingsactiviteit",
                         "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
                         "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst",
                         "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
@@ -23,7 +24,6 @@ defmodule Acl.UserGroups.Config do
                         "http://www.w3.org/ns/org#ChangeEvent",
                         "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen",
                         "http://data.lblod.info/vocabularies/erediensten/VerbondenJuridischeStructuren",
-                        "http://www.w3.org/ns/prov#Location",
                         "http://www.w3.org/ns/org#Site",
                         "http://www.w3.org/ns/locn#Address",
                         "http://www.w3.org/ns/person#Person",
@@ -69,7 +69,7 @@ defmodule Acl.UserGroups.Config do
   defp sparql_query_for_access_role( group_string ) do
     "PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
     PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
-    SELECT ?session_group ?session_role WHERE {
+    SELECT distinct ?session_group ?session_role WHERE {
       <SESSION_ID> ext:sessionGroup/mu:uuid ?session_group;
                    ext:sessionRole ?session_role.
       FILTER( ?session_role = \"#{group_string}\" )
@@ -117,30 +117,6 @@ defmodule Acl.UserGroups.Config do
           }
         ]
       },
-           %GroupSpec{
-        name: "ch-lezer",
-        useage: [:read],
-        access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ),
-        graphs: [ %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
-                    constraint: %ResourceConstraint{
-                      resource_types: @protected_resource_type } } ] },
-           %GroupSpec{
-        name: "ch-editeerder",
-        useage: [:read, :write, :read_for_write],
-        access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ),
-        graphs: [ %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
-                    constraint: %ResourceConstraint{
-                      resource_types: @protected_resource_type } } ] },
-           %GroupSpec{
-        name: "ch-beheerder",
-        useage: [:read, :write, :read_for_write],
-        access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ),
-        graphs: [ %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
-                    constraint: %ResourceConstraint{
-                      resource_types: @protected_resource_type } } ] },
       %GroupSpec{
         name: "public",
         useage: [:read],

config/delta-producer/administrative-units/export.json

@@ -49,17 +49,6 @@
         "http://www.w3.org/2004/02/skos/core#prefLabel",
         "http://www.w3.org/2004/02/skos/core#scopeNote"
       ]
-    },
-    {
-      "type": "http://www.w3.org/ns/prov#Location",
-      "graphsFilter": [
-        "http://mu.semte.ch/graphs/organisatieportaal"
-      ],
-      "properties": [
-        "http://mu.semte.ch/vocabularies/core/uuid",
-        "http://www.w3.org/2000/01/rdf-schema#label",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau"
-      ]
     }
   ]
 }

config/delta-producer/organizations/export.json

@@ -306,17 +306,6 @@
         "http://www.w3.org/2004/02/skos/core#prefLabel"
       ]
     },
-    {
-      "type": "http://www.w3.org/ns/prov#Location",
-      "graphsFilter": [
-        "http://mu.semte.ch/graphs/organisatieportaal"
-      ],
-      "properties": [
-        "http://www.w3.org/2000/01/rdf-schema#label",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau",
-        "http://data.vlaanderen.be/ns/besluit#werkingsgebied"
-      ]
-    },
     {
       "type": "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid",
       "graphsFilter": [

config/delta/rules.js

@@ -1,4 +1,21 @@
 export default [
+  {
+    match: {
+      graph: {
+        type: "uri",
+        value: "http://mu.semte.ch/graphs/organisatieportaal"
+      }
+    },
+    callback: {
+      url: 'http://search/update',
+      method: 'POST'
+    },
+    options: {
+      resourceFormat: "v0.0.1",
+      gracePeriod: 10000,
+      ignoreFromSelf: true
+    }
+  },
   {
     match: {
       predicate: {

config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled

@@ -42,6 +42,7 @@ DELETE {
       ?address adres:gemeentenaam ?gemeente_s.
     }
 } WHERE {
+  VALUES ?g { <http://mu.semte.ch/graphs/organisatieportaal> <http://redpencil.data.gift/id/deltas/producer/organizations>}
   GRAPH ?g {
     BIND("REPLACE_ME_WITH_A_RANDOM_STRING" AS ?salt).
     ?person a person:Person.

config/dispatcher/dispatcher.ex

@@ -136,10 +136,6 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/organization-status-codes/"
   end
 
-  match "/locations/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://cache/locations/"
-  end
-
   match "/involvement-types/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://cache/involvement-types/"
   end
@@ -199,6 +195,9 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/decisions/"
   end
 
+  match "/decision-activities/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://cache/decision-activities/"
+  end
 
   ###############
   # LOGIN
@@ -222,6 +221,14 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://login/sessions/"
   end
 
+  ###############################################################
+  # SEARCH
+  ###############################################################
+
+  match "/search/*path", %{  accept: %{ json: true }, layer: :api_services} do
+   IO.puts("hey")
+    Proxy.forward conn, path, "http://search/"
+  end
 
   ###############
   # API SERVICES
@@ -231,10 +238,6 @@ defmodule Dispatcher do
     forward conn, path, "http://kalliope-api/v3/api-docs/"
   end
 
-  match "/changes/*path", %{ layer: :api_services, accept: %{ json: true } } do
-    forward conn, path, "http://kalliope-api/changes/"
-  end
-
   match "/consolidated/*path", %{ layer: :api_services, accept: %{ json: true } } do
     forward conn, path, "http://kalliope-api/consolidated/"
   end
@@ -251,6 +254,14 @@ defmodule Dispatcher do
     forward conn, path, "http://privacy/person-information-requests"
   end
 
+  match "/person-information-ask/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://privacy/person-information-ask/"
+  end
+
+  match "/person-information-validate-ssn/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://privacy/person-information-validate-ssn/"
+  end
+
   get "/uri-info/*path", %{ layer: :api_services, accept: %{ json: true } } do
     forward conn, path, "http://uri-info/"
   end

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/2022/20220308092436-delete-werkingsgebieden.sparql

@@ -0,0 +1,10 @@
+DELETE {
+  GRAPH ?g {
+    ?s ?p ?o .
+  }
+} WHERE {
+  GRAPH ?g {
+    ?s a <http://www.w3.org/ns/prov#Location> ;
+      ?p ?o .
+  }
+}

config/migrations/2022/20220317100000-remove-bestuurseenheden-op-1075.sparql

@@ -0,0 +1,36 @@
+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/besturenVanDeEredienst/616FE3A6375CFC000A00088B>
+      <http://data.lblod.info/id/besturenVanDeEredienst/61839F8F375CFC000A00092B>
+    }
+
+    ?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/20220328171923-update-date-change-event-Eeklo.sparql

@@ -0,0 +1,15 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-09"^^xsd:date .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-15"^^xsd:date .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-09"^^xsd:date .
+  }
+}

config/migrations/2022/20220328172743-update-date-change-event-Glabbeek.sparql

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

config/migrations/2022/20220329114750-remove-kbo-of-Centraal-Comite-van-de-Anglicaanse-Eredienst-in-Belgie.sparql

@@ -0,0 +1,19 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/representatieveOrganen/bf83abb71bd810ad1ebe05ac8cb72a1c>
+      <http://www.w3.org/ns/adms#identifier> ?identifier .
+    ?identifier
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/representatieveOrganen/bf83abb71bd810ad1ebe05ac8cb72a1c>
+      <http://www.w3.org/ns/adms#identifier> ?identifier .
+    ?identifier
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+}

config/migrations/2022/20220329150729-delete-positions-Protestantse-Kerk-van-Kortrijk.sparql

@@ -0,0 +1,38 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/eredienstbestuursorganen/3c07a7f0db44632737d1657ea9035e9f>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      <http://schema.org/contactPoint> ?contactPoint ;
+      ?prole ?orole .
+
+    ?contactPoint <http://www.w3.org/ns/locn#address> ?address ;
+      ?pcontactPoint ?ocontactPoint .
+
+    ?address ?paddress ?oaddress .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/eredienstbestuursorganen/3c07a7f0db44632737d1657ea9035e9f>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      ?prole ?orole .
+
+    OPTIONAL {
+      ?role <http://schema.org/contactPoint> ?contactPoint .
+
+      ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+      OPTIONAL {
+        ?contactPoint <http://www.w3.org/ns/locn#address> ?address .
+        ?address ?paddress ?oaddress .
+      }
+    }
+  }
+}

config/migrations/2022/20220329154322-delete-positions-ckb-staden.sparql

@@ -0,0 +1,38 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centralebestuursorganen/d2b5a4e1a4e66c9e0319f4704c96bf4c>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      <http://schema.org/contactPoint> ?contactPoint ;
+      ?prole ?orole .
+
+    ?contactPoint <http://www.w3.org/ns/locn#address> ?address ;
+      ?pcontactPoint ?ocontactPoint .
+
+    ?address ?paddress ?oaddress .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centralebestuursorganen/d2b5a4e1a4e66c9e0319f4704c96bf4c>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      ?prole ?orole .
+
+    OPTIONAL {
+      ?role <http://schema.org/contactPoint> ?contactPoint .
+
+      ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+      OPTIONAL {
+        ?contactPoint <http://www.w3.org/ns/locn#address> ?address .
+        ?address ?paddress ?oaddress .
+      }
+    }
+  }
+}

config/migrations/2022/20220401162146-fix-wrongly-formatted-kbo.sparql

@@ -0,0 +1,51 @@
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator ?kbo1 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator ?kbo2 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator ?kbo3 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator ?kbo4 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator ?kbo5 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator ?kbo6 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator ?kbo7 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator ?kbo8 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator ?kbo9 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator ?kbo10 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator ?kbo11 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator ?kbo12 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator ?kbo13 .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator "0777683642" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator "0780386972" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator "0408140861" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator "0408472839" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator "0409677223" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator "0409771253" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator "0410195380" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator "0412914944" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator "0413234648" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator "0464533790" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator "0687815914" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator "0864330673" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator "0898987189" .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator ?kbo1 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator ?kbo2 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator ?kbo3 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator ?kbo4 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator ?kbo5 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator ?kbo6 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator ?kbo7 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator ?kbo8 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator ?kbo9 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator ?kbo10 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator ?kbo11 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator ?kbo12 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator ?kbo13 .
+  }
+}

config/migrations/2022/20220406134511-change-status-ckb-melle.sparql

@@ -0,0 +1,19 @@
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> . # Actief
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> . # Niet Actief
+
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
+  }
+}

config/resources/change-events.json

@@ -98,7 +98,32 @@
           "predicate": "foaf:page"
         }
       },
+      "relationships": {
+        "has-decision-activity": {
+          "predicate": "http://www.w3.org/ns/prov#generated",
+          "target": "decision-activities",
+          "cardinality": "one",
+          "inverse": true
+        }
+      },
       "new-resource-base": "http://lblod.data.info/id/besluiten/"
+    },
+    "decision-activities": {
+      "class": "https://data.vlaanderen.be/ns/besluitvorming#Beslissingsactiviteit",
+      "attributes": {
+        "end-date": {
+          "type": "date",
+          "predicate": "https://data.vlaanderen.be/ns/dossier#Activiteit.einddatum"
+        }
+      },
+      "relationships": {
+        "gives-cause-to": {
+          "predicate": "http://www.w3.org/ns/prov#generated",
+          "target": "decisions",
+          "cardinality": "many"
+        }
+      },
+      "new-resource-base": "http://lblod.data.info/id/beslissingsactiviteit/"
     }
   }
 }

config/resources/domain.json

@@ -46,9 +46,10 @@
       },
       "relationships": {
         "mandatories": {
-          "predicate": "mandaat:isAangesteldAls",
+          "predicate": "mandaat:isBestuurlijkeAliasVan",
           "target": "mandatories",
-          "cardinality": "many"
+          "cardinality": "many",
+          "inverse": true
         },
         "agents-in-position": {
           "predicate": "org:heldBy",
@@ -210,6 +211,10 @@
         "website": {
           "type": "uri",
           "predicate": "foaf:page"
+        },
+        "type": {
+          "type": "string",
+          "predicate": "schema:contactType"
         }
       }, 
       "relationships": {
@@ -365,11 +370,6 @@
           "predicate": "ere:betrokkenBestuur",
           "target": "local-involvements",
           "cardinality": "many"
-        },
-        "scope": {
-          "predicate": "besluit:werkingsgebied",
-          "target": "locations",
-          "cardinality": "one"
         }
       },
       "new-resource-base": "http://data.lblod.info/id/bestuurseenheden/"
@@ -392,6 +392,11 @@
           "predicate": "ere:typeEredienst",
           "target": "recognized-worship-types",
           "cardinality": "one"
+        },
+        "minister-positions": {
+          "predicate": "ere:wordtBediendDoor",
+          "target": "minister-positions",
+          "cardinality": "many"
         }
       },
       "new-resource-base": "http://data.lblod.info/id/eredienstBestuurseenheden/"
@@ -416,11 +421,6 @@
           "target": "local-involvements",
           "cardinality": "many",
           "inverse": true
-        },
-        "minister-positions": {
-          "predicate": "ere:wordtBediendDoor",
-          "target": "minister-positions",
-          "cardinality": "many"
         }
       },
       "new-resource-base": "http://data.lblod.info/id/besturenVanDeEredienst/"
@@ -661,28 +661,6 @@
       "features": ["include-uri"],
       "new-resource-base": "http://lblod.data.gift/concepts/"
     },
-    "locations": {
-      "class": "prov:Location",
-      "attributes": {
-        "label": {
-          "type": "string",
-          "predicate": "rdfs:label"
-        },
-        "level": {
-          "type": "string",
-          "predicate": "ext:werkingsgebiedNiveau"
-        }
-      },
-      "relationships": {
-        "administrative-units": {
-          "predicate": "besluit:werkingsgebied",
-          "target": "administrative-units",
-          "cardinality": "many",
-          "inverse": true
-        }
-      },
-      "new-resource-base": "http://data.lblod.info/id/werkingsgebieden/"
-    },
     "involvement-types": {
       "class": "code:TypeBetrokkenheid",
       "attributes": {
@@ -778,7 +756,7 @@
         },
         "worship-service": {
           "predicate": "ere:wordtBediendDoor",
-          "target": "worship-services",
+          "target": "worship-administrative-units",
           "cardinality": "one",
           "inverse": true
         },

config/search/config.json

@@ -0,0 +1,660 @@
+{
+  "automatic_index_updates": true,
+  "persist_indexes": true,
+  "number_of_threads": 6,
+  "eager_indexing_groups": [
+    [
+      {
+        "variables": [],
+        "name": "acmidm-lezer"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-editeerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-beheerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-beheerder"
+      },
+      {
+        "variables": [],
+        "name": "acmidm-editeerder"
+      },
+      {
+        "variables": [],
+        "name": "acmidm-lezer"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-editeerder"
+      },
+      {
+        "variables": [],
+        "name": "acmidm-lezer"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-editeerder"
+      },
+      {
+        "variables": [],
+        "name": "acmidm-beheerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-lezer"
+      },
+      {
+        "variables": [],
+        "name": "acmidm-beheerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ]
+  ],
+  "types": [
+    {
+      "type": "mandatory",
+      "on_path": "mandatories",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris",
+      "properties": {
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
+        "id": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "uuid": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "family_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/familyName"
+        ],
+        "first_name_used": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
+        ],
+        "end_date": "http://data.vlaanderen.be/ns/mandaat#einde",
+        "organization_id": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "organization_name": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "organization_municipality": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ],
+        "organization_province": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "position_id": [
+          "http://www.w3.org/ns/org#holds",
+          "http://www.w3.org/ns/org#role",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "position_name": [
+          "http://www.w3.org/ns/org#holds",
+          "http://www.w3.org/ns/org#role",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "minister",
+      "on_path": "ministers",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
+      "sub_types": [
+        "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
+      ],
+      "properties": {
+        "given_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
+        "id": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "uuid": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "family_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/familyName"
+        ],
+        "first_name_used": [
+          "http://www.w3.org/ns/org#heldBy",
+          "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
+        ],
+        "end_date": "http://data.lblod.info/vocabularies/contacthub/eindedatum",
+        "organization_id": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "organization_name": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "organization_municipality": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ],
+        "organization_province": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "position_id": [
+          "http://www.w3.org/ns/org#holds",
+          "http://data.lblod.info/vocabularies/erediensten/functie",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "position_name": [
+          "http://www.w3.org/ns/org#holds",
+          "http://data.lblod.info/vocabularies/erediensten/functie",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "person",
+      "composite_types": [
+        "minister",
+        "mandatory"
+      ],
+      "on_path": "people",
+      "properties": [
+        {
+          "name": "given_name",
+          "mappings": {
+            "minister": "given_name",
+            "mandatory": "given_name"
+          }
+        },
+        {
+          "name": "id",
+          "mappings": {
+            "minister": "id",
+            "mandatory": "id"
+          }
+        },
+        {
+          "name": "family_name",
+          "mappings": {
+            "minister": "family_name",
+            "mandatory": "family_name"
+          }
+        },
+        {
+          "name": "first_name_used",
+          "mappings": {
+            "minister": "first_name_used",
+            "mandatory": "first_name_used"
+          }
+        },
+        {
+          "name": "end_date",
+          "mappings": {
+            "minister": "end_date",
+            "mandatory": "end_date"
+          }
+        },
+        {
+          "name": "organization_id",
+          "mappings": {
+            "minister": "organization_id",
+            "mandatory": "organization_id"
+          }
+        },
+        {
+          "name": "organization_name",
+          "mappings": {
+            "minister": "organization_name",
+            "mandatory": "organization_name"
+          }
+        },
+        {
+          "name": "organization_municipality",
+          "mappings": {
+            "minister": "organization_municipality",
+            "mandatory": "organization_municipality"
+          }
+        },
+        {
+          "name": "organization_province",
+          "mappings": {
+            "minister": "organization_province",
+            "mandatory": "organization_province"
+          }
+        },
+        {
+          "name": "position_id",
+          "mappings": {
+            "minister": "position_id",
+            "mandatory": "position_id"
+          }
+        },
+        {
+          "name": "position_name",
+          "mappings": {
+            "minister": "position_name",
+            "mandatory": "position_name"
+          }
+        }
+      ],
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "unit",
+      "on_path": "units",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid",
+      "sub_types": [
+        "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst",
+        "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst"
+      ],
+      "properties": {
+        "name": "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "classification_id": [
+          "http://www.w3.org/ns/org#classification",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "classification_name": [
+          "http://www.w3.org/ns/org#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "status": [
+          "http://www.w3.org/ns/regorg#orgStatus",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "status_id": [
+          "http://www.w3.org/ns/regorg#orgStatus",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "recognized_worship_type_id": [
+          "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "recognized_worship_type_name": [
+          "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "province": [
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "municipality": [
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "classification_id": {
+            "type": "text"
+          },
+          "recognized_worship_type_id": {
+            "type": "text"
+          },
+          "name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "classification_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "status": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "recognized_worship_type_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

config/search/dev/config.json

@@ -0,0 +1,584 @@
+{
+  "automatic_index_updates": true,
+  "persist_indexes": true,
+  "number_of_threads": 6,
+  "eager_indexing_groups": [
+    [
+      {
+        "variables": [],
+        "name": "acmidm-lezer"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-editeerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ],
+    [
+      {
+        "variables": [],
+        "name": "acmidm-beheerder"
+      },
+      {
+        "variables": [],
+        "name": "clean"
+      },
+      {
+        "variables": [],
+        "name": "public"
+      }
+    ]
+  ],
+  "types": [
+    {
+      "type": "mandatory",
+      "on_path": "mandatories",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris",
+      "properties": {
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
+        "id": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "uuid": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "family_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/familyName"
+        ],
+        "first_name_used": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
+        ],
+        "end_date": "http://data.vlaanderen.be/ns/mandaat#einde",
+        "organization_id": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "organization_name": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "organization_municipality": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ],
+        "organization_province": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://www.w3.org/ns/org#hasPost",
+          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+          "http://data.vlaanderen.be/ns/besluit#bestuurt",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "position_id": [
+          "http://www.w3.org/ns/org#holds",
+          "http://www.w3.org/ns/org#role",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "position_name": [
+          "http://www.w3.org/ns/org#holds",
+          "http://www.w3.org/ns/org#role",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "minister",
+      "on_path": "ministers",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar",
+      "sub_types": [
+        "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
+      ],
+      "properties": {
+        "given_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
+        "id": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "uuid": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "family_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/familyName"
+        ],
+        "first_name_used": [
+          "http://www.w3.org/ns/org#heldBy",
+          "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
+        ],
+        "end_date": "http://data.lblod.info/vocabularies/contacthub/eindedatum",
+        "organization_id": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "organization_name": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "organization_municipality": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ],
+        "organization_province": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "position_id": [
+          "http://www.w3.org/ns/org#holds",
+          "http://data.lblod.info/vocabularies/erediensten/functie",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "position_name": [
+          "http://www.w3.org/ns/org#holds",
+          "http://data.lblod.info/vocabularies/erediensten/functie",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "person",
+      "composite_types": [
+        "minister",
+        "mandatory"
+      ],
+      "on_path": "people",
+      "properties": [
+        {
+          "name": "given_name",
+          "mappings": {
+            "minister": "given_name",
+            "mandatory": "given_name"
+          }
+        },
+        {
+          "name": "id",
+          "mappings": {
+            "minister": "id",
+            "mandatory": "id"
+          }
+        },
+        {
+          "name": "family_name",
+          "mappings": {
+            "minister": "family_name",
+            "mandatory": "family_name"
+          }
+        },
+        {
+          "name": "first_name_used",
+          "mappings": {
+            "minister": "first_name_used",
+            "mandatory": "first_name_used"
+          }
+        },
+        {
+          "name": "end_date",
+          "mappings": {
+            "minister": "end_date",
+            "mandatory": "end_date"
+          }
+        },
+        {
+          "name": "organization_id",
+          "mappings": {
+            "minister": "organization_id",
+            "mandatory": "organization_id"
+          }
+        },
+        {
+          "name": "organization_name",
+          "mappings": {
+            "minister": "organization_name",
+            "mandatory": "organization_name"
+          }
+        },
+        {
+          "name": "organization_municipality",
+          "mappings": {
+            "minister": "organization_municipality",
+            "mandatory": "organization_municipality"
+          }
+        },
+        {
+          "name": "organization_province",
+          "mappings": {
+            "minister": "organization_province",
+            "mandatory": "organization_province"
+          }
+        },
+        {
+          "name": "position_id",
+          "mappings": {
+            "minister": "position_id",
+            "mandatory": "position_id"
+          }
+        },
+        {
+          "name": "position_name",
+          "mappings": {
+            "minister": "position_name",
+            "mandatory": "position_name"
+          }
+        }
+      ],
+      "mappings": {
+        "properties": {
+          "family_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "given_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "organization_municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "position_id": {
+            "type": "text"
+          },
+          "position_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "end_date": {
+            "type": "date"
+          }
+        }
+      }
+    },
+    {
+      "type": "unit",
+      "on_path": "units",
+      "rdf_type": "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid",
+      "sub_types": [
+        "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst",
+        "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst"
+      ],
+      "properties": {
+        "name": "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "classification_id": [
+          "http://www.w3.org/ns/org#classification",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "classification_name": [
+          "http://www.w3.org/ns/org#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "status": [
+          "http://www.w3.org/ns/regorg#orgStatus",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "status_id": [
+          "http://www.w3.org/ns/regorg#orgStatus",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "recognized_worship_type_id": [
+          "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+          "http://mu.semte.ch/vocabularies/core/uuid"
+        ],
+        "recognized_worship_type_name": [
+          "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
+        "province": [
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "http://www.w3.org/ns/locn#adminUnitL2"
+        ],
+        "municipality": [
+          "http://www.w3.org/ns/org#hasPrimarySite",
+          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
+        ]
+      },
+      "mappings": {
+        "properties": {
+          "classification_id": {
+            "type": "text"
+          },
+          "recognized_worship_type_id": {
+            "type": "text"
+          },
+          "name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "classification_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "status": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "recognized_worship_type_name": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
+          "municipality": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

docker-compose.dev.yml

@@ -14,6 +14,8 @@ services:
   db:
     restart: "no"
   migrations:
+    volumes:
+      - ./config/dev-migrations:/data/migrations/dev/
     restart: "no"
   resource:
     restart: "no"
@@ -29,6 +31,7 @@ services:
     image: lblod/mock-login-service:latest
     links:
       - db:database
+    restart: "no"
   sink:
     restart: "no"
   login:
@@ -40,7 +43,29 @@ services:
   adressenregister:
     restart: "no"
   frontend:
-    image: lblod/frontend-contact-hub:latest
+    image: lblod/frontend-organization-portal:latest
     restart: "no"
   uri-info:
     restart: "no"
+  delta-producer-bg-jobs-initiator-administrative-units:
+    restart: "no"
+  delta-producer-pub-graph-maintainer-administrative-units:
+    restart: "no"
+  delta-producer-json-diff-publisher-administrative-units:
+    restart: "no"
+  delta-producer-bg-jobs-initiator-organizations:
+    restart: "no"
+  delta-producer-pub-graph-maintainer-organizations:
+    restart: "no"
+  delta-producer-json-diff-publisher-organizations:
+    restart: "no"
+  search:
+    restart: "no"
+    volumes:
+      - ./config/search/dev:/config
+  elasticsearch:
+    restart: "no"
+  file:
+    restart: "no"
+  delta-producer-dump-file-publisher:
+    restart: "no"

docker-compose.yml

@@ -18,7 +18,7 @@ services:
     restart: always
     logging: *default-logging
   dispatcher:
-    image: semtech/mu-dispatcher:latest
+    image: semtech/mu-dispatcher:2.1.0-beta.2
     volumes:
       - ./config/dispatcher:/config
     labels:
@@ -61,7 +61,7 @@ services:
     restart: always
     logging: *default-logging
   resource:
-    image: semtech/mu-cl-resources:feature-all-errors-as-json-api-errors
+    image: semtech/mu-cl-resources:feature-all-errors-as-json-api-errors # Bump to fixed version when merged and release
     links:
       - db:database
     volumes:
@@ -79,7 +79,7 @@ services:
     restart: always
     logging: *default-logging
   kalliope-api:
-    image: lblod/jsonld-delta-service:0.5.4
+    image: lblod/jsonld-delta-service:0.5.6
     volumes:
       - ./config/kalliope:/config
       - ./data/files:/share
@@ -90,6 +90,7 @@ services:
       LOGGING_LEVEL: "INFO"
       SPARQL_ENDPOINT: "http://db:8890/sparql"
       LIMIT_SIZE: "10000"
+      MU_AUTH_SUDO: "false"
     labels:
       - "logging=true"
     restart: always
@@ -127,7 +128,7 @@ services:
     links:
       - db:database
   accountdetail:
-    image: lblod/account-detail-service:latest
+    image: lblod/account-detail-service:0.1.0
     labels:
       - "logging=true"
     environment:
@@ -137,7 +138,7 @@ services:
     restart: always
     logging: *default-logging
   privacy:
-    image: lblod/privacy-centric-service:0.3.0
+    image: lblod/privacy-centric-service:0.4.2
     labels:
       - "logging=true"
     environment:
@@ -152,13 +153,13 @@ services:
     restart: always
     logging: *default-logging
   adressenregister:
-    image: lblod/adressenregister-fuzzy-search-service:0.5.0
+    image: lblod/adressenregister-fuzzy-search-service:0.6.0
     labels:
       - "logging=true"
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-contact-hub:1.5.1
+    image: lblod/frontend-organization-portal:1.7.0
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment:
@@ -199,7 +200,7 @@ services:
 # DELTA GENERAL
 ################################################################################
   delta-producer-dump-file-publisher:
-    image: lblod/delta-producer-dump-file-publisher:0.4.0
+    image: bdevloed/delta-producer-dump-file-publisher:0.5.0-beta
     volumes:
       - ./config/delta-producer/dump-file-publisher:/config
       - ./data/files:/share
@@ -281,7 +282,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 * * 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_DUMP_JOB: '42 * * * *' # At minute 42 every hour
       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:
@@ -332,3 +333,22 @@ services:
 ################################################################################
 # DELTA ORGANIZATIONS: END
 ################################################################################
+
+
+################################################################################
+# MU SEARCH - TODO USE THE CORRECT IMAGE ONCE INHERITANCE IS IN MU SEARCH
+################################################################################
+  search:
+    image: nbittich/mu-search:wip-inheritance-alpha2 # Bump to fixed version when merged and release to the original repo
+    links:
+      - db:database
+    restart: always
+    volumes:
+      - ./config/search:/config
+  elasticsearch:
+    image: semtech/mu-search-elastic-backend:1.0.1
+    volumes:
+      - ./data/elasticsearch/:/usr/share/elasticsearch/data
+    environment:
+      - discovery.type=single-node 
+    restart: always