phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/bunch-of-fixes' into 'develop'

Browse Source 
Bugfix/bunch of fixes

See merge request gm/gm-backend!38
This commit is contained in:
d.kuzmenko 2019-09-30 07:57:12 +00:00
commit 8745c57f84
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/establishment/serializers/common.py
View File

@ -5,7 +5,7 @@ from comment import models as comment_models
from comment.serializers import common as comment_serializers from comment.serializers import common as comment_serializers
from establishment import models from establishment import models
from favorites.models import Favorites from favorites.models import Favorites
from location.serializers import AddressSimpleSerializer from location.serializers import AddressSimpleSerializer, AddressSerializer
from main.models import MetaDataContent from main.models import MetaDataContent
from main.serializers import MetaDataContentSerializer, AwardSerializer, CurrencySerializer from main.serializers import MetaDataContentSerializer, AwardSerializer, CurrencySerializer
from review import models as review_models from review import models as review_models
@ -146,7 +146,7 @@ class EstablishmentBaseSerializer(serializers.ModelSerializer):
preview_image = serializers.URLField(source='preview_image_url') preview_image = serializers.URLField(source='preview_image_url')
slug = serializers.SlugField(allow_blank=False, required=True, max_length=50) slug = serializers.SlugField(allow_blank=False, required=True, max_length=50)
address = AddressSimpleSerializer() address = AddressSerializer()
tags = MetaDataContentSerializer(many=True) tags = MetaDataContentSerializer(many=True)
class Meta: class Meta:
@ -180,6 +180,13 @@ class EstablishmentListSerializer(EstablishmentBaseSerializer):
'in_favorites', 'in_favorites',
] ]
class EstablishmentAllListSerializer(EstablishmentListSerializer):
""" Serailizer for api/*/establishments """
address = AddressSimpleSerializer()
class Meta(EstablishmentListSerializer.Meta):
pass
class EstablishmentDetailSerializer(EstablishmentListSerializer): class EstablishmentDetailSerializer(EstablishmentListSerializer):
"""Serializer for Establishment model.""" """Serializer for Establishment model."""

2
apps/establishment/views/web.py
View File

@ -28,7 +28,7 @@ class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView):
"""Resource for getting a list of establishments.""" """Resource for getting a list of establishments."""
filter_class = filters.EstablishmentFilter filter_class = filters.EstablishmentFilter
serializer_class = serializers.EstablishmentListSerializer serializer_class = serializers.EstablishmentAllListSerializer
def get_queryset(self): def get_queryset(self):
"""Overridden method 'get_queryset'.""" """Overridden method 'get_queryset'."""

2
apps/location/serializers/common.py
View File

@ -104,7 +104,7 @@ class AddressSerializer(serializers.ModelSerializer):
'number', 'number',
'postal_code', 'postal_code',
'geo_lon', 'geo_lon',
'geo_lat' 'geo_lat',
] ]
def validate(self, attrs): def validate(self, attrs):

7
apps/search_indexes/views.py
View File

@ -4,7 +4,8 @@ from django_elasticsearch_dsl_drf import constants
from django_elasticsearch_dsl_drf.filter_backends import (FilteringFilterBackend, from django_elasticsearch_dsl_drf.filter_backends import (FilteringFilterBackend,
GeoSpatialFilteringFilterBackend) GeoSpatialFilteringFilterBackend)
from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet
from django_elasticsearch_dsl_drf.pagination import PageNumberPagination
from pagination import ProjectPageNumberPagination
from search_indexes import serializers, filters from search_indexes import serializers, filters
from search_indexes.documents import EstablishmentDocument, NewsDocument from search_indexes.documents import EstablishmentDocument, NewsDocument
@ -14,7 +15,7 @@ class NewsDocumentViewSet(BaseDocumentViewSet):
document = NewsDocument document = NewsDocument
lookup_field = 'slug' lookup_field = 'slug'
pagination_class = PageNumberPagination pagination_class = ProjectPageNumberPagination
permission_classes = (permissions.AllowAny,) permission_classes = (permissions.AllowAny,)
serializer_class = serializers.NewsDocumentSerializer serializer_class = serializers.NewsDocumentSerializer
ordering = ('id',) ordering = ('id',)
@ -40,7 +41,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
document = EstablishmentDocument document = EstablishmentDocument
lookup_field = 'slug' lookup_field = 'slug'
pagination_class = PageNumberPagination pagination_class = ProjectPageNumberPagination
permission_classes = (permissions.AllowAny,) permission_classes = (permissions.AllowAny,)
serializer_class = serializers.EstablishmentDocumentSerializer serializer_class = serializers.EstablishmentDocumentSerializer
ordering = ('id',) ordering = ('id',)