Fix attribute filters in parent category

CHANGELOG.md

@@ -42,3 +42,4 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fixed hard-coded site name in order PDFs - #3526 by @NyanKiyoshi
 - Extract enums to separate files - #3523 by @maarcingebala
 - Add default variant create to Product mutations - #3505 by @fowczarek
+- Fix attribute filters in parent category - #3535 by @fowczarek

saleor/product/filters.py

@@ -88,10 +88,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def _get_product_attributes_lookup(self):
-        return Q(product_type__products__category=self.category)
+        categories = self.category.get_descendants(include_self=True)
+        return Q(product_type__products__category__in=categories)
 
     def _get_variant_attributes_lookup(self):
-        return Q(product_variant_type__products__category=self.category)
+        categories = self.category.get_descendants(include_self=True)
+        return Q(product_variant_type__products__category__in=categories)
 
 
 class ProductCollectionFilter(ProductFilter):

tests/conftest.py

@@ -255,11 +255,22 @@ def category_with_image(db, image):  # pylint: disable=W0613
 
 
 @pytest.fixture
-def categories_tree(db):
+def categories_tree(db, product_type):  # pylint: disable=W0613
     parent = Category.objects.create(name='Parent', slug='parent')
     parent.children.create(name='Child', slug='child')
+    child = parent.children.first()
+
+    product_attr = product_type.product_attributes.first()
+    attr_value = product_attr.values.first()
+    attributes = {smart_text(product_attr.pk): smart_text(attr_value.pk)}
+
+    Product.objects.create(
+        name='Test product', price=Money('10.00', 'USD'),
+        product_type=product_type, attributes=attributes, category=child)
+
     return parent
 
+
 @pytest.fixture
 def non_default_category(db):  # pylint: disable=W0613
     return Category.objects.create(name='Not default', slug='not-default')

tests/test_category.py

@@ -0,0 +1,13 @@
+from saleor.product.filters import ProductCategoryFilter
+
+
+def test_product_category_filter_filters_from_child_category(
+        product_type, categories_tree):
+    product_filter = ProductCategoryFilter(data={}, category=categories_tree)
+    (product_attributes, variant_attributes) = product_filter._get_attributes()
+
+    attribut = product_type.product_attributes.get()
+    variant = product_type.variant_attributes.get()
+
+    assert attribut in product_attributes
+    assert variant in variant_attributes