From 7c646a01a5fbacb6f38a04c413a26f3d74ec2f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 27 Sep 2021 11:01:48 +0200 Subject: [PATCH 1/3] Fixed storage settings --- .../src/main/resources/application.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml index b64c90feb..42610db6b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml @@ -58,10 +58,7 @@ cassandra: storage: signer-type: 'AWSS3V4SignerType' -# region: 'us-east-1' -# endpoint: 'https://s3.amazonaws.com' bucket-name: 'redaction' - endpoint: 'http://localhost:9000' - key: minioadmin - secret: minioadmin + region: 'us-east-1' + endpoint: 'https://s3.amazonaws.com' From 4d92a706ce8f61b836c8097904165a3d3245f81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 27 Sep 2021 14:34:24 +0200 Subject: [PATCH 2/3] Set dossierTemplate Id for colors before save --- .../peristence/v1/server/controller/DictionaryController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java index 8cd236c55..f746f77d3 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java @@ -259,6 +259,7 @@ public class DictionaryController implements DictionaryResource { @Override public void setColors(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody Colors colors) { + colors.setDossierTemplateId(dossierTemplateId); colorsService.saveColors(colors); } From 7eee2c65039e1f2c5f5f2a0b0a65e0ea49d5d62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 27 Sep 2021 16:24:39 +0200 Subject: [PATCH 3/3] Changed legalbases columns to text type --- .../service/v1/api/model/data/configuration/LegalBasis.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java index 02ef895f2..c0b05c07f 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/LegalBasis.java @@ -20,9 +20,9 @@ public class LegalBasis { private long id; @Column private String name; - @Column + @Column(columnDefinition = "text") private String description; - @Column + @Column(columnDefinition = "text") private String reason;