Merge branch 'ui-503-suggestions-for-images-accession-filter' into 'master'

Suggestions for "images" accession filter

Closes genesys-ui#503

See merge request genesys-pgr/genesys-server!450

src/main/java/org/genesys2/server/service/impl/AccessionServiceImpl.java

@@ -83,7 +83,7 @@ public class AccessionServiceImpl implements AccessionService {
 
 	public static final Logger LOG = LoggerFactory.getLogger(AccessionServiceImpl.class);
 
-	private final Set<String> suggestions = Sets.newHashSet("aegis", "crop.shortName", "institute.code", "taxonomy.genus", "taxonomy.genusSpecies", "taxonomy.species", "countryOfOrigin.code3", "historic", "sampStat", "available", "mlsStatus", "sgsv", "storage");
+	private final Set<String> suggestions = Sets.newHashSet("aegis", "crop.shortName", "institute.code", "taxonomy.genus", "taxonomy.genusSpecies", "taxonomy.species", "countryOfOrigin.code3", "historic", "sampStat", "available", "mlsStatus", "sgsv", "storage", "imageCount");
 
 	/** The accession repository. */
 	@Autowired
@@ -516,6 +516,16 @@ public class AccessionServiceImpl implements AccessionService {
 			}
 
 			ElasticsearchService.TermResult suggestion = elasticsearchService.termStatisticsAuto(Accession.class, suggestionFilter, 100, suggestionKey);
+		
+			ElasticsearchService.Term falseTerm = suggestion.getTerms().stream().filter((term) -> "0".equals(term.getTerm())).findFirst().orElse(new ElasticsearchService.Term("0", 0));
+			ElasticsearchService.Term trueTerm = new ElasticsearchService.Term("1", suggestion.getTotalCount() - falseTerm.getCount());
+			
+			
+			if ("imageCount".equals(suggestionKey)) {
+				ElasticsearchService.TermResult imageCountSuggestion = new ElasticsearchService.TermResult("images", suggestion.getTotal(), Lists.newArrayList(falseTerm, trueTerm), 0);
+				suggestionRes.put("images", imageCountSuggestion);
+				continue;
+			}
 			suggestionRes.put(suggestionKey, suggestion);
 		}