wip

Author: barseghyanartur

examples/simple/books/admin.py

@@ -5,6 +5,7 @@
     Author,
     Book,
     City,
+    Continent,
     Country,
     Order,
     OrderLine,
@@ -17,6 +18,7 @@
     'AuthorAdmin',
     'BookAdmin',
     'CityAdmin',
+    'ContinentAdmin',
     'CountryAdmin',
     'OrderAdmin',
     'OrderLineAdmin',
@@ -105,3 +107,12 @@ class CountryAdmin(admin.ModelAdmin):
     list_display = ('name', 'latitude', 'longitude',)
     list_editable = ('latitude', 'longitude',)
     search_fields = ('name',)
+
+
+@admin.register(Continent)
+class ContinentAdmin(admin.ModelAdmin):
+    """Continent admin."""
+
+    list_display = ('name', 'latitude', 'longitude',)
+    list_editable = ('latitude', 'longitude',)
+    search_fields = ('name',)

examples/simple/books/migrations/0015_auto_20180622_1617.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2018-06-22 21:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0014_auto_20171003_1434'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Continent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('info', models.TextField(blank=True, null=True)),
+                ('latitude', models.DecimalField(blank=True, decimal_places=15, default=0, max_digits=19, null=True)),
+                ('longitude', models.DecimalField(blank=True, decimal_places=15, default=0, max_digits=19, null=True)),
+            ],
+            options={
+                'ordering': ['id'],
+            },
+        ),
+        migrations.AddField(
+            model_name='country',
+            name='continent',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='books.Continent'),
+            preserve_default=False,
+        ),
+    ]

examples/simple/books/models/__init__.py

@@ -5,6 +5,7 @@
 from .country import Country
 from .order import Order
 from .order_line import OrderLine
+from .continent import Continent
 from .publisher import Publisher
 from .tag import Tag
 
@@ -13,6 +14,7 @@
     'Author',
     'Book',
     'City',
+    'Continent',
     'Country',
     'Order',
     'OrderLine',

examples/simple/books/models/address.py

@@ -81,3 +81,38 @@ def country_indexing(self):
         })
 
         return wrapper
+
+    @property
+    def continent_indexing(self):
+        """Continent data (nested) for indexing.
+
+        Example:
+
+        >>> mapping = {
+        >>>     'continent': {
+        >>>         'name': 'Asia',
+        >>>         'country': {
+        >>>             'name': 'Netherlands',
+        >>>             'province': {
+        >>>                 'name': 'North Holland',
+        >>>                 'city': {
+        >>>                     'name': 'Amsterdam',
+        >>>                 }
+        >>>             }
+        >>>         }
+        >>>     }
+        >>> }
+
+        :return:
+        """
+        wrapper = dict_to_obj({
+            'name': self.city.country.continent.name,
+            'country': {
+                'name': self.city.country.name,
+                'city': {
+                    'name': self.city.name,
+                }
+            }
+        })
+
+        return wrapper

examples/simple/books/models/continent.py

@@ -0,0 +1,48 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+from six import python_2_unicode_compatible
+
+__all__ = ('Continent',)
+
+
+@python_2_unicode_compatible
+class Continent(models.Model):
+    """Continent."""
+
+    name = models.CharField(max_length=255)
+    info = models.TextField(null=True, blank=True)
+    latitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
+    longitude = models.DecimalField(
+        null=True,
+        blank=True,
+        decimal_places=15,
+        max_digits=19,
+        default=0
+    )
+
+    class Meta(object):
+        """Meta options."""
+
+        ordering = ["id"]
+
+    def __str__(self):
+        return self.name
+
+    @property
+    def location_field_indexing(self):
+        """Location for indexing.
+
+        Used in Elasticsearch indexing/tests of `geo_distance` native filter.
+        """
+        return {
+            'lat': self.latitude,
+            'lon': self.longitude,
+        }

examples/simple/books/models/country.py

@@ -13,6 +13,7 @@ class Country(models.Model):
 
     name = models.CharField(max_length=255)
     info = models.TextField(null=True, blank=True)
+    continent = models.ForeignKey('books.Continent', on_delete=models.CASCADE)
     latitude = models.DecimalField(
         null=True,
         blank=True,

examples/simple/factories/__init__.py

@@ -2,6 +2,7 @@
 from .books_address import AddressFactory
 from .books_author import *
 from .books_book import *
+from .books_continent import *
 from .books_city import CityFactory
 from .books_country import CountryFactory
 from .books_order import OrderFactory

examples/simple/factories/books_continent.py

@@ -0,0 +1,36 @@
+from factory import DjangoModelFactory
+from factory.fuzzy import FuzzyChoice
+
+from books.models import Continent
+
+from .factory_faker import Faker
+
+__all__ = ('ContinentFactory',)
+
+
+class BaseContinentFactory(DjangoModelFactory):
+    """Base continent factory."""
+
+    name = FuzzyChoice([
+        'Asia',
+        'Africa',
+        'North America',
+        'South America',
+        'Antarctica',
+        'Europe',
+        'Australia'
+    ])
+    info = Faker('text')
+    latitude = Faker('latitude')
+    longitude = Faker('longitude')
+
+    class Meta(object):
+        """Meta class."""
+
+        model = Continent
+        abstract = True
+        django_get_or_create = ('name',)
+
+
+class ContinentFactory(BaseContinentFactory):
+    """Continent factory."""

examples/simple/factories/books_country.py

@@ -1,4 +1,4 @@
-from factory import DjangoModelFactory
+from factory import DjangoModelFactory, SubFactory
 
 from books.models import Country
 
@@ -12,6 +12,7 @@ class BaseCountryFactory(DjangoModelFactory):
 
     name = Faker('country')
     info = Faker('text')
+    continent = SubFactory('factories.books_continent.ContinentFactory')
     latitude = Faker('latitude')
     longitude = Faker('longitude')
 

examples/simple/search_indexes/documents/address.py

@@ -100,7 +100,7 @@ class AddressDocument(DocType):
                     'suggest': fields.CompletionField(),
                 }
             ),
-            'city': fields.NestedField(
+            'city': fields.ObjectField(
                 properties={
                     'name': StringField(
                         analyzer=html_strip,
@@ -113,6 +113,39 @@ class AddressDocument(DocType):
         }
     )
 
+    # Continent object
+    continent = fields.NestedField(
+        attr='continent_indexing',
+        properties={
+            'name': StringField(
+                analyzer=html_strip,
+                fields={
+                    'raw': KeywordField(),
+                }
+            ),
+            'country': fields.ObjectField(
+                properties={
+                    'name': StringField(
+                        analyzer=html_strip,
+                        fields={
+                            'raw': KeywordField(),
+                        }
+                    ),
+                    'city': fields.ObjectField(
+                        properties={
+                            'name': StringField(
+                                analyzer=html_strip,
+                                fields={
+                                    'raw': KeywordField(),
+                                }
+                            )
+                        }
+                    )
+                }
+            )
+        }
+    )
+
     location = fields.GeoPointField(attr='location_field_indexing')
 
     class Meta(object):