From 1c4e97bf437eb670129c56a251b008b3c501664f Mon Sep 17 00:00:00 2001 From: Martijn Bogaert Date: Wed, 4 Dec 2024 16:08:16 +0100 Subject: [PATCH 1/5] Link generated bpmn file to visio file --- config/resources/domain.lisp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/config/resources/domain.lisp b/config/resources/domain.lisp index 15b5875..787bf1e 100644 --- a/config/resources/domain.lisp +++ b/config/resources/domain.lisp @@ -41,9 +41,14 @@ (:status :url ,(s-prefix "adms:status"))) :has-one `((file :via ,(s-prefix "nie:dataSource") :inverse t - :as "download")) + :as "download") + (file :via ,(s-prefix "prov:wasDerivedFrom") + :as "vsdx-file")) :has-many `((process :via ,(s-prefix "nie:isPartOf") - :as "processes")) + :as "processes") + (file :via ,(s-prefix "prov:wasDerivedFrom") + :inverse t + :as "bpmn-files")) :resource-base (s-url "http://data.lblod.info/files/") :features `(include-uri) :on-path "files") @@ -71,7 +76,7 @@ (define-resource bpmnProcess () :class (s-prefix "bbo:Process") :has-one `((file :via ,(s-prefix "prov:wasDerivedFrom") - :as "bpmn-file")) + :as "bpmn-file")) :resource-base (s-url "http://data.lblod.info/bpmn-processes/") :on-path "bpmn-processes") From 14fd0864eb4a489f8e5485e61c3e0ce56f571d33 Mon Sep 17 00:00:00 2001 From: Martijn Bogaert Date: Wed, 22 Jan 2025 16:22:21 +0100 Subject: [PATCH 2/5] Add visio endpoint --- config/dispatcher/dispatcher.ex | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 0493ebf..d6d68f0 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -30,6 +30,10 @@ defmodule Dispatcher do Proxy.forward conn, [], "http://bpmn/" end + match "/visio", %{ accept: [:any], layer: :api } do + Proxy.forward conn, [], "http://visio/" + end + match "/ipdc-instances", %{ accept: [:json], layer: :api } do Proxy.forward conn, [], "http://cache/ipdc-instances/" end From 2f09f1802b1f8b200003b4867f68a3458b596d7d Mon Sep 17 00:00:00 2001 From: Martijn Bogaert Date: Wed, 22 Jan 2025 16:23:43 +0100 Subject: [PATCH 3/5] Restrict visio endpoint to post calls only --- config/dispatcher/dispatcher.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index d6d68f0..3214c05 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -30,7 +30,7 @@ defmodule Dispatcher do Proxy.forward conn, [], "http://bpmn/" end - match "/visio", %{ accept: [:any], layer: :api } do + post "/visio", %{ accept: [:any], layer: :api } do Proxy.forward conn, [], "http://visio/" end From 50415795becf4f92c3b00b7fd148d84e32e02553 Mon Sep 17 00:00:00 2001 From: Martijn Bogaert Date: Thu, 23 Jan 2025 19:02:51 +0100 Subject: [PATCH 4/5] Integrate visio service --- docker-compose.dev.yml | 2 ++ docker-compose.yml | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 88e2991..3e6ddc3 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -19,3 +19,5 @@ services: image: lblod/frontend-openproceshuis:latest bpmn: image: lblod/openproceshuis-bpmn-service:latest + visio: + image: lblod/openproceshuis-visio-service:feature-visio # TODO: change to latest when available diff --git a/docker-compose.yml b/docker-compose.yml index 17e363c..9337de6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -126,6 +126,14 @@ services: - ./config/bpmn:/config - ./data/files:/share restart: always + visio: + logging: *default-logging + labels: + - "logging=true" + image: lblod/openproceshuis-visio-service:feature-visio # TODO: change to tag when available + volumes: + - ./data/files:/share + restart: always accountdetail: image: lblod/account-detail-service:0.1.0 labels: From 6e73a7381ad745842b8d6574acc84ff9ae74f4f6 Mon Sep 17 00:00:00 2001 From: Martijn Bogaert Date: Fri, 24 Jan 2025 12:24:20 +0100 Subject: [PATCH 5/5] Bump visio version --- docker-compose.dev.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3e6ddc3..8ac8174 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -20,4 +20,4 @@ services: bpmn: image: lblod/openproceshuis-bpmn-service:latest visio: - image: lblod/openproceshuis-visio-service:feature-visio # TODO: change to latest when available + image: lblod/openproceshuis-visio-service:latest diff --git a/docker-compose.yml b/docker-compose.yml index 9337de6..6dad098 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -130,7 +130,7 @@ services: logging: *default-logging labels: - "logging=true" - image: lblod/openproceshuis-visio-service:feature-visio # TODO: change to tag when available + image: lblod/openproceshuis-visio-service:0.0.1 volumes: - ./data/files:/share restart: always