Add a type attribute to the contact-points model (#95 )

bump frontend
add contact types (#88 )
2022-02-10 14:23:10 +01:00 · 2022-02-10 14:09:45 +01:00 · 2022-02-10 13:53:48 +01:00 · 2022-02-01 18:05:20 +01:00 · 2022-01-26 15:43:11 +01:00 · 2022-01-25 20:04:18 +01:00
6 changed files with 71 additions and 3 deletions
--- 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/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
@@ -210,6 +210,10 @@
        "website": {
          "type": "uri",
          "predicate": "foaf:page"
+        },
+        "type": {
+          "type": "string",
+          "predicate": "schema:contactType"
        }
      }, 
      "relationships": {
@@ -311,7 +315,7 @@
          "inverse": true
        },
        "change-event-results": {
-          "predicate": "org:organization",
+          "predicate": "ext:resultingOrganization",
          "target": "change-event-results",
          "cardinality": "many",
          "inverse": true
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -158,7 +158,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-contact-hub:1.5.1
+    image: lblod/frontend-contact-hub:1.5.4
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
Author	SHA1	Message	Date
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
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
Nordine Bittich	f36e2ba706	bump frontend	2022-02-01 18:05:20 +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