Only add super attributes if they're also in the flat table (#393)

rapidez · Dec 6, 2023 · d912784 · d912784
1 parent bed0dd5
commit d912784
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Casts/QuoteItems.php b/src/Casts/QuoteItems.php
@@ -14,7 +14,7 @@ public function get($model, $key, $value, $attributes)
         // which joins the catalog_product_super_attribute_label table.
         $attributeModel = config('rapidez.models.attribute');
         $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'];
+            return $attribute['super'] && $attribute['flat'];
         }), 'name', 'id');
 
         $items = json_decode($value);

diff --git a/src/Listeners/MagentoSettingsHealthcheck.php b/src/Listeners/MagentoSettingsHealthcheck.php
@@ -54,7 +54,7 @@ public function handle()
             ];
         }
 
-        $superAttributesCount = count($attributeModel::getCachedWhere(fn ($attribute) => $attribute['super']));
+        $superAttributesCount = count($attributeModel::getCachedWhere(fn ($attribute) => $attribute['super'] && $attribute['flat']));
         $joinCount = ($superAttributesCount * 2) + (count($nonFlatAttributes) * 3) + 4;
 
         if ($joinCount > 58) {

diff --git a/src/Models/Scopes/Product/WithProductChildrenScope.php b/src/Models/Scopes/Product/WithProductChildrenScope.php
@@ -16,7 +16,7 @@ public function apply(Builder $builder, Model $model)
         $attributeModel = config('rapidez.models.attribute');
 
         $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'];
+            return $attribute['super'] && $attribute['flat'];
         }), 'code');
 
         $grammar = $builder->getQuery()->getGrammar();

diff --git a/src/Models/Scopes/Product/WithProductSuperAttributesScope.php b/src/Models/Scopes/Product/WithProductSuperAttributesScope.php
@@ -14,7 +14,7 @@ public function apply(Builder $builder, Model $model)
     {
         $attributeModel = config('rapidez.models.attribute');
         $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'];
+            return $attribute['super'] && $attribute['flat'];
         }), 'code', 'id');
 
         $grammar = $builder->getQuery()->getGrammar();

diff --git a/src/Models/Traits/Product/CastSuperAttributes.php b/src/Models/Traits/Product/CastSuperAttributes.php
@@ -10,7 +10,7 @@ protected function getSuperAttributeCasts(): array
     {
         $attributeModel = config('rapidez.models.attribute');
         $superAttributes = Arr::pluck($attributeModel::getCachedWhere(function ($attribute) {
-            return $attribute['super'];
+            return $attribute['super'] && $attribute['flat'];
         }), 'code');
 
         foreach ($superAttributes as $superAttribute) {