From 2e21447ba2eefabe45446dac6a231d9cfae15f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hrvoje=20Kne=C5=BEevi=C4=87?= <hrvoje.k@netgen.io>
Date: Mon, 13 Jan 2025 15:04:38 +0100
Subject: [PATCH] Convert UserEnabledFieldMapper to block mapper, make
 criterion visitor available for both content and location search

---
 .../{Content => Common}/CriterionVisitor/UserEnabled.php      | 2 +-
 lib/Resources/config/search/solr/criterion_visitors.yaml      | 3 ++-
 lib/Resources/config/search/solr/field_mappers.yaml           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename lib/Core/Search/Solr/Query/{Content => Common}/CriterionVisitor/UserEnabled.php (88%)

diff --git a/lib/Core/Search/Solr/Query/Content/CriterionVisitor/UserEnabled.php b/lib/Core/Search/Solr/Query/Common/CriterionVisitor/UserEnabled.php
similarity index 88%
rename from lib/Core/Search/Solr/Query/Content/CriterionVisitor/UserEnabled.php
rename to lib/Core/Search/Solr/Query/Common/CriterionVisitor/UserEnabled.php
index 5fd648a9..e9fb15e5 100644
--- a/lib/Core/Search/Solr/Query/Content/CriterionVisitor/UserEnabled.php
+++ b/lib/Core/Search/Solr/Query/Common/CriterionVisitor/UserEnabled.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Content\CriterionVisitor;
+namespace Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Common\CriterionVisitor;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Solr\Query\CriterionVisitor;
diff --git a/lib/Resources/config/search/solr/criterion_visitors.yaml b/lib/Resources/config/search/solr/criterion_visitors.yaml
index d1304944..8b577ce0 100644
--- a/lib/Resources/config/search/solr/criterion_visitors.yaml
+++ b/lib/Resources/config/search/solr/criterion_visitors.yaml
@@ -95,6 +95,7 @@ services:
             - { name: ibexa.search.solr.query.location.criterion.visitor }
 
     netgen.ibexa_search_extra.solr.query.content.criterion_visitor.user_enabled:
-        class: Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Content\CriterionVisitor\UserEnabled
+        class: Netgen\IbexaSearchExtra\Core\Search\Solr\Query\Common\CriterionVisitor\UserEnabled
         tags:
             - { name: ibexa.search.solr.query.content.criterion.visitor }
+            - { name: ibexa.search.solr.query.location.criterion.visitor }
diff --git a/lib/Resources/config/search/solr/field_mappers.yaml b/lib/Resources/config/search/solr/field_mappers.yaml
index 12e36eaa..31bb9029 100644
--- a/lib/Resources/config/search/solr/field_mappers.yaml
+++ b/lib/Resources/config/search/solr/field_mappers.yaml
@@ -28,7 +28,7 @@ services:
         tags:
             - { name: ibexa.search.solr.field.mapper.location }
 
-    netgen.ibexa_search_extra.solr.field_mapper.content.user_enabled:
+    netgen.ibexa_search_extra.solr.field_mapper.common.user_enabled:
         class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\UserEnabledFieldMapper
         tags:
-            - { name: ibexa.search.solr.field.mapper.content }
+            - { name: ibexa.search.solr.field.mapper.block }