address to product detail web api

apps/establishment/serializers/common.py

@@ -17,7 +17,7 @@ from utils.serializers import ImageBaseSerializer, CarouselCreateSerializer
 from utils.serializers import (ProjectModelSerializer, TranslatedField,
                                FavoritesCreateSerializer)
 from location.serializers import EstablishmentWineRegionBaseSerializer, \
-                                 EstablishmentWineOriginBaseSerializer
+    EstablishmentWineOriginBaseSerializer
 
 
 class ContactPhonesSerializer(serializers.ModelSerializer):
@@ -239,6 +239,30 @@ class EstablishmentShortSerializer(serializers.ModelSerializer):
         ]
 
 
+class _EstablishmentAddressShortSerializer(serializers.ModelSerializer):
+    """Short serializer for establishment."""
+    city = CitySerializer(source='address.city', allow_null=True)
+    establishment_type = EstablishmentTypeGeoSerializer()
+    establishment_subtypes = EstablishmentSubTypeBaseSerializer(many=True)
+    currency = CurrencySerializer(read_only=True)
+    address = AddressBaseSerializer(read_only=True)
+
+    class Meta:
+        """Meta class."""
+        model = models.Establishment
+        fields = [
+            'id',
+            'name',
+            'index_name',
+            'slug',
+            'city',
+            'establishment_type',
+            'establishment_subtypes',
+            'currency',
+            'address',
+        ]
+
+
 class EstablishmentProductShortSerializer(serializers.ModelSerializer):
     """SHORT Serializer for displaying info about an establishment on product page."""
     establishment_type = EstablishmentTypeGeoSerializer()

apps/product/serializers/common.py

@@ -4,15 +4,15 @@ from rest_framework import serializers
 
 from comment.models import Comment
 from comment.serializers import CommentSerializer
-from establishment.serializers import EstablishmentShortSerializer, EstablishmentProductSerializer, EstablishmentProductShortSerializer
-from gallery.models import Image
+from establishment.serializers import EstablishmentProductShortSerializer
+from establishment.serializers.common import _EstablishmentAddressShortSerializer
+from location.serializers import WineOriginRegionBaseSerializer, WineOriginBaseSerializer
+from main.serializers import AwardSerializer
 from product import models
 from review.serializers import ReviewShortSerializer
+from tag.serializers import TagBaseSerializer, TagCategoryProductSerializer
 from utils import exceptions as utils_exceptions
 from utils.serializers import TranslatedField, FavoritesCreateSerializer, ImageBaseSerializer
-from main.serializers import AwardSerializer
-from location.serializers import WineOriginRegionBaseSerializer, WineOriginBaseSerializer
-from tag.serializers import TagBaseSerializer, TagCategoryProductSerializer
 
 
 class ProductTagSerializer(TagBaseSerializer):
@@ -119,7 +119,7 @@ class ProductBaseSerializer(serializers.ModelSerializer):
 class ProductDetailSerializer(ProductBaseSerializer):
     """Product detail serializer."""
     description_translated = TranslatedField()
-    establishment_detail = EstablishmentShortSerializer(source='establishment', read_only=True)
+    establishment_detail = _EstablishmentAddressShortSerializer(source='establishment', read_only=True)
     review = ReviewShortSerializer(source='last_published_review', read_only=True)
     awards = AwardSerializer(many=True, read_only=True)
     classifications = ProductClassificationBaseSerializer(many=True, read_only=True)