SCRUM-5829 get variant type and moelcular consequence se the same jso… (#1538)

* SCRUM-5829 get variant type and moelcular consequence se the same json attribute names as the HTP variants

* rename attributes

Author: cmpich

agr_java_core/src/main/java/org/alliancegenome/core/variant/converters/AlleleSearchResultConverter.java

@@ -104,7 +104,7 @@ public List<AlleleSearchResultDocument> convert(List<AlleleSummaryDocument> alle
 					.distinct()
 					.toList();
 				if (!variantTypes.isEmpty()) {
-					searchDoc.setVariantTypes(variantTypes);
+					searchDoc.setVariantType(variantTypes);
 				}
 
 				Set<String> consequences = new HashSet<>();
@@ -129,7 +129,7 @@ public List<AlleleSearchResultDocument> convert(List<AlleleSummaryDocument> alle
 					}
 				}
 				if (!consequences.isEmpty()) {
-					searchDoc.setMolecularConsequences(consequences);
+					searchDoc.setMolecularConsequence(consequences);
 				}
 			}
 

agr_java_core/src/main/java/org/alliancegenome/es/index/site/dao/SearchDAO.java

@@ -30,6 +30,7 @@ public Long performCountQuery(QueryBuilder query) {
 
 		searchSourceBuilder.query(query);
 		searchSourceBuilder.size(0);
+		searchSourceBuilder.trackTotalHits(true);
 
 		SearchRequest searchRequest = new SearchRequest(ConfigHelper.getEsIndex());
 		searchRequest.source(searchSourceBuilder);

agr_java_core/src/main/java/org/alliancegenome/es/model/AlleleSearchResultDocument.java

@@ -29,8 +29,8 @@ public AlleleSearchResultDocument() {
 	private String species;
 	private Double popularity;
 	private String alterationType;
-	private List<String> variantTypes;
-	private Set<String> molecularConsequences;
+	private List<String> variantType;
+	private Set<String> molecularConsequence;
 	private Set<String> constructExpressedComponent;
 	private Set<String> constructRegulatoryRegion;
 	private Set<String> constructKnockdownComponent;