Fixing more index and tests

Author: safwanrahman

django_elasticsearch_dsl/indices.py

@@ -11,15 +11,18 @@
 class Index(DSLIndex):
     def __init__(self, *args, **kwargs):
         super(Index, self).__init__(*args, **kwargs)
-        self._settings = deepcopy(DEDConfig.default_index_settings())
+        default_index_settings = deepcopy(DEDConfig.default_index_settings())
+        self.settings(**default_index_settings)
 
-    def doc_type(self, doc_type, *args, **kwargs):
+    def document(self, document):
         """
-        Extend to register the doc_type in the global document registry
+        Extend to register the document in the global document registry
         """
-        doc_type = super(Index, self).doc_type(doc_type, *args, **kwargs)
-        registry.register(self, doc_type)
-        return doc_type
+        document = super(Index, self).document(document)
+        registry.register_document(document)
+        return document
+
+    doc_type = document
 
     def __str__(self):
         return self._name

django_elasticsearch_dsl/management/commands/search_index.py

@@ -59,6 +59,7 @@ def _get_models(self, args):
             for arg in args:
                 arg = arg.lower()
                 match_found = False
+                print(registry.get_models())
 
                 for model in registry.get_models():
                     if model._meta.app_label == arg:

django_elasticsearch_dsl/registries.py

@@ -1,4 +1,6 @@
 from collections import defaultdict
+from copy import deepcopy
+
 from itertools import chain
 
 from django.core.exceptions import ImproperlyConfigured
@@ -75,6 +77,11 @@ def register_document(self, document):
         fields = document._doc_type.mapping.properties.properties.to_dict()
         setattr(document, '_fields', fields)
 
+        # Update settings of the document index
+        default_index_settings = deepcopy(DEDConfig.default_index_settings())
+        document._index.settings(**default_index_settings)
+        print(type(document._index))
+
         # Register the document and index class to our registry
         self.register(index=document._index, doc_class=document)
 

tests/fixtures.py

@@ -29,15 +29,16 @@ def _generate_doc_mock(self, _model, index=None, mock_qs=None,
                            _ignore_signals=False, _related_models=None):
         _index = index
 
-        @self.registry.register_document
-        @_index.document
         class Doc(DocType):
 
             class Django:
                 model = _model
                 related_models = _related_models if _related_models is not None else []
                 ignore_signals = _ignore_signals
 
+        if _index:
+            _index.document(Doc)
+            self.registry.register_document(Doc)
 
         Doc.update = Mock()
         if mock_qs:

tests/test_commands.py

@@ -5,18 +5,34 @@
 from django.core.management import call_command
 from django.utils.six import StringIO
 
+from django_elasticsearch_dsl import Index
 from django_elasticsearch_dsl.management.commands.search_index import Command
 from django_elasticsearch_dsl.registries import DocumentRegistry
 
 from .fixtures import WithFixturesMixin
 
 
 class SearchIndexTestCase(WithFixturesMixin, TestCase):
+    def _mock_setup(self):
+        # Mock Patch object
+        patch_registry = patch(
+            'django_elasticsearch_dsl.management.commands.search_index.registry', self.registry)
+
+        patch_registry.start()
+
+        methods = ['delete', 'create']
+        for index in [self.index_a, self.index_b]:
+            for method in methods:
+                obj_patch = patch.object(index, method)
+                obj_patch.start()
+
+        self.addCleanup(patch.stopall)
+
     def setUp(self):
         self.out = StringIO()
         self.registry = DocumentRegistry()
-        self.index_a = Mock()
-        self.index_b = Mock()
+        self.index_a = Index('foo')
+        self.index_b = Index('bar')
 
         self.doc_a1_qs = Mock()
         self.doc_a1 = self._generate_doc_mock(
@@ -38,6 +54,8 @@ def setUp(self):
             self.ModelC, self.index_b, self.doc_c1_qs
         )
 
+        self._mock_setup()
+
     def test_get_models(self):
         cmd = Command()
         with patch(
@@ -97,15 +115,11 @@ def test_force_delete_all_indices(self):
             self.index_b.delete.assert_called_once()
 
     def test_force_delete_bar_model_c_index(self):
-
-        with patch(
-            'django_elasticsearch_dsl.management.commands.'
-            'search_index.registry',
-            self.registry
-        ):
+        with patch.object(self.index_b, 'delete'):
             call_command('search_index', stdout=self.out,
-                         models=['bar.ModelC'],
+                         models=[self.ModelC._meta.label],
                          action='delete', force=True)
+            print(dir(self.index_b.delete))
             self.index_b.delete.assert_called_once()
             self.assertFalse(self.index_a.delete.called)
 

tests/test_indices.py

@@ -17,14 +17,14 @@ def test_documents_add_to_register(self):
         registry = self.registry
         with patch('django_elasticsearch_dsl.indices.registry', new=registry):
             index = Index('test')
-            doc_a1 = self._generate_doc_mock(self.ModelA, index)
-            doc_a2 = self._generate_doc_mock(self.ModelA, index)
-            index.doc_type(doc_a1)
+            doc_a1 = self._generate_doc_mock(self.ModelA)
+            doc_a2 = self._generate_doc_mock(self.ModelA)
+            index.document(doc_a1)
             docs = list(registry.get_documents())
             self.assertEqual(len(docs), 1)
             self.assertIs(docs[0], doc_a1)
 
-            index.doc_type(doc_a2)
+            index.document(doc_a2)
             docs = registry.get_documents()
             self.assertEqual(docs, set([doc_a1, doc_a2]))