From 661f6fb395a5a91ebc57d2894743acd6aa90a9e6 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Wed, 6 Nov 2019 11:25:38 +0300 Subject: [PATCH] Added fields to Establishment model: index_name, tranliterated_name --- .../migrations/0055_auto_20191106_0740.py | 28 +++++++++++++++++++ apps/establishment/models.py | 5 ++-- apps/establishment/serializers/back.py | 2 ++ apps/establishment/serializers/common.py | 5 ++++ .../search_indexes/documents/establishment.py | 3 +- apps/search_indexes/serializers.py | 5 ++++ 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 apps/establishment/migrations/0055_auto_20191106_0740.py diff --git a/apps/establishment/migrations/0055_auto_20191106_0740.py b/apps/establishment/migrations/0055_auto_20191106_0740.py new file mode 100644 index 00000000..78b1c027 --- /dev/null +++ b/apps/establishment/migrations/0055_auto_20191106_0740.py @@ -0,0 +1,28 @@ +# Generated by Django 2.2.4 on 2019-11-06 07:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0054_auto_20191103_2117'), + ] + + operations = [ + migrations.RenameField( + model_name='establishment', + old_name='name_translated', + new_name='index_name', + ), + migrations.AlterField( + model_name='establishment', + name='index_name', + field=models.CharField(default='', max_length=255, verbose_name='Index name'), + ), + migrations.AddField( + model_name='establishment', + name='transliterated_name', + field=models.CharField(default='', max_length=255, verbose_name='Transliterated name'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 83950cbe..d3371e68 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -301,8 +301,9 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin): old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None) name = models.CharField(_('name'), max_length=255, default='') - name_translated = models.CharField(_('Transliterated name'), - max_length=255, default='') + transliterated_name = models.CharField(default='', max_length=255, + verbose_name=_('Transliterated name')) + index_name = models.CharField(_('Index name'), max_length=255, default='') description = TJSONField(blank=True, null=True, default=None, verbose_name=_('description'), help_text='{"en-GB":"some text"}') diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index a8db6000..1de2c773 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -28,6 +28,8 @@ class EstablishmentListCreateSerializer(EstablishmentBaseSerializer): fields = [ 'id', 'name', + 'transliterated_name', + 'index_name', 'website', 'phones', 'emails', diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 50a7acbe..85c21ef7 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -189,6 +189,9 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): tags = TagBaseSerializer(read_only=True, many=True) currency = CurrencySerializer() + # todo: remove field (backward compatibility) + name_translated = serializers.CharField(source='transliterated_name') + class Meta: """Meta class.""" @@ -196,6 +199,8 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): fields = [ 'id', 'name', + 'transliterated_name', + 'index_name', 'name_translated', 'price_level', 'toque_number', diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index 7eac2d6c..19d419aa 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -90,7 +90,8 @@ class EstablishmentDocument(Document): fields = ( 'id', 'name', - 'name_translated', + 'transliterated_name', + 'index_name', 'is_publish', 'price_level', 'toque_number', diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index a356f99b..8a60723f 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -89,6 +89,9 @@ class EstablishmentDocumentSerializer(DocumentSerializer): tags = TagsDocumentSerializer(many=True) schedule = ScheduleDocumentSerializer(many=True, allow_null=True) + # todo: remove field (backward compatibility) + name_translated = serializers.CharField(source='transliterated_name') + class Meta: """Meta class.""" @@ -96,6 +99,8 @@ class EstablishmentDocumentSerializer(DocumentSerializer): fields = ( 'id', 'name', + 'transliterated_name', + 'index_name', 'name_translated', 'price_level', 'toque_number',