fix(models): Remove relations from indexed model fields (#233)

* Ensure that relational fields are not considered at index init time

Signed-off-by: John Griebel <[email protected]>

* fix(models): Get all_model_fields on Django >= 1.8 too

Author: PLNech

algoliasearch_django/models.py

@@ -81,9 +81,9 @@ def __init__(self, model, client, settings):
         self.__translate_fields = {}
 
         try:
-            all_model_fields = model._meta.get_all_field_names()
-        except AttributeError:  # get_all_field_names is removed in Django >= 1.10
-            all_model_fields = [f.name for f in model._meta.get_fields()]
+            all_model_fields = [f.name for f in model._meta.get_fields() if not f.is_relation]
+        except AttributeError: # get_fields requires Django >= 1.8
+            all_model_fields = [f.name for f in model._meta.local_fields]
 
         if isinstance(self.fields, str):
             self.fields = (self.fields,)

tests/models.py

@@ -67,3 +67,8 @@ def property_should_not_index(self):
     @property
     def property_string(self):
         return "foo"
+
+
+class BlogPost(models.Model):
+    author = models.ForeignKey(User)
+    text = models.TextField(default="")

tests/test_index.py

@@ -59,6 +59,11 @@ class WebsiteIndex(AlgoliaIndex):
         except AttributeError:
             self.assertRegexpMatches(index.index_name, regex)
 
+    def test_index_model_with_foreign_key_reference(self):
+        index = AlgoliaIndex(User, self.client, settings.ALGOLIA)
+        index.reindex_all()
+        self.assertFalse("blogpost" in index.fields)
+
     def test_index_name_settings(self):
         algolia_settings = dict(settings.ALGOLIA)
         del algolia_settings['INDEX_PREFIX']