Simplify index mapping of item authors

Map all fields as keywords
SlovakNationalGallery · Mar 14, 2024 · 1c378e5 · 1c378e5
1 parent 5b76925
commit 1c378e5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/Http/Controllers/Api/V1/ItemController.php b/app/Http/Controllers/Api/V1/ItemController.php
@@ -128,10 +128,10 @@ public function aggregations(Request $request)
                             'multi_terms' => [
                                 'terms' => [
                                     [
-                                        'field' => 'authors.name.keyword',
+                                        'field' => 'authors.name',
                                     ],
                                     [
-                                        'field' => 'authors.authority.id.keyword',
+                                        'field' => 'authors.authority.id',
                                         'missing' => '',
                                     ],
                                 ],
@@ -318,8 +318,8 @@ protected function createQueryBuilder($q, $filter)
                 $authorsBuilder ??= Query::bool();
                 $authorsBuilder->should(
                     is_array($value)
-                        ? ['terms' => ["$field.keyword" => $value]]
-                        : ['term' => ["$field.keyword" => $value]]
+                        ? ['terms' => [$field => $value]]
+                        : ['term' => [$field => $value]]
                 );
                 continue;
             }

diff --git a/config/elasticsearch/mapping/items.php b/config/elasticsearch/mapping/items.php
@@ -22,6 +22,18 @@
         ],
         'authors' => [
             'type' => 'nested',
+            'properties' => [
+                'name' => [
+                    'type' => 'keyword',
+                ],
+                'authority' => [
+                    'properties' => [
+                        'id' => [
+                            'type' => 'keyword',
+                        ],
+                    ],
+                ],
+            ],
         ],
         'authority_id' => [
             'type' => 'keyword',