From c17f9ce820daada20d96d484a6418afad1c25c76 Mon Sep 17 00:00:00 2001
From: evgeniy-st <stoyushko.evgeniy@gmail.com>
Date: Wed, 6 Nov 2019 14:16:10 +0300
Subject: [PATCH] Remove name_translated from establishment. Added
 AddressDetailSerializer to EstablishmentRUDView

---
 apps/establishment/serializers/back.py   | 2 ++
 apps/establishment/serializers/common.py | 4 ----
 apps/search_indexes/serializers.py       | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py
index 1de2c773..8ea41990 100644
--- a/apps/establishment/serializers/back.py
+++ b/apps/establishment/serializers/back.py
@@ -5,6 +5,7 @@ from establishment.serializers import (
     EstablishmentBaseSerializer, PlateSerializer, ContactEmailsSerializer,
     ContactPhonesSerializer, SocialNetworkRelatedSerializers,
     EstablishmentTypeBaseSerializer)
+from location.serializers import AddressDetailSerializer
 from main.models import Currency
 from utils.decorators import with_base_attributes
 from utils.serializers import TimeZoneChoiceField
@@ -55,6 +56,7 @@ class EstablishmentRUDSerializer(EstablishmentBaseSerializer):
         source='establishment_type',
         queryset=models.EstablishmentType.objects.all(), write_only=True
     )
+    address = AddressDetailSerializer()
     phones = ContactPhonesSerializer(read_only=False, many=True, )
     emails = ContactEmailsSerializer(read_only=False, many=True, )
     socials = SocialNetworkRelatedSerializers(read_only=False, many=True, )
diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py
index 85c21ef7..108f8dd0 100644
--- a/apps/establishment/serializers/common.py
+++ b/apps/establishment/serializers/common.py
@@ -189,9 +189,6 @@ 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."""
 
@@ -201,7 +198,6 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
             'name',
             'transliterated_name',
             'index_name',
-            'name_translated',
             'price_level',
             'toque_number',
             'public_mark',
diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py
index 8a60723f..bbc61735 100644
--- a/apps/search_indexes/serializers.py
+++ b/apps/search_indexes/serializers.py
@@ -89,9 +89,6 @@ 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."""
 
@@ -101,7 +98,6 @@ class EstablishmentDocumentSerializer(DocumentSerializer):
             'name',
             'transliterated_name',
             'index_name',
-            'name_translated',
             'price_level',
             'toque_number',
             'public_mark',