Merge branch 'development'

bump frontend & reduce nb threads for mu search indexing
Merge pull request #107 from lblod/KAL-4760-gecoordineerde-synchronisatie-op-kal
2022-03-03 09:24:46 +01:00 · 2022-03-03 09:21:40 +01:00 · 2022-03-02 17:26:50 +01:00 · 2022-03-02 17:15:29 +01:00 · 2022-03-02 17:06:43 +01:00 · 2022-03-01 11:29:51 +01:00
26 changed files with 686 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ source.json
 out.json
 security.yml
 config/proxy-https/proxy_ssl.conf
+/config/search/update-handler.store
--- a/config/delta/rules.js
+++ b/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: {
--- a/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled
+++ b/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -222,6 +222,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 +239,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
--- a/config/migrations/20210701120000-meta.ttl
+++ b/config/migrations/20210701120000-meta.ttl
--- a/config/migrations/20210815112611122233-create-mock-group.sparql
+++ b/config/migrations/20210815112611122233-create-mock-group.sparql
--- a/config/migrations/202108151011002223444444-create-mock-user.sparql
+++ b/config/migrations/202108151011002223444444-create-mock-user.sparql
--- a/config/migrations/202109241151111112111233322-auth.sparql
+++ b/config/migrations/202109241151111112111233322-auth.sparql
--- a/config/migrations/202109241151111112111233323-remove-acmidm-account-from-public.sparql
+++ b/config/migrations/202109241151111112111233323-remove-acmidm-account-from-public.sparql
--- a/config/migrations/2021110315263111111111111111-source-crab.sparql
+++ b/config/migrations/2021110315263111111111111111-source-crab.sparql
--- a/config/migrations/2022212411511111121112333222-private-data.sparql
+++ b/config/migrations/2022212411511111121112333222-private-data.sparql
--- a/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql
+++ b/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql
--- a/config/migrations/2022212411511111121112333225-clear-mock-data.sparql
+++ b/config/migrations/2022212411511111121112333225-clear-mock-data.sparql
--- a/config/migrations/2022212411511111121112333226-mock-user-roles.sparql
+++ b/config/migrations/2022212411511111121112333226-mock-user-roles.sparql
--- a/config/migrations/2022212411511111121112333227-move-graph.sparql
+++ b/config/migrations/2022212411511111121112333227-move-graph.sparql
--- a/config/migrations/2022/20220125185900-rename-change-event-result-relationship-predicate.sparql
+++ b/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 .
+  }
+}
--- a/config/migrations/2022/20220202120000-primary-contacts.sparql
+++ b/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"
+    }
+  }
+}
--- a/config/migrations/2022/20220203100000-secondary-contacts.sparql
+++ b/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.
+    }
+  }
+}    
--- a/config/migrations/2022212411511111121112333228-delete-old-change-events.sparql
+++ b/config/migrations/2022212411511111121112333228-delete-old-change-events.sparql
--- a/config/migrations/20220120100418-remove-old-reasons.sparql
+++ b/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.
+  }
+}
--- a/config/migrations/20220120101318-insert-new-reasons.sparql
+++ b/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".
+  }
+}
--- a/config/resources/change-events.json
+++ b/config/resources/change-events.json
@@ -58,7 +58,7 @@
      "attributes": {},
      "relationships": {
        "resulting-organization": {
-          "predicate": "org:organization",
+          "predicate": "ext:resultingOrganization",
          "target": "organizations",
          "cardinality": "one"
        },
--- a/config/resources/domain.json
+++ b/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": {
@@ -311,7 +316,7 @@
          "inverse": true
        },
        "change-event-results": {
-          "predicate": "org:organization",
+          "predicate": "ext:resultingOrganization",
          "target": "change-event-results",
          "cardinality": "many",
          "inverse": true
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -0,0 +1,490 @@
+{
+  "automatic_index_updates": true,
+  "persist_indexes": true,
+  "number_of_threads": 6,
+  "eager_indexing_groups": [
+    [{ "variables": [], "name": "acmidm-lezer" }],
+    [{ "variables": [], "name": "acmidm-editeerder" }],
+    [{ "variables": [], "name": "acmidm-beheerder" }]
+  ],
+  "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"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -29,6 +29,7 @@ services:
    image: lblod/mock-login-service:latest
    links:
      - db:database
+    restart: "no"
  sink:
    restart: "no"
  login:
@@ -44,3 +45,23 @@ services:
    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"
+  elasticsearch:
+    restart: "no"
+  file:
+    restart: "no"
+  delta-producer-dump-file-publisher:
+    restart: "no"
--- a/docker-compose.yml
+++ b/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.5
    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:
@@ -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.0
+    image: lblod/frontend-contact-hub:1.6.3
    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 # 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
Author	SHA1	Message	Date
Nordine Bittich	0b73421473	Merge branch 'development'	2022-03-03 09:24:46 +01:00
Nordine Bittich	dbf5fce41e	bump frontend & reduce nb threads for mu search indexing	2022-03-03 09:21:40 +01:00
Boris De Vloed	272ccc57bb	Merge pull request #107 from lblod/KAL-4760-gecoordineerde-synchronisatie-op-kal reschedule op dump creation	2022-03-02 17:26:50 +01:00
Boris De Vloed	5c7833e53f	update comment	2022-03-02 17:15:29 +01:00
Boris De Vloed	e744642b19	reschedule op dump creation	2022-03-02 17:06:43 +01:00
Boris De Vloed	5a3243bb74	Merge pull request #106 from lblod/feature/dump-compression use compressed dumps	2022-03-01 11:29:51 +01:00
Boris De Vloed	b3c064b04a	use compressed dumps	2022-03-01 10:35:28 +01:00
Claire Lovisa	df9a25210c	Update gitignore	2022-03-01 08:46:24 +01:00
claire-lovisa	b3da0aa1a7	Merge pull request #104 from lblod/refactor/update-docker-compose-config Update docker compose config	2022-02-28 17:39:31 +01:00
claire-lovisa	cdd86d3665	Merge branch 'development' into refactor/update-docker-compose-config	2022-02-28 17:39:09 +01:00
claire-lovisa	01a110fcdf	Merge pull request #103 from lblod/refactor/kalliope-api-via-mu-auth Remove unused config and bump kallipe-api	2022-02-28 17:37:59 +01:00
Claire Lovisa	cd185f427e	Bump kalliope api to v0.5.5	2022-02-28 17:24:42 +01:00
Nordine Bittich	61deab8212	List all positions for a person (ministers + mandatories) & bug fix editing issue with delta (#105 )	2022-02-28 15:26:39 +01:00
Claire Lovisa	c552d76e14	Add fixed image versions when possible	2022-02-25 10:39:53 +01:00
Claire Lovisa	94e8d8cf06	Add missing no restart	2022-02-25 10:03:17 +01:00
Claire Lovisa	bfee6de5a9	Remove unused config and bump kallipe-api	2022-02-24 18:25:33 +01:00
claire-lovisa	a815bc5619	Merge pull request #100 from lblod/feature/perf-bestuur improve perf bestuur	2022-02-14 17:15:52 +01:00
Nordine Bittich	26de3401b4	Merge branch 'development' into feature/perf-bestuur	2022-02-14 17:14:40 +01:00
Sam Van Campenhout	313e8539dd	Merge pull request #102 from lblod/chore/docker-restart update docker restart policy	2022-02-14 15:39:20 +01:00
Nordine Bittich	11202a0b82	missing file & dump file	2022-02-14 15:23:29 +01:00
Nordine Bittich	1941b09790	gitignore update	2022-02-14 14:41:40 +01:00
Nordine Bittich	976c7b5478	update docker restart policy	2022-02-14 14:37:42 +01:00
Nordine Bittich	ddc679b2d7	bugfix	2022-02-11 11:34:42 +01:00
Nordine Bittich	f6b2c963f3	improve perf bestuur	2022-02-11 06:35:08 +01:00
Nordine Bittich	2cb5576e58	remove port mapping	2022-02-10 19:38:26 +01:00
Nordine Bittich	88226a9038	bump frontend	2022-02-10 16:02:13 +01:00
Nordine Bittich	2c6269d487	bump frontend	2022-02-10 16:01:33 +01:00
Sam Van Campenhout	f8a5935004	Add a type attribute to the contact-points model (#95 )	2022-02-10 14:23:10 +01:00
Nordine Bittich	cdf4417ca5	bump frontend	2022-02-10 14:09:45 +01:00
Nordine Bittich	1f48744b62	bump frontend	2022-02-10 14:09:17 +01:00
Boris De Vloed	5a318a99fe	add contact types (#88 ) * add contact types * move migration to 2022 directory Co-authored-by: Nordine Bittich <nordine@bittich.be>	2022-02-10 13:53:48 +01:00
Claire Lovisa	0ecbca52d2	Bump adresenregister	2022-02-08 15:35:13 +01:00
Nordine Bittich	e52d71682e	fix relationship (#99 )	2022-02-08 10:22:27 +01:00
Nordine Bittich	3e14d92c29	mu search page person (#97 )	2022-02-07 07:50:37 +01:00
Boris De Vloed	3bcc53b0bc	add contact types (#88 ) * add contact types * move migration to 2022 directory Co-authored-by: Nordine Bittich <nordine@bittich.be>	2022-02-02 14:59:02 +01:00
Nordine Bittich	f36e2ba706	bump frontend	2022-02-01 18:05:20 +01:00
Nordine Bittich	de2a143218	bump frontend	2022-02-01 18:04:19 +01:00
Sam Van Campenhout	99644e7925	Add a type attribute to the contact-points model (#95 )	2022-02-01 15:23:01 +01:00
Nordine Bittich	f41430b699	bump frontend	2022-01-26 15:43:11 +01:00
Sam Van Campenhout	422e92a343	Temporarily rename the change-event-result organization relationship (#94 ) This relationship uses the same `org:organization` predicate that is also used for the local involvements relationship. When querying for local involvements data when an organization also has change events data, mu-cl-resources receives the change events data instead and runs into errors. This is likely a bug in the micro service itself. Renaming the predicate is a quick workaround so we have more time to find the real solution for the problem without a broken app.	2022-01-25 20:04:18 +01:00
Nordine Bittich	b5a7eb1755	bump frontend	2022-01-24 11:28:47 +01:00
claire-lovisa	a3478e997c	Merge pull request #93 from lblod/features/new-reasons-code add new reason code	2022-01-20 14:53:33 +01:00
Nordine Bittich	7aa969c17b	add new reason code	2022-01-20 10:27:55 +01:00
claire-lovisa	814a232bf8	Rename migration with wrong timestamps (#92 )	2022-01-19 13:57:29 +01:00