Merge pull request #26 from DiSSCo/bug-fix/elastic-fix

Elasticsearch fix
DiSSCo · Oct 5, 2022 · efee881 · efee881
2 parents 1136648 + a0bf3df
commit efee881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/eu/dissco/backend/repository/ElasticSearchRepository.java b/src/main/java/eu/dissco/backend/repository/ElasticSearchRepository.java
@@ -30,7 +30,7 @@ public List<DigitalSpecimen> search(String query, int pageNumber, int pageSize)
     }
     var searchRequest = new SearchRequest.Builder()
         .index("new-dissco")
-        .q("_exists_:digitalSpecimen AND " + query)
+        .q("_exists_:digitalSpecimen.physicalSpecimenId AND " + query)
         .from(offset)
         .size(pageSize)
         .build();
@@ -42,7 +42,7 @@ public List<DigitalSpecimen> search(String query, int pageNumber, int pageSize)
   public List<DigitalSpecimen> getLatestSpecimen() throws IOException {
     var searchRequest = new SearchRequest.Builder()
         .index("new-dissco")
-        .q("_exists_:digitalSpecimen ")
+        .q("_exists_:digitalSpecimen.physicalSpecimenId ")
         .sort(s -> s.field(f -> f.field("created").order(SortOrder.Desc)))
         .size(10)
         .build();
@@ -54,7 +54,7 @@ public List<DigitalSpecimen> getLatestSpecimen() throws IOException {
   public List<AnnotationResponse> getLatestAnnotation() throws IOException {
     var searchRequest = new SearchRequest.Builder()
         .index("new-dissco")
-        .q("_exists_:annotation ")
+        .q("_exists_:annotation.type ")
         .sort(s -> s.field(f -> f.field("created").order(SortOrder.Desc)))
         .size(10)
         .build();

diff --git a/src/main/java/eu/dissco/backend/service/AnnotationService.java b/src/main/java/eu/dissco/backend/service/AnnotationService.java
@@ -1,6 +1,5 @@
 package eu.dissco.backend.service;
 
-import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import com.fasterxml.jackson.databind.JsonNode;
 import eu.dissco.backend.client.AnnotationClient;
 import eu.dissco.backend.domain.AnnotationEvent;