From ff2aea6d7e97257e38ebe0e6743ad2f770fa3c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Renato=20Jua=C3=A7aba=20Neto?= Date: Fri, 13 Dec 2024 09:34:37 -0300 Subject: [PATCH] Adjust EBI Search exporter --- VERSION | 2 +- pom.xml | 2 +- .../models/exporters/ebisearch/EbiSearchExporter.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 437459cd..73462a5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.0 +2.5.1 diff --git a/pom.xml b/pom.xml index aa03de2c..99a82564 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.identifiers.cloud.hq.ws registry - 2.5.0 + 2.5.1 jar registry diff --git a/src/main/java/org/identifiers/cloud/hq/ws/registry/api/data/models/exporters/ebisearch/EbiSearchExporter.java b/src/main/java/org/identifiers/cloud/hq/ws/registry/api/data/models/exporters/ebisearch/EbiSearchExporter.java index 0f20537e..7b9cac79 100644 --- a/src/main/java/org/identifiers/cloud/hq/ws/registry/api/data/models/exporters/ebisearch/EbiSearchExporter.java +++ b/src/main/java/org/identifiers/cloud/hq/ws/registry/api/data/models/exporters/ebisearch/EbiSearchExporter.java @@ -76,6 +76,7 @@ private List getFieldsOf(Namespace namespace) { fields.add(new Field("prefix", namespace.getPrefix())); fields.add(new Field("mir_id", namespace.getMirId())); fields.add(new Field("lui_pattern", namespace.getPattern())); + fields.add(new Field("sample_id", namespace.getSampleId())); fields.add(new Field("creation_date", format(namespace.getCreated()))); fields.add(new Field("modification_date", format(namespace.getModified()))); @@ -88,13 +89,13 @@ private List getFieldsOf(Namespace namespace) { fields.add(new Field("landing_page", genLandingPageUrl(namespace))); for (var resource : namespace.getResources()) { - fields.add(new Field("resource_name", resource.getName())); fields.add(new Field("mir_id", resource.getMirId())); + fields.add(new Field("resource_name", resource.getName())); + fields.add(new Field("resource_description", resource.getDescription())); fields.add(new Field("institution_name", resource.getInstitution().getName())); - fields.add(new Field("description", resource.getDescription())); - fields.add(new Field("description", resource.getInstitution().getDescription())); + fields.add(new Field("institution_description", resource.getInstitution().getDescription())); } - return fields; + return fields.stream().filter(f -> !f.getValue().equals("CURATOR_REVIEW")).toList(); } }