Handle fallback for languages better for feature and feature values

jolelievre · Nov 17, 2023 · b72452a · b72452a
1 parent 8ef11bf
commit b72452a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/Adapter/Feature/Repository/FeatureValueRepository.php b/src/Adapter/Feature/Repository/FeatureValueRepository.php
@@ -178,7 +178,7 @@ public function getFeatureValues(?int $limit = null, ?int $offset = null, ?array
         }
         $featureValueIds = array_keys($indexedFeatureValues);
 
-        $localizedFeatureValues = $this->getFeatureValueLocalizedValues($featureValueIds, $filters['id_lang'] ?? null);
+        $localizedFeatureValues = $this->getFeatureValueLocalizedValues($featureValueIds, $filters);
         foreach ($localizedFeatureValues as $localizedFeatureValue) {
             $indexedFeatureValues[$localizedFeatureValue['id_feature_value']]['localized_values'][$localizedFeatureValue['id_lang']] = $localizedFeatureValue['value'];
         }
@@ -213,22 +213,24 @@ public function getFeatureValuesCount(?array $filters = []): int
 
     /**
      * @param array $featureValuesIds
-     * @param int|null $langId
+     * @param array $filters
      *
      * @return array
      */
-    private function getFeatureValueLocalizedValues(array $featureValuesIds, ?int $langId): array
+    private function getFeatureValueLocalizedValues(array $featureValuesIds, array $filters): array
     {
         $qb = $this->connection->createQueryBuilder();
         $qb->from($this->dbPrefix . 'feature_value_lang', 'fvl')
             ->select('fvl.*')
             ->where('fvl.id_feature_value IN(:featureValueIds)')
             ->setParameter('featureValueIds', $featureValuesIds, Connection::PARAM_INT_ARRAY)
         ;
-        if (!empty($langId)) {
+
+        if (!empty($filters['id_lang'])) {
+            $languageIds = is_array($filters['id_lang']) ? $filters['id_lang'] : [$filters['id_lang']];
             $qb
-                ->andWhere('fvl.id_lang = :langId')
-                ->setParameter('langId', $langId)
+                ->andWhere('fvl.id_lang IN (:languageIds)')
+                ->setParameter('languageIds', $languageIds, Connection::PARAM_INT_ARRAY)
             ;
         }
 

diff --git a/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/FeatureValuesChoiceProvider.php
@@ -81,8 +81,11 @@ public function getChoices(array $options)
         if (isset($options['custom'])) {
             $filters['custom'] = $options['custom'];
         }
-        $filters['id_lang'] = $options['id_lang'] ?? $this->contextLanguageId;
-        $cacheKey = implode('-', $filters);
+        $filters['id_lang'] = [
+            $this->contextLanguageId,
+            $this->defaultLanguageId,
+        ];
+        $cacheKey = md5(serialize($filters));
 
         if (!empty($this->cacheFeatureValueChoices[$cacheKey])) {
             return $this->cacheFeatureValueChoices[$cacheKey];
@@ -101,6 +104,9 @@ public function getChoices(array $options)
             $this->cacheFeatureValueChoices[$cacheKey][$featureValueName] = (int) $feature['id_feature_value'];
         }
 
+        // Order alphabetically
+        ksort($this->cacheFeatureValueChoices[$cacheKey]);
+
         return $this->cacheFeatureValueChoices[$cacheKey];
     }
 }
diff --git a/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
@@ -85,12 +85,17 @@ public function getChoices()
         foreach ($features as $feature) {
             if (!empty($feature['localized_names'][$this->contextLanguageId])) {
                 $featureName = $feature['localized_names'][$this->contextLanguageId];
-            } else {
+            } elseif (!empty($feature['localized_names'][$this->defaultLanguageId])) {
                 $featureName = $feature['localized_names'][$this->defaultLanguageId];
+            } else {
+                $featureName = reset($feature['localized_names']);
             }
             $this->cacheFeatureChoices[$featureName] = $feature['id_feature'];
         }
 
+        // Order alphabetically
+        ksort($this->cacheFeatureChoices);
+
         return $this->cacheFeatureChoices;
     }
 }