clean up

Author: barseghyanartur

examples/simple/books/models/address.py

@@ -51,3 +51,18 @@ def location_field_indexing(self):
             'lat': self.latitude,
             'lon': self.longitude,
         }
+
+    # @property
+    # def country_indexing(self):
+    #     """Country data (nested) for indexing.
+    #
+    #     :return:
+    #     """
+    #     return {
+    #         'country': {
+    #             'name': self.city.country.name,
+    #             'city': {
+    #                 'name': self.city.name
+    #             }
+    #         }
+    #     }

examples/simple/search_indexes/documents/address.py

@@ -89,6 +89,30 @@ class AddressDocument(DocType):
         }
     )
 
+    # # Country object
+    # country = fields.NestedField(
+    #     attr='country_indexing',
+    #     properties={
+    #         'name': StringField(
+    #             analyzer=html_strip,
+    #             fields={
+    #                 'raw': KeywordField(),
+    #                 'suggest': fields.CompletionField(),
+    #             }
+    #         ),
+    #         'city': fields.ObjectField(
+    #             properties={
+    #                 'name': StringField(
+    #                     analyzer=html_strip,
+    #                     fields={
+    #                         'raw': KeywordField(),
+    #                     }
+    #                 )
+    #             }
+    #         )
+    #     }
+    # )
+
     location = fields.GeoPointField(attr='location_field_indexing')
 
     class Meta(object):

examples/simple/search_indexes/serializers/author.py

@@ -1,3 +1,4 @@
+from rest_framework import serializers
 from django_elasticsearch_dsl_drf.serializers import DocumentSerializer
 
 from ..documents import AuthorDocument
@@ -8,6 +9,8 @@
 class AuthorDocumentSimpleSerializer(DocumentSerializer):
     """Serializer for the Author document."""
 
+    source = serializers.SerializerMethodField()
+
     class Meta(object):
         """Meta options."""
 
@@ -26,3 +29,6 @@ class Meta(object):
             'phone_number',
             'website',
         )
+
+    def get_source(self, obj):
+        return obj._d_

examples/simple/search_indexes/serializers/book.py

@@ -82,8 +82,6 @@ def get_tags(self, obj):
 class BookDocumentSimpleSerializer(DocumentSerializer):
     """Serializer for the Book document."""
 
-    # tags = serializers.SerializerMethodField()
-    # authors = serializers.SerializerMethodField()
     highlight = serializers.SerializerMethodField()
 
     class Meta(object):

scripts/makemigrations.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+cd examples/simple/
+./manage.py makemigrations "$@" --settings=settings.dev

scripts/migrate.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+cd examples/simple/
+./manage.py migrate  "$@" --settings=settings.dev