Merge #295

295: Fix using distinct attribute setting r=brunoocasali a=norkunas

# Pull Request

## Related issue
Fixes #273

## What does this PR do?
- Fixes updating distinct attribute setting and allows to set it as a string instead of an array

## PR checklist
Please check if your PR fulfills the following requirements:
- [x] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)?
- [x] Have you read the contributing guidelines?
- [x] Have you made sure that the title is accurate and descriptive of the changes?

Temporary fix until we'll provide proper configuration schema for each setting separately.

Co-authored-by: Tomas <[email protected]>

Author: meili-bors[bot]

src/Command/MeilisearchCreateCommand.php

@@ -92,6 +92,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
                     if (isset($value['_service']) && $value['_service'] instanceof SettingsProvider) {
                         $value = $value['_service']();
+                    } elseif ('distinctAttribute' === $variable && is_array($value)) {
+                        $value = $value[0] ?? null;
                     }
 
                     // Update

src/Command/MeilisearchImportCommand.php

@@ -161,6 +161,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
                         if (isset($value['_service']) && $value['_service'] instanceof SettingsProvider) {
                             $value = $value['_service']();
+                        } elseif ('distinctAttribute' === $variable && is_array($value)) {
+                            $value = $value[0] ?? null;
                         }
 
                         // Update

src/DependencyInjection/Configuration.php

@@ -61,6 +61,16 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->end()
                             ->arrayNode('settings')
                                 ->info('Configure indices settings, see: https://www.meilisearch.com/docs/reference/api/settings')
+                                ->beforeNormalization()
+                                    ->always()
+                                    ->then(static function (array $value) {
+                                        if (isset($value['distinctAttribute']) && !is_array($value['distinctAttribute'])) {
+                                            $value['distinctAttribute'] = (array) $value['distinctAttribute'];
+                                        }
+
+                                        return $value;
+                                    })
+                                ->end()
                                 ->arrayPrototype()
                                     ->variablePrototype()->end()
                                 ->end()

tests/Unit/ConfigurationTest.php

@@ -180,6 +180,40 @@ public function dataTestConfigurationTree(): array
                     'doctrineSubscribedEvents' => ['postPersist', 'postUpdate', 'preRemove'],
                 ],
             ],
+            'distinct attribute' => [
+                [
+                    'prefix' => 'sf_',
+                    'indices' => [
+                        [
+                            'name' => 'items',
+                            'class' => 'App\Entity\Post',
+                            'settings' => [
+                                'distinctAttribute' => 'product_id',
+                            ],
+                        ],
+                    ],
+                ],
+                [
+                    'url' => 'http://localhost:7700',
+                    'prefix' => 'sf_',
+                    'indices' => [
+                        [
+                            'name' => 'items',
+                            'class' => 'App\Entity\Post',
+                            'enable_serializer_groups' => false,
+                            'serializer_groups' => ['searchable'],
+                            'index_if' => null,
+                            'settings' => [
+                                'distinctAttribute' => ['product_id'],
+                            ],
+                        ],
+                    ],
+                    'nbResults' => 20,
+                    'batchSize' => 500,
+                    'serializer' => 'serializer',
+                    'doctrineSubscribedEvents' => ['postPersist', 'postUpdate', 'preRemove'],
+                ],
+            ],
         ];
     }
 }