Add Indexor aggregation tests

Author: asaintsever

cfg/src/main/java/asaintsever/tinyworld/cfg/Configuration.java

@@ -38,11 +38,11 @@ public class UI {
         public class Deps {
             public Map<String, String> logging;
         }
-        
+
         @ToString
         public class PhotoTree {
             public Filter filter;
-            
+
             @ToString
             public class Filter {
                 public String template;

indexor/src/main/java/asaintsever/tinyworld/indexor/IPhoto.java

@@ -20,8 +20,10 @@
 package asaintsever.tinyworld.indexor;
 
 import java.io.IOException;
+import java.util.List;
 
 import asaintsever.tinyworld.indexor.search.results.IndexPage;
+import asaintsever.tinyworld.indexor.search.results.TermsAggregation;
 import asaintsever.tinyworld.metadata.extractor.PhotoMetadata;
 
 public interface IPhoto {
@@ -32,6 +34,8 @@ public interface IPhoto {
 
     long count() throws IOException;
 
+    List<TermsAggregation> getAggregations(String searchTemplateId) throws IOException;
+
     IndexPage<PhotoMetadata> search(String query, int from, int size) throws IOException;
 
     IndexPage<PhotoMetadata> next(IndexPage<PhotoMetadata> page) throws IOException;

indexor/src/main/java/asaintsever/tinyworld/indexor/Indexor.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.codec.digest.DigestUtils;
@@ -34,6 +35,7 @@
 import asaintsever.tinyworld.indexor.opensearch.Cluster;
 import asaintsever.tinyworld.indexor.opensearch.Cluster.ClusterNodeException;
 import asaintsever.tinyworld.indexor.search.results.IndexPage;
+import asaintsever.tinyworld.indexor.search.results.TermsAggregation;
 import asaintsever.tinyworld.indexor.opensearch.ClusterClient;
 import asaintsever.tinyworld.indexor.opensearch.Document;
 import asaintsever.tinyworld.indexor.opensearch.DocumentAlreadyExistsException;
@@ -267,6 +269,11 @@ public long count() throws IOException {
             return this.document.count();
         }
 
+        @Override
+        public List<TermsAggregation> getAggregations(String searchTemplateId) throws IOException {
+            return this.document.getAggregations(searchTemplateId);
+        }
+
         @Override
         public IndexPage<PhotoMetadata> search(String query, int from, int size) throws IOException {
             return this.document.search(query, from, size, PhotoMetadata.class);

indexor/src/main/java/asaintsever/tinyworld/indexor/opensearch/utils/TermsAggregationBuilder.java

@@ -24,7 +24,7 @@
 
 import org.opensearch.search.aggregations.Aggregation;
 import org.opensearch.search.aggregations.Aggregations;
-import org.opensearch.search.aggregations.bucket.terms.ParsedStringTerms;
+import org.opensearch.search.aggregations.bucket.terms.ParsedTerms;
 import org.opensearch.search.aggregations.bucket.terms.Terms;
 
 import asaintsever.tinyworld.indexor.search.results.TermsAggregation;
@@ -41,10 +41,10 @@ public static List<TermsAggregation> from(Aggregations aggregations) {
                 for (Aggregation aggregation : aggrList) {
                     // We only support Terms aggregation
                     // (https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html)
-                    if (ParsedStringTerms.class.isInstance(aggregation)) {
+                    if (ParsedTerms.class.isInstance(aggregation)) {
                         TermsAggregation buckAggr = new TermsAggregation();
 
-                        ParsedStringTerms aggr = (ParsedStringTerms) aggregation;
+                        ParsedTerms aggr = (ParsedTerms) aggregation;
                         buckAggr.setName(aggr.getName());
                         buckAggr.setSum_other_doc_count(aggr.getSumOfOtherDocCounts());
 

indexor/src/test/java/asaintsever/tinyworld/indexor/IndexorTest.java

@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Random;
 
 import org.jeasy.random.EasyRandom;
@@ -40,6 +41,7 @@
 import org.opensearch.rest.RestStatus;
 
 import asaintsever.tinyworld.indexor.search.results.IndexPage;
+import asaintsever.tinyworld.indexor.search.results.TermsAggregation;
 import asaintsever.tinyworld.metadata.extractor.PhotoMetadata;
 
 public class IndexorTest {
@@ -166,4 +168,34 @@ void insertThenSearchMetadata() throws IOException, InterruptedException {
         System.out.println(
                 "Total=" + mtdList.total() + ", Size=" + mtdList.size() + ", Result=" + mtdList.get().toString());
     }
+
+    @Test
+    void insertThenAggregateMetadata() throws IOException, InterruptedException {
+        assertTrue(indexor.metadataIndex().create()); // Index must be explicitly created as our mapping is set here
+
+        for (int i = 0; i < 100; i++) {
+            assertTrue(() -> {
+                try {
+                    // Insert photo metadata
+                    PhotoMetadata mtd = easyRandom.nextObject(PhotoMetadata.class);
+
+                    String id = indexor.photos().add(mtd, false);
+                    return ((id != null) && !id.isEmpty());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        // Pause before asking # of photos in index
+        Thread.sleep(2000);
+        assertEquals(indexor.photos().count(), 100);
+
+        // Now, run template
+        List<TermsAggregation> aggr = indexor.photos().getAggregations("year_country_month");
+        System.out.println(aggr);
+        
+        assertTrue(aggr.size() > 0);
+    }
+
 }

indexor/src/test/java/asaintsever/tinyworld/indexor/opensearch/ClusterClientTest.java

@@ -320,6 +320,8 @@ void runSearchTemplate() throws IOException, InterruptedException {
             // Now, run template
             List<TermsAggregation> aggr = doc.getAggregations(TEST_SEARCH_TEMPLATE_ID);
             System.out.println(aggr);
+
+            assertTrue(aggr.size() > 0);
         }
 
         assertTrue(client.deleteSearchTemplate(TEST_SEARCH_TEMPLATE_ID));