add address to establishment similar and collection establishment

This commit is contained in:
alex 2019-11-16 16:57:26 +03:00
parent 4e005a7a4d
commit 78e42550c1
3 changed files with 14 additions and 7 deletions

View File

@ -1,11 +1,11 @@
from django.shortcuts import get_object_or_404
from rest_framework import generics from rest_framework import generics
from rest_framework import permissions from rest_framework import permissions
from collection import models from collection import models
from utils.pagination import ProjectPageNumberPagination
from django.shortcuts import get_object_or_404
from establishment.serializers import EstablishmentBaseSerializer
from collection.serializers import common as serializers from collection.serializers import common as serializers
from establishment.serializers import EstablishmentSimilarSerializer
from utils.pagination import ProjectPageNumberPagination
# Mixins # Mixins
@ -53,7 +53,7 @@ class CollectionEstablishmentListView(CollectionListView):
"""Retrieve list of establishment for collection.""" """Retrieve list of establishment for collection."""
lookup_field = 'slug' lookup_field = 'slug'
pagination_class = ProjectPageNumberPagination pagination_class = ProjectPageNumberPagination
serializer_class = EstablishmentBaseSerializer serializer_class = EstablishmentSimilarSerializer
def get_queryset(self): def get_queryset(self):
""" """

View File

@ -17,6 +17,7 @@ from review.serializers import ReviewShortSerializer
class ContactPhonesSerializer(serializers.ModelSerializer): class ContactPhonesSerializer(serializers.ModelSerializer):
"""Contact phone serializer""" """Contact phone serializer"""
class Meta: class Meta:
model = models.ContactPhone model = models.ContactPhone
fields = [ fields = [
@ -26,6 +27,7 @@ class ContactPhonesSerializer(serializers.ModelSerializer):
class ContactEmailsSerializer(serializers.ModelSerializer): class ContactEmailsSerializer(serializers.ModelSerializer):
"""Contact email serializer""" """Contact email serializer"""
class Meta: class Meta:
model = models.ContactEmail model = models.ContactEmail
fields = [ fields = [
@ -35,6 +37,7 @@ class ContactEmailsSerializer(serializers.ModelSerializer):
class SocialNetworkRelatedSerializers(serializers.ModelSerializer): class SocialNetworkRelatedSerializers(serializers.ModelSerializer):
"""Social network serializers.""" """Social network serializers."""
class Meta: class Meta:
model = models.SocialNetwork model = models.SocialNetwork
fields = [ fields = [
@ -45,7 +48,6 @@ class SocialNetworkRelatedSerializers(serializers.ModelSerializer):
class PlateSerializer(ProjectModelSerializer): class PlateSerializer(ProjectModelSerializer):
name_translated = TranslatedField() name_translated = TranslatedField()
currency = CurrencySerializer(read_only=True) currency = CurrencySerializer(read_only=True)
@ -316,6 +318,12 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer):
] ]
class EstablishmentSimilarSerializer(EstablishmentBaseSerializer):
"""Serializer for Establishment model."""
address = AddressDetailSerializer(read_only=True)
class EstablishmentCommentCreateSerializer(comment_serializers.CommentSerializer): class EstablishmentCommentCreateSerializer(comment_serializers.CommentSerializer):
"""Create comment serializer""" """Create comment serializer"""
mark = serializers.IntegerField() mark = serializers.IntegerField()
@ -379,4 +387,3 @@ class EstablishmentFavoritesCreateSerializer(FavoritesCreateSerializer):
'content_object': validated_data.pop('establishment') 'content_object': validated_data.pop('establishment')
}) })
return super().create(validated_data) return super().create(validated_data)

View File

@ -72,7 +72,7 @@ class EstablishmentRecentReviewListView(EstablishmentListView):
class EstablishmentSimilarListView(EstablishmentListView): class EstablishmentSimilarListView(EstablishmentListView):
"""Resource for getting a list of establishments.""" """Resource for getting a list of establishments."""
serializer_class = serializers.EstablishmentBaseSerializer serializer_class = serializers.EstablishmentSimilarSerializer
pagination_class = EstablishmentPortionPagination pagination_class = EstablishmentPortionPagination
def get_queryset(self): def get_queryset(self):