create_custom_aggregation.md: Narrow usage to location

priority_i is available only on locations
*.query.content.* tags musn't be used with this example

Author: adriendupuis

code_samples/search/custom/config/aggregation_services.yaml

@@ -6,7 +6,6 @@ services:
             $aggregationClass: 'App\Query\Aggregation\Solr\PriorityRangeAggregation'
             $searchIndexFieldName: 'priority_i'
         tags:
-            - { name: ibexa.search.solr.query.content.aggregation.visitor }
             - { name: ibexa.search.solr.query.location.aggregation.visitor }
 
     app.search.elasticsearch.query.aggregation_visitor.priority_range_aggregation:
@@ -17,7 +16,6 @@ services:
             $searchIndexFieldName: 'priority_i'
         tags:
             - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.visitor }
 
     app.search.solr.query.aggregation_result_extractor.priority_range_aggregation:
         class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
@@ -26,32 +24,26 @@ services:
             $keyMapper: 'Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\IntRangeAggregationKeyMapper'
         tags:
             - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.solr.query.content.aggregation.result.extractor }
 
     app.search.elasticsearch.query.aggregation_result_extractor.priority_range_aggregation:
         class: Ibexa\Elasticsearch\Query\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
         arguments:
             $aggregationClass: 'App\Query\Aggregation\Elasticsearch\PriorityRangeAggregation'
         tags:
             - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.result.extractor }
 
     App\Query\Aggregation\Solr\PriorityRangeAggregationVisitor:
         tags:
             - { name: ibexa.search.solr.query.location.aggregation.visitor }
-            - { name: ibexa.search.solr.query.content.aggregation.visitor }
 
     App\Query\Aggregation\Solr\PriorityRangeAggregationResultExtractor:
         tags:
             - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.solr.query.content.aggregation.result.extractor }
 
     App\Query\Aggregation\Elasticsearch\PriorityRangeAggregationVisitor:
         tags:
             - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.visitor }
 
     App\Query\Aggregation\Elasticsearch\PriorityRangeAggregationResultExtractor:
         tags:
             - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.result.extractor }

docs/search/extensibility/create_custom_aggregation.md

@@ -48,14 +48,14 @@ The example below uses `RangeAggregationVisitor`:
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 1, 10) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 1, 9) =]]
     ```
 
 === "Elasticsearch"
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 11, 20) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 10, 18) =]]
     ```
 
 The visitor is created by `SearchFieldAggregationVisitorFactory`.
@@ -76,22 +76,20 @@ For the result extractor, you can use the built-in `RangeAggregationResultExtrac
 
 === "Solr"
 
-    Tag the service with `ibexa.search.solr.query.location.aggregation.result.extractor`
-    and `ibexa.search.solr.query.content.aggregation.result.extractor`.
+    Tag the service with `ibexa.search.solr.query.location.aggregation.result.extractor`.
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 21, 29) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 19, 26) =]]
     ```
 
 === "Elasticsearch"
 
-    Tag the service with `ibexa.search.elasticsearch.query.location.aggregation.result.extractor`
-    and `ibexa.search.elasticsearch.query.content.aggregation.result.extractor`.
+    Tag the service with `ibexa.search.elasticsearch.query.location.aggregation.result.extractor`.
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 30, 37) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 27, 33) =]]
     ```
 
 You can use a different type of aggregation, followed by respective visitor and extractor classes:
@@ -141,6 +139,31 @@ The `canVisit()` method checks whether the provided aggregation is of the suppor
 
 The `visit()` method returns an array of results.
 
+Finally, register the aggregation visitor as a service.
+
+=== "Solr"
+
+    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor`:
+
+    ``` yaml
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 34, 37) =]]
+    ```
+
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` tag.
+
+=== "Elasticsearch"
+
+    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor`:
+
+    ``` yaml
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 42, 45) =]]
+    ```
+
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` tag.
+
+
 ### Create result extractor
 
 === "Solr"
@@ -172,26 +195,26 @@ The `visit()` method returns an array of results.
     The `extract()` method converts the [raw data provided by the search engine](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html) to a `RangeAggregationResult` object.
 
 
-Finally, register both the aggregation visitor and the result extractor as services.
+Finally, register the result extractor as a service.
 
 === "Solr"
 
-    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor` and the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
+    Tag the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 38, 47) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 38, 41) =]]
     ```
 
-    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` and `ibexa.search.solr.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.result.extractor` tag.
 
 === "Elasticsearch"
 
-    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor` and the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
+    Tag the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
 
     ``` yaml
     services:
-    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 48, 57) =]]
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 46, 49) =]]
     ```
 
-    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` and `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tag.