Merge branch 'development' into poc/add-gemeenten

config/authorization/config.ex

@@ -7,6 +7,11 @@ alias Acl.GroupSpec, as: GroupSpec
 alias Acl.GroupSpec.GraphCleanup, as: GraphCleanup
 
 defmodule Acl.UserGroups.Config do
+
+ @error_type [
+   "https://docs.oasis-open-projects.org/oslc-op/core/v3.0/os/core-vocab.html#Error"
+ ]
+
  @protected_resource_type [
                         "http://www.w3.org/ns/org#Organization",
                         "http://data.vlaanderen.be/ns/besluit#Besluit",
@@ -99,7 +104,7 @@ defmodule Acl.UserGroups.Config do
           %GraphSpec{
             graph: "http://mu.semte.ch/graphs/organisatieportaal",
             constraint: %ResourceConstraint{
-              resource_types: @protected_resource_type
+              resource_types: @protected_resource_type ++ @error_type
             }
           }
         ]
@@ -112,7 +117,7 @@ defmodule Acl.UserGroups.Config do
           %GraphSpec{
             graph: "http://mu.semte.ch/graphs/organisatieportaal",
             constraint: %ResourceConstraint{
-              resource_types: @protected_resource_type
+              resource_types: @protected_resource_type ++ @error_type
             }
           }
         ]

config/dispatcher/dispatcher.ex

@@ -77,7 +77,7 @@ defmodule Dispatcher do
   end
 
   match "/worship-services/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://cache/worship-services/"
+    Proxy.forward conn, path, "http://resource/worship-services/" # DISABLE CACHING FOR NOW (BUG OP-1404)
   end
 
   match "/recognized-worship-types/*path", %{ accept: [:json], layer: :api} do
@@ -267,6 +267,14 @@ defmodule Dispatcher do
   end
 
 
+  #################################################################
+  # ERROR REPORT
+  #################################################################
+
+  match "/error-reports/*path", %{ layer: :api_services, accept: %{ json: true } } do
+    forward conn, path, "http://error-report-service/error-reports/"
+  end
+
   #################################################################
   # FILES
   #################################################################

config/migrations/2022/20220516171921-fix-addresses.graph

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

config/migrations/2022/20220524152932-fix-addresses.graph

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

config/migrations/2022/20220602164623-fix-typo-in-position-name.sparql

@@ -0,0 +1,11 @@
+DELETE DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    <http://lblod.data.gift/concepts/fa4191f9d7050fe62ec3fc0e16541711> <http://www.w3.org/2004/02/skos/core#prefLabel> "Kapelaan van de kerken te Antwerpen en te Elsene (Geünifieerde anglikaanse kerk)" .
+  }
+}
+;
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    <http://lblod.data.gift/concepts/fa4191f9d7050fe62ec3fc0e16541711> <http://www.w3.org/2004/02/skos/core#prefLabel> "Kapelaan van de kerken te Antwerpen en te Elsene (Geünifieerde anglicaanse kerk)" .
+  }
+}

docker-compose.yml

@@ -140,7 +140,7 @@ services:
     restart: always
     logging: *default-logging
   privacy:
-    image: lblod/privacy-centric-service:0.5.0
+    image: lblod/privacy-centric-service:0.6.0
     labels:
       - "logging=true"
     environment:
@@ -158,7 +158,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-organization-portal:1.7.2
+    image: lblod/frontend-organization-portal:1.9.0-4
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment:
@@ -414,3 +414,8 @@ services:
     environment:
       - discovery.type=single-node 
     restart: always
+
+  error-report-service:
+    image: lblod/error-report-service:0.1.0
+    links:
+      - db:database