Asset metadata relation fix (#150)

Author: markus-moser

src/SearchIndexAdapter/OpenSearch/Asset/FieldDefinitionAdapter/RelationAdapter.php

@@ -29,11 +29,14 @@ public function getIndexMapping(): array
     {
         return [
             'properties' => [
-                'id' => [
+                'object' => [
                     'type' => AttributeType::LONG->value,
                 ],
-                'type' => [
-                    'type' => AttributeType::KEYWORD->value,
+                'asset' => [
+                    'type' => AttributeType::LONG->value,
+                ],
+                'document' => [
+                    'type' => AttributeType::LONG->value,
                 ],
             ],
         ];
@@ -43,8 +46,7 @@ public function normalize(mixed $value): ?array
     {
         if($value instanceof ElementInterface) {
             return [
-                'type' => Service::getElementType($value),
-                'id' => $value->getId(),
+                Service::getElementType($value) => [$value->getId()],
             ];
         }
 
@@ -53,7 +55,7 @@ public function normalize(mixed $value): ?array
 
     protected function getSearchFilterFieldPath(AssetMetaDataFilter|AssetMetaDataAggregation $filter): string
     {
-        return parent::getSearchFilterFieldPath($filter) . '.id';
+        return parent::getSearchFilterFieldPath($filter) . '.' . $filter->getType();
     }
 
     protected function isValidScalar(mixed $value): bool

tests/Unit/SearchIndexAdapter/Asset/FieldDefinitionAdapter/RelationAdapterTest.php

@@ -35,11 +35,14 @@ public function testGetIndexMapping()
 
         $this->assertSame([
             'properties' => [
-                'id' => [
+                'object' => [
                     'type' => 'long',
                 ],
-                'type' => [
-                    'type' => 'keyword',
+                'asset' => [
+                    'type' => 'long',
+                ],
+                'document' => [
+                    'type' => 'long',
                 ],
             ],
         ], $adapter->getIndexMapping());
@@ -56,8 +59,7 @@ public function testNormalize()
         $image->setId(1);
 
         $this->assertSame([
-            'type' => 'asset',
-            'id' => 1,
+           'asset' => [1],
         ], $adapter->normalize($image));
     }
 
@@ -118,7 +120,7 @@ public function testApplySearchFilter()
                 'bool' => [
                     'filter' => [
                         'term' => [
-                            'standard_fields.test.default.id' => 1,
+                            'standard_fields.test.default.asset' => 1,
                         ],
                     ],
                 ],
@@ -134,7 +136,7 @@ public function testApplySearchFilter()
                 'bool' => [
                     'filter' => [
                         'term' => [
-                            'standard_fields.test.en.id' => 2,
+                            'standard_fields.test.en.asset' => 2,
                         ],
                     ],
                 ],
@@ -150,7 +152,49 @@ public function testApplySearchFilter()
                 'bool' => [
                     'filter' => [
                         'terms' => [
-                            'standard_fields.test.en.id' => [1, 2],
+                            'standard_fields.test.en.asset' => [1, 2],
+                        ],
+                    ],
+                ],
+            ],
+        ], $search->toArray());
+
+        $searchIndexConfigServiceInterfaceMock = $this->makeEmpty(SearchIndexConfigServiceInterface::class);
+        $adapter = (new RelationAdapter(
+            $searchIndexConfigServiceInterfaceMock,
+        ))->setType('object');
+
+        $filter = new AssetMetaDataFilter('test', 'object', 1);
+        $search = new Search();
+        $adapter->applySearchFilter($filter, $search);
+
+        $this->assertSame([
+            'query' => [
+                'bool' => [
+                    'filter' => [
+                        'term' => [
+                            'standard_fields.test.default.object' => 1,
+                        ],
+                    ],
+                ],
+            ],
+        ], $search->toArray());
+
+        $searchIndexConfigServiceInterfaceMock = $this->makeEmpty(SearchIndexConfigServiceInterface::class);
+        $adapter = (new RelationAdapter(
+            $searchIndexConfigServiceInterfaceMock,
+        ))->setType('document');
+
+        $filter = new AssetMetaDataFilter('test', 'document', 1);
+        $search = new Search();
+        $adapter->applySearchFilter($filter, $search);
+
+        $this->assertSame([
+            'query' => [
+                'bool' => [
+                    'filter' => [
+                        'term' => [
+                            'standard_fields.test.default.document' => 1,
                         ],
                     ],
                 ],