From f05fab832972dbbfb069bef9cc6cfdca584dc9f0 Mon Sep 17 00:00:00 2001 From: dormantman Date: Thu, 30 Jan 2020 15:07:46 +0300 Subject: [PATCH] Reformat establishment back serializer --- .../migrations/0087_western_field.py | 24 +++++++++++++++++++ apps/establishment/models.py | 2 -- apps/establishment/serializers/back.py | 9 +++++-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 apps/establishment/migrations/0087_western_field.py diff --git a/apps/establishment/migrations/0087_western_field.py b/apps/establishment/migrations/0087_western_field.py new file mode 100644 index 00000000..bf0e74a0 --- /dev/null +++ b/apps/establishment/migrations/0087_western_field.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.7 on 2020-01-29 13:01 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import utils.models + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('establishment', '0086_auto_20200129_1301'), + ] + + operations = [ + migrations.RemoveField( + model_name='establishment', + name='western_name', + ), + ] + + diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 1e471ab9..75c5a164 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -550,8 +550,6 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin, name = models.CharField(_('name'), max_length=255, default='') transliterated_name = models.CharField(default='', max_length=255, verbose_name=_('Transliterated name')) - western_name = models.CharField(default='', max_length=255, - verbose_name=_('Western name')) index_name = models.CharField(_('Index name'), max_length=255, default='') description = TJSONField(blank=True, null=True, default=None, verbose_name=_('description'), diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index 72751b77..db21a82b 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -93,6 +93,9 @@ class EstablishmentListCreateSerializer(model_serializers.EstablishmentBaseSeria 'socials', 'image_url', 'slug', + 'facebook', + 'twitter', + 'instagram', # TODO: check in admin filters 'is_publish', 'guestonline_id', @@ -100,7 +103,6 @@ class EstablishmentListCreateSerializer(model_serializers.EstablishmentBaseSeria 'tags', 'tz', 'address_id', - 'western_name', ] def create(self, validated_data): @@ -162,7 +164,7 @@ class EstablishmentRUDSerializer(model_serializers.EstablishmentBaseSerializer): fields = [ 'id', 'slug', - 'western_name', + 'transliterated_name', 'name', 'website', 'phones', @@ -173,6 +175,9 @@ class EstablishmentRUDSerializer(model_serializers.EstablishmentBaseSerializer): 'type', 'socials', 'image_url', + 'facebook', + 'twitter', + 'instagram', # TODO: check in admin filters 'is_publish', 'address',