From 69548e5a8be145ab8e446c63b1f019c92567e951 Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Thu, 21 Sep 2023 09:29:18 +0300 Subject: [PATCH] check if grant exists in dmp/dataset elastic entities --- .../src/main/java/eu/eudat/elastic/entities/Dataset.java | 8 ++++++-- .../src/main/java/eu/eudat/elastic/entities/Dmp.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java index c53f08d29..3a4e135ba 100644 --- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java +++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java @@ -231,7 +231,9 @@ public class Dataset implements ElasticEntity { if (this.group != null) { builder.field("group", this.group.toString()); } - builder.field("grant", this.grant.toString()); + if (this.grant != null) { + builder.field("grant", this.grant.toString()); + } if (collaborators != null) { builder.startArray("collaborators"); this.collaborators.forEach(x -> { @@ -300,7 +302,9 @@ public class Dataset implements ElasticEntity { this.status = Short.valueOf((String) fields.get("status")); this.dmp = UUID.fromString((String) fields.get("dmp")); this.group = UUID.fromString((String) fields.get("group")); - this.grant = UUID.fromString((String) fields.get("grant")); + if (fields.get("grant") != null) { + this.grant = UUID.fromString((String) fields.get("grant")); + } if (fields.get("created") != null) this.created = Date.from(Instant.parse((String) fields.get("created"))); if (fields.get("modified") != null) diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java index 8d5129521..70d981522 100644 --- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java +++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java @@ -323,7 +323,9 @@ public class Dmp implements ElasticEntity { if (fields.get(MapKey.DATASETS.getName()) != null) { this.datasets = ((List>) fields.get(MapKey.DATASETS.getName())).stream().map(map -> new Dataset().fromElasticEntity(map)).collect(Collectors.toList()); } - this.grant = UUID.fromString((String) fields.get(MapKey.GRANT.getName())); + if (fields.containsKey(MapKey.GRANT.getName()) && fields.get(MapKey.GRANT.getName()) != null) { + this.grant = UUID.fromString((String) fields.get(MapKey.GRANT.getName())); + } if (fields.get(MapKey.GRANTSTATUS.getName()) != null) { this.grantStatus = Short.valueOf(fields.get(MapKey.GRANTSTATUS.getName()).toString()); }