merge development

Remove config related to the sensitive data feature

config/dispatcher/dispatcher.ex

@@ -148,10 +148,6 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/minister-conditions/"
   end 
 
-  match "/dates-of-birth/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://cache/dates-of-birth/"
-  end   
-
   match "/nationalities/*path", %{ accept: [:json], layer: :api} do
     Proxy.forward conn, path, "http://cache/nationalities/"
   end
@@ -187,6 +183,9 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/site-types/"
   end
   
+  match "/request-reasons/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://cache/request-reasons/"
+  end
 
   ###############
   # LOGIN
@@ -272,7 +271,7 @@ defmodule Dispatcher do
   # sparql endpoint
   ###############################################################
   
-  post "/sparql/*path", %{ layer: :api_services, host: "*.abb.lblod.info", accept: %{ sparql_json: true } } do
+  post "/sparql/*path", %{ layer: :api_services, accept: %{ sparql_json: true } } do
     forward conn, path, "http://db:8890/sparql/"
   end
 

config/migrations/20211119151700-move-reason-codes.sparql

@@ -0,0 +1,14 @@
+DELETE {
+  GRAPH  <http://mu.semte.ch/application> {
+    ?s ?p ?o
+  }
+} INSERT {
+  GRAPH  <http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin> {
+    ?s ?p ?o
+  }
+} WHERE {
+  GRAPH  <http://mu.semte.ch/application> {
+    ?s a <http://mu.semte.ch/vocabularies/ext/ReasonCode>;
+    ?p ?o.
+  }
+}

config/migrations/2022212411511111121112333222-private-data.sparql

@@ -0,0 +1,53 @@
+ PREFIX  ext:  <http://mu.semte.ch/vocabularies/ext/>
+ PREFIX  xsd:  <http://www.w3.org/2001/XMLSchema#>
+ PREFIX  mu:   <http://mu.semte.ch/vocabularies/core/>
+ PREFIX  generiek: <https://data.vlaanderen.be/ns/generiek#>
+ PREFIX  persoon: <https://data.vlaanderen.be/ns/persoon#>
+ PREFIX  person: <http://www.w3.org/ns/person#>
+ 
+ DELETE {
+   GRAPH <http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin> {
+     ?s persoon:heeftGeboorte ?heeftGeboorte .
+     ?s persoon:registratie ?registration .
+     ?registration generiek:gestructureerdeIdentificator ?identificator .
+     ?identificator ?x ?y .
+     ?registration ?t ?j .
+     ?s persoon:geslacht ?geslacht .
+     ?s persoon:heeftNationaliteit ?nationaliteit .
+   }
+ }
+ INSERT {
+   GRAPH <http://mu.semte.ch/graphs/privacy-centric-graph> {
+     ?s persoon:heeftGeboorte ?heeftGeboorte .
+     ?s persoon:registratie ?registration .
+     ?registration generiek:gestructureerdeIdentificator ?identificator .
+     ?identificator ?x ?y .
+     ?registration ?t ?j .
+     ?s persoon:geslacht ?geslacht .
+     ?s persoon:heeftNationaliteit ?nationaliteit .
+   }
+ }
+ WHERE
+   { GRAPH <http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin>
+       { 
+         ?s a person:Person.
+         OPTIONAL
+           { ?s        persoon:heeftGeboorte  ?heeftGeboorte .
+             ?heeftGeboorte
+                       ?p                    ?o
+           }
+         OPTIONAL
+           { ?s        persoon:registratie   ?registration .
+             ?registration
+                       generiek:gestructureerdeIdentificator  ?identificator .
+             ?identificator
+                       ?x                    ?y .
+             ?registration
+                       ?t                    ?j
+           }
+         OPTIONAL
+           { ?s  persoon:geslacht  ?geslacht }
+         OPTIONAL
+           { ?s  persoon:heeftNationaliteit  ?nationaliteit }
+       }
+   }

config/resources/domain.json

@@ -55,26 +55,6 @@
           "target": "agents-in-position",
           "cardinality": "many",
           "inverse": true
-        },
-        "registration": {
-          "predicate": "persoon:registratie",
-          "target": "identifiers",
-          "cardinality": "one"
-        },
-        "date-of-birth": {
-          "predicate": "persoon:heeftGeboorte",
-          "target": "dates-of-birth",
-          "cardinality": "one"
-        },
-        "nationalities": {
-          "predicate": "persoon:heeftNationaliteit",
-          "target": "nationalities",
-          "cardinality": "many"
-        },
-        "gender": {
-          "predicate": "persoon:geslacht",
-          "target": "gender-codes",
-          "cardinality": "one"
         }
       },
       "new-resource-base": "http://data.lblod.info/id/personen/"
@@ -792,16 +772,6 @@
       },
       "new-resource-base": "http://data.lblod.info/id/voorwaardenBedienaar/"
     },
-    "dates-of-birth": {
-      "class": "persoon:Geboorte",
-      "attributes": {
-        "date": {
-          "type": "datetime",
-          "predicate": "persoon:datum"
-        } 
-      },
-      "new-resource-base": "http://data.lblod.info/id/geboortes/"
-    },
     "nationalities": {
       "class": "euvoc:Country",
       "attributes": {

config/resources/domain.lisp

@@ -12,4 +12,5 @@
 (defparameter *supply-cache-headers-p* t)
 
 (read-domain-file "domain.json")
-(read-domain-file "auth.json")
+(read-domain-file "auth.json")
+(read-domain-file "privacy-centric-service.json")

config/resources/privacy-centric-service.json

@@ -0,0 +1,20 @@
+{
+  "version": "0.1",
+  "prefixes": {
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "ext": "http://mu.semte.ch/vocabularies/ext/"
+  },
+  "resources": {
+    "request-reasons": {
+      "name": "request-reason",
+      "class": "ext:ReasonCode",
+      "attributes": {
+        "label": {
+          "type": "string",
+          "predicate": "skos:prefLabel"
+        }
+      },
+      "new-resource-base": "http://data.lblod.info/id/information-request-reason/"
+    }
+  }
+}

docker-compose.yml

@@ -136,7 +136,7 @@ services:
     restart: always
     logging: *default-logging
   privacy:
-    image: lblod/privacy-centric-service:0.0.1
+    image: lblod/privacy-centric-service:0.1.1
     labels:
       - "logging=true"
     environment:
@@ -156,7 +156,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-contact-hub:1.2.0
+    image: lblod/frontend-contact-hub:1.3.0
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment: