fixup! EZP-27458: Impl. Aggregation API

ezsystems · Sep 3, 2020 · 58bf04e · 58bf04e
1 parent 6f96d6d
commit 58bf04e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../AggregationVisitor/AggregationFieldResolver/CountryFieldTermAggregationFieldResolver.php b/.../AggregationVisitor/AggregationFieldResolver/CountryFieldTermAggregationFieldResolver.php
@@ -45,7 +45,7 @@ private function getSearchFieldName(CountryTermAggregation $aggregation): string
             case CountryTermAggregation::TYPE_NAME:
                 return 'name';
             case CountryTermAggregation::TYPE_ALPHA_2:
-                return 'aplha2';
+                return 'alpha2';
             case CountryTermAggregation::TYPE_ALPHA_3:
                 return 'alpha3';
             case CountryTermAggregation::TYPE_IDC:

diff --git a/lib/Resources/config/container/solr/aggregation_visitors.yml b/lib/Resources/config/container/solr/aggregation_visitors.yml
@@ -76,12 +76,15 @@ services:
       - { name: ezplatform.search.solr.query.content.aggregation_visitor }
       - { name: ezplatform.search.solr.query.location.aggregation_visitor }
 
+  EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver\CountryFieldTermAggregationFieldResolver:
+    arguments:
+      $fieldNameResolver: '@ezpublish.search.common.field_name_resolver'
+
   ezpublish.search.solr.query.common.aggregation_visitor.field.country_term:
     class: EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\TermAggregationVisitor
-    factory: ['@EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor']
     arguments:
       $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation'
-      $searchIndexFieldName: 'alpha2'
+      $aggregationFieldResolver: '@EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver\CountryFieldTermAggregationFieldResolver'
     tags:
       - { name: ezplatform.search.solr.query.content.aggregation_visitor }
       - { name: ezplatform.search.solr.query.location.aggregation_visitor }