Prevent index from being deleted when a exception occurs (#75)

* Prevent index from being deleted when a exception occurs * lint * We dont need try except haha| --------- Co-authored-by: Joey Jurjens <[email protected]>
django-oscar · Nov 21, 2024 · 4b46d83 · 4b46d83
1 parent 1dd8994
commit 4b46d83
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/oscar_elasticsearch/search/indexing/indexer.py b/oscar_elasticsearch/search/indexing/indexer.py
@@ -126,11 +126,8 @@ def reindex(self):
                 index.reindex_objects(chunk)
         """
         self.indexer.start()
-
-        try:
-            yield self
-        finally:
-            self.indexer.finish()
+        yield self
+        self.indexer.finish()
 
     def reindex_objects(self, objects):
         es_data = self.make_documents(objects)

diff --git a/oscar_elasticsearch/search/tests.py b/oscar_elasticsearch/search/tests.py
@@ -272,6 +272,25 @@ def test_popularity_based_on_order_lines(self):
                 quantity,
             )
 
+    def test_exception_does_not_delete_index(self):
+        call_command("update_index_products")
+        sleep(3)
+
+        results, total_hits = self.product_index.search()
+        self.assertEqual(results.count(), 4)
+        self.assertEqual(total_hits, 4)
+
+        with self.assertRaises(Exception):
+            with ProductElasticsearchIndex().reindex() as index:
+                # Trigger an error by not passing products
+                index.reindex_objects(Category.objects.all())
+                sleep(3)
+
+        # It should still have the same amount of products.
+        results, total_hits = self.product_index.search()
+        self.assertEqual(results.count(), 4)
+        self.assertEqual(total_hits, 4)
+
 
 class TestBrowsableItems(TestCase):