solve conflicts with categories

products/utils.py

@@ -10,7 +10,7 @@ from django.utils import timezone
 
 import requests
 
-from products.models import Product
+from products.models import Product, CategoryTag
 from companies.models import Company
 from history.models import HistorySync
 from PIL import Image
@@ -144,11 +144,23 @@ def ranked_product_search(keyword, shipping_cost=None, discount=None, categories
 
     # filter by category
     if categories is not None:
+<<<<<<< HEAD
         query = Q()
         for entry in categories:
             query = query | Q(category__name__contains=entry)
         products_qs = products_qs.filter(query)
         # products_qs = products_qs.filter(category__name__in=categories)
+=======
+        # products_qs = products_qs.filter(category__name__in=categories)
+        descendants = []
+        for entry in categories:
+            cat = CategoryTag.objects.filter(label__iexact=entry).first()
+            # append category tag, and children
+            descendants.append(cat)
+            descendants.extend(cat.children.all())
+
+        products_qs = products_qs.filter(category__in=descendants)
+>>>>>>> development
 
     # filter by tags
     if tags is not None: