Merge pull request #69 from django-oscar/index-all-records

[FEAT] Index all records of products and categories

oscar_elasticsearch/search/management/commands/update_index_categories.py

@@ -14,7 +14,7 @@
 
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        categories = Category.objects.browsable()
+        categories = Category.objects.all()
 
         with CategoryElasticsearchIndex().reindex() as index:
             for chunk in chunked(categories, settings.INDEXING_CHUNK_SIZE):

oscar_elasticsearch/search/management/commands/update_index_products.py

@@ -20,7 +20,7 @@ def handle(self, *args, **options):
         if options["debug"]:
             return self.handle_debug()
 
-        products = Product.objects.browsable()
+        products = Product.objects.all()
         products_total = products.count()
 
         with ProductElasticsearchIndex().reindex() as index:
@@ -39,7 +39,7 @@ def handle_debug(self):
         This is useful when debugging the performance of the indexing process.
         """
         overall_start_time = time.time()
-        products = Product.objects.browsable()
+        products = Product.objects.all()
         products_total = products.count()
         total_chunks = products_total / settings.INDEXING_CHUNK_SIZE
         processed_chunks = 0

oscar_elasticsearch/search/tests.py

@@ -217,12 +217,31 @@ def create_parent_child_products():
         create_parent_child_products()
         self.assertEqual(Product.objects.count(), 64)  # 4 inside the fixtures
 
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(23):
             call_command("update_index_products")
 
         # create 10 extra product with each 5 childs
         create_parent_child_products()
 
         # The amount of queries should not change.
-        with self.assertNumQueries(19):
+        with self.assertNumQueries(23):
             call_command("update_index_products")
+
+
+class TestBrowsableItems(TestCase):
+
+    def test_child_products_hidden_in_category_view(self):
+        for _ in range(2):
+            parent = ProductFactory(structure="parent", stockrecords=[])
+            for _ in range(5):
+                ProductFactory(structure="child", parent=parent, categories=[])
+
+        call_command("update_index_products")
+        sleep(3)
+
+        url = reverse("catalogue:index")
+        response = self.client.get(url)
+        products = response.context_data["page_obj"].object_list
+
+        self.assertEqual(len(products), 2)
+        self.assertFalse(any([product.structure == "child" for product in products]))

oscar_elasticsearch/search/views/base.py

@@ -45,7 +45,10 @@ def get_scoring_functions(self):
         return self.scoring_functions if self.scoring_functions else None
 
     def get_default_filters(self):
-        filters = [{"term": {"is_public": True}}]
+        filters = [
+            {"term": {"is_public": True}},
+            {"terms": {"structure": ["parent", "standalone"]}},
+        ]
 
         if settings.FILTER_AVAILABLE:
             filters.append({"term": {"is_available": True}})