Bug 25278: (follow-up) Fix other occurrences

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index 9b1c8cc..5212c2a 100755 (executable)
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -166,8 +166,10 @@ if ( $op eq 'edit' ) {
         $schema->storage->txn_commit;
 
         my $cache = Koha::Caches->get_instance();
-        $cache->clear_from_cache('elasticsearch_search_fields_staff_client');
-        $cache->clear_from_cache('elasticsearch_search_fields_opac');
+        $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
+        $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
+        $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
+        $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
 
         $update_mappings->();
     }

diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
index d1e5a5c..a3ff646 100644 (file)
--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
@@ -103,8 +103,10 @@ $se->mock( 'get_elasticsearch_mappings', sub {
 
 my $cache = Koha::Caches->get_instance();
 my $clear_search_fields_cache = sub {
-    $cache->clear_from_cache('elasticsearch_search_fields_staff_client');
-    $cache->clear_from_cache('elasticsearch_search_fields_opac');
+    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
+    $cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
+    $cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
+    $cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');
 };
 
 subtest 'build_authorities_query_compat() tests' => sub {

diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t
index dc8e29a..0c07a26 100644 (file)
--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t
+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/Reset.t
@@ -73,5 +73,7 @@ is($title_sf->weight, '20.00', 'Title search field is weighted with 20');
 $schema->storage->txn_rollback;
 
 $cache = Koha::Caches->get_instance();
-$cache->clear_from_cache('elasticsearch_search_fields_staff_client');
-$cache->clear_from_cache('elasticsearch_search_fields_opac');
+$cache->clear_from_cache('elasticsearch_search_fields_staff_client_biblios');
+$cache->clear_from_cache('elasticsearch_search_fields_opac_biblios');
+$cache->clear_from_cache('elasticsearch_search_fields_staff_client_authorities');
+$cache->clear_from_cache('elasticsearch_search_fields_opac_authorities');