diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java index 6b5fd8d89c..7b58da0d14 100644 --- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java +++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java @@ -305,7 +305,7 @@ public class ResultMapper { //If group by field populated in query facet return bucketing into facet field. List facetQueryForFields = getFacetBucketsFromFacetQueries(facetQueries,searchQuery); - if(!facetQueryForFields.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat()) + if(hasGroup(searchQuery) || FacetFormat.V2 == searchQuery.getFacetFormat()) { facets.addAll(facetQueryForFields); } @@ -359,6 +359,14 @@ public class ResultMapper context = new SearchContext(solrResultSet.getLastIndexedTxId(), facets, facetResults, ffcs, spellCheckContext, searchRequestContext.includeRequest()?searchQuery:null); return isNullContext(context)?null:context; } + public static boolean hasGroup(SearchQuery searchQuery) + { + if(searchQuery != null && searchQuery.getFacetQueries() != null) + { + return searchQuery.getFacetQueries().stream().anyMatch(facetQ -> facetQ.getGroup() != null); + } + return false; + } /** * Builds a facet field from facet queries. * @param facetQueries @@ -382,8 +390,8 @@ public class ResultMapper group = found.get().getGroup(); } } - if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat()) - { +// if(group != null && !group.isEmpty() || FacetFormat.V2 == searchQuery.getFacetFormat()) +// { if(groups.containsKey(group)) { Set metrics = new HashSet<>(1); @@ -399,7 +407,7 @@ public class ResultMapper groups.put(group, l); } } - } +// } if(!groups.isEmpty()) { groups.forEach((a,v) -> facetResults.add(new GenericFacetResponse(FACET_TYPE.query, a, v))); diff --git a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java index 478e5955f0..808c3cd773 100644 --- a/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java +++ b/source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java @@ -37,6 +37,7 @@ import static org.mockito.Matchers.notNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -580,6 +581,41 @@ public class ResultMapperTests assertEquals(METRIC_TYPE.count, metrics[0].getType()); assertEquals("{count=52}", metrics[0].getValue().toString()); + } + @Test + /** + * Test facet group with out facet fields + * @throws Exception + */ + public void testFacetingGroupResponseV1() throws Exception + { + String jsonQuery = "{\"query\": {\"query\": \"alfresco\"}, \"facetFormat\":\"V1\"," + + "\"facetQueries\": [" + + "{\"query\": \"content.size:[o TO 102400]\", \"label\": \"small\"}," + + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"foo\"}," + + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]" + + "}"; + + String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]}," + + "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"}," + + "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}}," + + "\"processedDenies\":true, \"lastIndexedTx\":34}"; + + ResultSet results = mockResultset(expectedResponse); + SearchQuery searchQuery = helper.extractFromJson(jsonQuery); + SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery); + SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0); + assertEquals(34l, searchContext.getConsistency().getlastTxId()); + assertEquals(null, searchContext.getFacetQueries()); + assertEquals(2, searchContext.getFacets().size()); + assertEquals(2,searchContext.getFacets().get(0).getBuckets().size()); + assertEquals("small",searchContext.getFacets().get(0).getBuckets().get(0).getLabel()); + assertEquals("content.size:[o TO 102400]",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery()); + assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty()); + Metric[] metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]); + assertEquals(METRIC_TYPE.count, metrics[0].getType()); + assertEquals("{count=52}", metrics[0].getValue().toString()); + } @Test /** @@ -698,7 +734,6 @@ public class ResultMapperTests searchRequest = SearchRequestContext.from(searchQuery); searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0); assertEquals(34l, searchContext.getConsistency().getlastTxId()); - assertTrue(searchContext.getFacets().isEmpty()); assertEquals(3,searchContext.getFacetQueries().size()); assertEquals("small",searchContext.getFacetQueries().get(0).getLabel()); assertEquals("content.size:[0 TO 102400]",searchContext.getFacetQueries().get(0).getFilterQuery()); @@ -740,5 +775,32 @@ public class ResultMapperTests assertEquals("System",searchContext.getFacets().get(0).getBuckets().get(0).getLabel()); assertEquals("modifier",searchContext.getFacets().get(1).getLabel()); } + + @Test + public void hasGroupTest() throws IOException + { + String jsonQuery = "{\"query\": {\"query\": \"alfresco\"}," + + "\"facetQueries\": [" + + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"}," + + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\"}," + + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]" + + "}"; + String jsonQueryWithGroup = "{\"query\": {\"query\": \"alfresco\"}," + + "\"facetQueries\": [" + + "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"}," + + "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\",\"group\":\"foo\"}," + + "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]" + + "}"; + SearchQuery searchQuery = helper.extractFromJson(jsonQuery); + assertFalse(ResultMapper.hasGroup(searchQuery)); + SearchQuery searchQuery2 = helper.extractFromJson(jsonQueryWithGroup); + assertTrue(ResultMapper.hasGroup(searchQuery2)); + assertFalse(ResultMapper.hasGroup(null)); + String noFacetQueries = "{\"query\": {\"query\": \"alfresco\"}," + + "\"facetQueries\": []" + + "}"; + SearchQuery searchQuery3 = helper.extractFromJson(noFacetQueries); + assertFalse(ResultMapper.hasGroup(searchQuery3)); + } }