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

Merge branch 'develop' into feature/establishment-tests-api-status

Browse Source
This commit is contained in:
littlewolf 2019-09-20 16:00:39 +03:00
commit 7f973bbf52
26 changed files with 230 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/collection/admin.py
View File

@ -8,11 +8,6 @@ class CollectionAdmin(admin.ModelAdmin):
"""Collection admin."""
@admin.register(models.CollectionItem)
class CollectionItemAdmin(admin.ModelAdmin):
"""CollectionItem admin."""
@admin.register(models.Guide)
class GuideAdmin(admin.ModelAdmin):
"""Guide admin."""

16
apps/collection/migrations/0009_delete_collectionitem.py Normal file
View File

@ -0,0 +1,16 @@
# Generated by Django 2.2.4 on 2019-09-20 08:55
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('collection', '0008_auto_20190916_1158'),
]
operations = [
migrations.DeleteModel(
name='CollectionItem',
),
]

19
apps/collection/migrations/0010_collection_description.py Normal file
View File

@ -0,0 +1,19 @@
# Generated by Django 2.2.4 on 2019-09-20 09:27
from django.db import migrations
import utils.models
class Migration(migrations.Migration):
dependencies = [
('collection', '0009_delete_collectionitem'),
]
operations = [
migrations.AddField(
model_name='collection',
name='description',
field=utils.models.TJSONField(blank=True, default=None, help_text='{"en-GB":"some text"}', null=True, verbose_name='description'),
),
]

22
apps/collection/migrations/0011_auto_20190920_1059.py Normal file
View File

@ -0,0 +1,22 @@
# Generated by Django 2.2.4 on 2019-09-20 10:59
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('collection', '0010_collection_description'),
]
operations = [
migrations.RemoveField(
model_name='collection',
name='image',
),
migrations.AddField(
model_name='collection',
name='image_url',
field=models.URLField(blank=True, default=None, null=True, verbose_name='Image URL path'),
),
]

34
apps/collection/models.py
View File

@ -1,10 +1,11 @@
from django.contrib.postgres.fields import JSONField
from django.contrib.contenttypes.fields import ContentType
from django.contrib.contenttypes import fields as generic
from utils.models import TJSONField
from django.db import models
from django.utils.translation import gettext_lazy as _
from utils.models import ProjectBaseMixin, ImageMixin
from utils.models import ProjectBaseMixin, URLImageMixin
from utils.models import TranslatedFieldsMixin
# Mixins
@ -40,7 +41,8 @@ class CollectionQuerySet(models.QuerySet):
return self.filter(is_publish=True)
class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin):
class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin,
TranslatedFieldsMixin, URLImageMixin):
"""Collection model."""
ORDINARY = 0 # Ordinary collection
POP = 1 # POP collection
@ -53,9 +55,6 @@ class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin):
collection_type = models.PositiveSmallIntegerField(choices=COLLECTION_TYPES,
default=ORDINARY,
verbose_name=_('Collection type'))
image = models.ForeignKey(
'gallery.Image', null=True, blank=True, default=None,
verbose_name=_('Collection image'), on_delete=models.CASCADE)
is_publish = models.BooleanField(
default=False, verbose_name=_('Publish status'))
on_top = models.BooleanField(
@ -65,6 +64,9 @@ class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin):
block_size = JSONField(
_('collection block properties'), null=True, blank=True,
default=None, help_text='{"width": "250px", "height":"250px"}')
description = TJSONField(
_('description'), null=True, blank=True,
default=None, help_text='{"en-GB":"some text"}')
objects = CollectionQuerySet.as_manager()
@ -78,26 +80,6 @@ class Collection(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin):
return f'{self.name}'
class CollectionItemQuerySet(models.QuerySet):
"""QuerySet for model CollectionItem."""
def by_collection(self, collection_id):
"""Filter by collection id"""
return self.filter(collection=collection_id)
class CollectionItem(ProjectBaseMixin):
"""CollectionItem model."""
collection = models.ForeignKey(
Collection, verbose_name=_('collection'), on_delete=models.CASCADE)
content_type = models.ForeignKey(ContentType, default=None,
null=True, blank=True, on_delete=models.CASCADE)
object_id = models.PositiveIntegerField(default=None, null=True, blank=True)
content_object = generic.GenericForeignKey('content_type', 'object_id')
objects = CollectionItemQuerySet.as_manager()
class GuideQuerySet(models.QuerySet):
"""QuerySet for Guide."""

20
apps/collection/serializers/common.py
View File

@ -1,14 +1,13 @@
from rest_framework import serializers
from collection import models
from gallery import models as gallery_models
from location import models as location_models
class CollectionSerializer(serializers.ModelSerializer):
"""Collection serializer"""
# RESPONSE
image_url = serializers.ImageField(source='image.image')
description_translated = serializers.CharField(read_only=True, allow_null=True)
# COMMON
block_size = serializers.JSONField()
@ -21,18 +20,15 @@ class CollectionSerializer(serializers.ModelSerializer):
country = serializers.PrimaryKeyRelatedField(
queryset=location_models.Country.objects.all(),
write_only=True)
image = serializers.PrimaryKeyRelatedField(
queryset=gallery_models.Image.objects.all(),
write_only=True)
class Meta:
model = models.Collection
fields = [
'id',
'name',
'description_translated',
'start',
'end',
'image',
'image_url',
'is_publish',
'on_top',
@ -41,18 +37,6 @@ class CollectionSerializer(serializers.ModelSerializer):
]
class CollectionItemSerializer(serializers.ModelSerializer):
"""CollectionItem serializer"""
class Meta:
model = models.CollectionItem
fields = [
'id',
'collection',
'content_type',
'object_id',
]
class GuideSerializer(serializers.ModelSerializer):
"""Guide serializer"""
class Meta:

7
apps/collection/urls/common.py
View File

@ -7,11 +7,8 @@ app_name = 'collection'
urlpatterns = [
path('', views.CollectionListView.as_view(), name='list'),
path('<int:pk>/', views.CollectionRetrieveView.as_view(), name='detail'),
path('items/', views.CollectionItemListView.as_view(), name='collection-items-list'),
path('items/<int:pk>/', views.CollectionItemRetrieveView.as_view(),
name='collection-items-detail'),
path('<int:pk>/establishments/', views.CollectionEstablishmentListView.as_view(),
name='detail'),
path('guides/', views.GuideListView.as_view(), name='guides-list'),
path('guides/<int:pk>/', views.GuideRetrieveView.as_view(), name='guides-detail'),

37
apps/collection/views/common.py
View File

@ -2,6 +2,9 @@ from rest_framework import generics
from rest_framework import permissions
from collection import models
from utils.pagination import ProjectPageNumberPagination
from django.shortcuts import get_object_or_404
from establishment.serializers import EstablishmentListSerializer
from collection.serializers import common as serializers
@ -12,12 +15,6 @@ class CollectionViewMixin(generics.GenericAPIView):
queryset = models.Collection.objects.all()
class CollectionItemViewMixin(generics.GenericAPIView):
"""Mixin for CollectionItem view"""
model = models.CollectionItem
queryset = models.CollectionItem.objects.all()
class GuideViewMixin(generics.GenericAPIView):
"""Mixin for Guide view"""
model = models.Guide
@ -28,7 +25,6 @@ class GuideViewMixin(generics.GenericAPIView):
# Collections
class CollectionListView(CollectionViewMixin, generics.ListAPIView):
"""List Collection view"""
pagination_class = None
permission_classes = (permissions.AllowAny,)
serializer_class = serializers.CollectionSerializer
@ -39,23 +35,24 @@ class CollectionListView(CollectionViewMixin, generics.ListAPIView):
.order_by('-on_top', '-created')
class CollectionRetrieveView(CollectionViewMixin, generics.RetrieveAPIView):
"""Retrieve Collection view"""
class CollectionEstablishmentListView(CollectionListView):
"""Retrieve list of establishment for collection."""
permission_classes = (permissions.AllowAny,)
serializer_class = serializers.CollectionSerializer
pagination_class = ProjectPageNumberPagination
serializer_class = EstablishmentListSerializer
def get_queryset(self):
"""
Override get_queryset method.
"""
queryset = super(CollectionEstablishmentListView, self).get_queryset()
# Perform the lookup filtering.
collection = get_object_or_404(queryset, pk=self.kwargs['pk'])
# CollectionItem
class CollectionItemListView(CollectionItemViewMixin, generics.ListAPIView):
"""List CollectionItem view"""
permission_classes = (permissions.AllowAny,)
serializer_class = serializers.CollectionItemSerializer
# May raise a permission denied
self.check_object_permissions(self.request, collection)
class CollectionItemRetrieveView(CollectionItemViewMixin, generics.RetrieveAPIView):
"""Retrieve CollectionItem view"""
permission_classes = (permissions.AllowAny,)
serializer_class = serializers.CollectionItemSerializer
return collection.establishments.all()
# Guide

19
apps/establishment/migrations/0024_establishment_collections.py Normal file
View File

@ -0,0 +1,19 @@
# Generated by Django 2.2.4 on 2019-09-20 08:55
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('collection', '0009_delete_collectionitem'),
('establishment', '0023_merge_20190919_1136'),
]
operations = [
migrations.AddField(
model_name='establishment',
name='collections',
field=models.ManyToManyField(related_name='establishments', to='collection.Collection', verbose_name='Collections'),
),
]

14
apps/establishment/migrations/0025_merge_20190920_1012.py Normal file
View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.4 on 2019-09-20 10:12
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('establishment', '0024_establishment_collections'),
('establishment', '0024_merge_20190919_1456'),
]
operations = [
]

18
apps/establishment/migrations/0026_establishment_preview_image_url.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-20 10:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('establishment', '0025_merge_20190920_1012'),
]
operations = [
migrations.AddField(
model_name='establishment',
name='preview_image_url',
field=models.URLField(blank=True, default=None, null=True, verbose_name='Preview image URL path'),
),
]

18
apps/establishment/migrations/0027_auto_20190920_1120.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-20 11:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('establishment', '0026_establishment_preview_image_url'),
]
operations = [
migrations.AlterField(
model_name='establishment',
name='collections',
field=models.ManyToManyField(blank=True, default=None, null=True, related_name='establishments', to='collection.Collection', verbose_name='Collections'),
),
]

18
apps/establishment/migrations/0028_auto_20190920_1205.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-20 12:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('establishment', '0027_auto_20190920_1120'),
]
operations = [
migrations.AlterField(
model_name='establishment',
name='collections',
field=models.ManyToManyField(blank=True, default=None, related_name='establishments', to='collection.Collection', verbose_name='Collections'),
),
]

19
apps/establishment/models.py
View File

@ -124,7 +124,7 @@ class EstablishmentQuerySet(models.QuerySet):
"""
return self.annotate(intermediate_public_mark=models.Case(
models.When(
collections__collection__collection_type=Collection.POP,
collections__collection_type=Collection.POP,
public_mark__isnull=True,
then=10
),
@ -164,7 +164,7 @@ class EstablishmentQuerySet(models.QuerySet):
"""
return self.annotate(
total_mark=(models.F('distance_mark') + models.F('additional_mark')) *
models.F('intermediate_public_mark'))
models.F('intermediate_public_mark'))
def similar(self, establishment_pk: int):
"""
@ -176,7 +176,7 @@ class EstablishmentQuerySet(models.QuerySet):
establishment = establishment_qs.first()
return self.exclude(pk=establishment_pk) \
.filter(is_publish=True,
image__isnull=False,
image_url__isnull=False,
reviews__isnull=False,
reviews__status=Review.READY,
public_mark__gte=10) \
@ -269,13 +269,20 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin):
# help_text=_('Holidays closing date from'))
# holidays_to = models.DateTimeField(verbose_name=_('Holidays to'),
# help_text=_('Holidays closing date to'))
transportation = models.TextField(blank=True, null=True, default=None,
verbose_name=_('Transportation'))
collections = models.ManyToManyField(to='collection.Collection',
related_name='establishments',
blank=True, default=None,
verbose_name=_('Collections'))
preview_image_url = models.URLField(verbose_name=_('Preview image URL path'),
blank=True, null=True, default=None)
awards = generic.GenericRelation(to='main.Award')
tags = generic.GenericRelation(to='main.MetaDataContent')
reviews = generic.GenericRelation(to='review.Review')
comments = generic.GenericRelation(to='comment.Comment')
transportation = models.TextField(blank=True, null=True, default=None,
verbose_name=_('Transportation'))
collections = generic.GenericRelation(to='collection.CollectionItem')
favorites = generic.GenericRelation(to='favorites.Favorites')
objects = EstablishmentQuerySet.as_manager()

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

@ -11,6 +11,7 @@ from main.serializers import MetaDataContentSerializer, AwardSerializer, Currenc
from review import models as review_models
from timetable.serialziers import ScheduleRUDSerializer
from utils import exceptions as utils_exceptions
from django.utils.translation import gettext_lazy as _
class ContactPhonesSerializer(serializers.ModelSerializer):
@ -145,7 +146,6 @@ class EstablishmentBaseSerializer(serializers.ModelSerializer):
subtypes = EstablishmentSubTypeSerializer(many=True)
address = AddressSerializer()
tags = MetaDataContentSerializer(many=True)
preview_image = serializers.SerializerMethodField()
class Meta:
"""Meta class."""
@ -159,28 +159,25 @@ class EstablishmentBaseSerializer(serializers.ModelSerializer):
'public_mark',
'type',
'subtypes',
'preview_image',
'address',
'tags',
]
def get_preview_image(self, obj):
"""Get preview image"""
return obj.get_full_image_url(request=self.context.get('request'),
thumbnail_key='establishment_preview')
class EstablishmentListSerializer(EstablishmentBaseSerializer):
"""Serializer for Establishment model."""
# Annotated fields
in_favorites = serializers.BooleanField(allow_null=True)
preview_image = serializers.URLField(source='preview_image_url')
class Meta:
"""Meta class."""
model = models.Establishment
fields = EstablishmentBaseSerializer.Meta.fields + [
'in_favorites',
'preview_image',
]
@ -195,13 +192,14 @@ class EstablishmentDetailSerializer(EstablishmentListSerializer):
employees = EstablishmentEmployeeSerializer(source='actual_establishment_employees',
many=True)
menu = MenuSerializers(source='menu_set', many=True, read_only=True)
preview_image = serializers.SerializerMethodField()
best_price_menu = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True)
best_price_carte = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True)
in_favorites = serializers.SerializerMethodField()
image = serializers.URLField(source='image_url')
class Meta:
"""Meta class."""
@ -265,7 +263,7 @@ class EstablishmentCommentCreateSerializer(comment_serializers.CommentSerializer
establishment_id = self.context.get('request').parser_context.get('kwargs').get('pk')
establishment_qs = models.Establishment.objects.filter(id=establishment_id)
if not establishment_qs.exists():
return serializers.ValidationError()
raise serializers.ValidationError({'detail': _('Establishment not found.')})
attrs['establishment'] = establishment_qs.first()
return attrs
@ -316,7 +314,7 @@ class EstablishmentFavoritesCreateSerializer(serializers.ModelSerializer):
# Check establishment obj by pk from lookup_kwarg
if not establishment_qs.exists():
return serializers.ValidationError()
raise serializers.ValidationError({'detail': _('Object not found.')})
# Check existence in favorites
if self.get_user().favorites.by_content_type(app_label='establishment',

8
apps/establishment/tests.py
View File

@ -16,11 +16,13 @@ class BaseTestCase(APITestCase):
self.password = 'sedragurdaredips19'
self.email = 'sedragurda@desoz.com'
self.newsletter = True
self.user = User.objects.create_user(username=self.username, email=self.email, password=self.password)
self.user = User.objects.create_user(
username=self.username, email=self.email, password=self.password)
#get tokkens
tokkens = User.create_jwt_tokens(self.user)
self.client.cookies = SimpleCookie({'access_token': tokkens.get('access_token'),
'refresh_token': tokkens.get('refresh_token')})
self.client.cookies = SimpleCookie(
{'access_token': tokkens.get('access_token'),
'refresh_token': tokkens.get('refresh_token')})
self.establishment_type = EstablishmentType.objects.create(name="Test establishment type")

2
apps/establishment/urls/common.py
View File

@ -16,5 +16,5 @@ urlpatterns = [
path('<int:pk>/comments/<int:comment_id>/', views.EstablishmentCommentRUDView.as_view(),
name='rud-comment'),
path('<int:pk>/favorites/', views.EstablishmentFavoritesCreateDestroyView.as_view(),
name='add-favorites')
name='add-to-favorites')
]

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

@ -30,10 +30,13 @@ class EstablishmentSimilarListView(EstablishmentListView):
def get_queryset(self):
"""Override get_queryset method"""
qs = super().get_queryset()
if not qs.filter(pk=self.kwargs.get('pk')).exists():
return qs.none()
return qs.similar(establishment_pk=self.kwargs.get('pk'))\
.order_by('-total_mark')[:13]
class EstablishmentRetrieveView(EstablishmentMixin, generics.RetrieveAPIView):
"""Resource for getting a establishment."""
serializer_class = serializers.EstablishmentDetailSerializer
@ -76,14 +79,6 @@ class EstablishmentCommentRUDView(generics.RetrieveUpdateDestroyAPIView):
Returns the object the view is displaying.
"""
queryset = self.filter_queryset(self.get_queryset())
lookup_url_kwargs = ('pk', 'comment_id')
assert lookup_url_kwargs not in self.kwargs.keys(), (
'Expected view %s to be called with a URL keyword argument '
'named "%s". Fix your URL conf, or set the `.lookup_field` '
'attribute on the view correctly.' %
(self.__class__.__name__, lookup_url_kwargs)
)
establishment_obj = get_object_or_404(queryset,
pk=self.kwargs['pk'])
@ -104,17 +99,8 @@ class EstablishmentFavoritesCreateDestroyView(generics.CreateAPIView, generics.D
"""
Returns the object the view is displaying.
"""
lookup_url_kwargs = ('pk',)
assert lookup_url_kwargs not in self.kwargs.keys(), (
'Expected view %s to be called with a URL keyword argument '
'named "%s". Fix your URL conf, or set the `.lookup_field` '
'attribute on the view correctly.' %
(self.__class__.__name__, lookup_url_kwargs)
)
obj = get_object_or_404(
self.request.user.favorites.by_user(user=self.request.user)
.by_content_type(app_label='establishment',
self.request.user.favorites.by_content_type(app_label='establishment',
model='establishment')
.by_object_id(object_id=self.kwargs['pk']))
# May raise a permission denied
@ -162,15 +148,6 @@ class EstablishmentScheduleRUDView(generics.RetrieveUpdateDestroyAPIView):
"""
Returns the object the view is displaying.
"""
lookup_url_kwargs = ('pk', 'schedule_id')
assert lookup_url_kwargs not in self.kwargs.keys(), (
'Expected view %s to be called with a URL keyword argument '
'named "%s". Fix your URL conf, or set the `.lookup_field` '
'attribute on the view correctly.' %
(self.__class__.__name__, lookup_url_kwargs)
)
establishment_pk = self.kwargs['pk']
schedule_id = self.kwargs['schedule_id']

13
apps/favorites/serializers.py
View File

@ -2,16 +2,3 @@
from .models import Favorites
from rest_framework import serializers
from establishment.serializers import EstablishmentBaseSerializer
class FavoritesEstablishmentListSerializer(serializers.ModelSerializer):
"""Serializer for model Favorites"""
detail = EstablishmentBaseSerializer(source='content_object')
class Meta:
"""Meta class."""
model = Favorites
fields = (
'id',
'detail',
)

1
apps/favorites/urls.py
View File

@ -8,5 +8,4 @@ app_name = 'favorites'
urlpatterns = [
path('establishments/', views.FavoritesEstablishmentListView.as_view(),
name='establishment-list'),
path('remove/<int:pk>/', views.FavoritesDestroyView.as_view(), name='remove-from-favorites'),
]

15
apps/favorites/views.py
View File

@ -1,6 +1,8 @@
"""Views for app favorites."""
from rest_framework import generics
from .serializers import FavoritesEstablishmentListSerializer
from establishment.models import Establishment
from establishment.serializers import EstablishmentListSerializer
from .models import Favorites
@ -11,15 +13,10 @@ class FavoritesBaseView(generics.GenericAPIView):
return Favorites.objects.by_user(self.request.user)
class FavoritesEstablishmentListView(FavoritesBaseView, generics.ListAPIView):
class FavoritesEstablishmentListView(generics.ListAPIView):
"""List views for favorites"""
serializer_class = FavoritesEstablishmentListSerializer
serializer_class = EstablishmentListSerializer
def get_queryset(self):
"""Override get_queryset method"""
return super().get_queryset().by_content_type(app_label='establishment',
model='establishment')
class FavoritesDestroyView(FavoritesBaseView, generics.DestroyAPIView):
"""Destroy view for favorites"""
return Establishment.objects.filter(favorites__user=self.request.user)

8
apps/main/models.py
View File

@ -333,11 +333,9 @@ class Carousel(models.Model):
return self.content_object.public_mark
@property
def image(self):
if hasattr(self.content_object.image, 'url'):
return self.content_object.image
if hasattr(self.content_object.image.image, 'url'):
return self.content_object.image.image
def image_url(self):
if hasattr(self.content_object, 'image_url'):
return self.content_object.image_url
@property
def model_name(self):

2
apps/main/serializers.py
View File

@ -138,7 +138,7 @@ class CarouselListSerializer(serializers.ModelSerializer):
name = serializers.CharField()
toque_number = serializers.CharField()
public_mark = serializers.CharField()
image = serializers.ImageField()
image = serializers.URLField(source='image_url')
awards = AwardBaseSerializer(many=True)
vintage_year = serializers.IntegerField()

13
apps/search_indexes/documents/establishment.py
View File

@ -68,12 +68,13 @@ class EstablishmentDocument(Document):
),
}
)
collections = fields.ObjectField(
properties={
'id': fields.IntegerField(attr='collection.id'),
'collection_type': fields.IntegerField(attr='collection.collection_type'),
},
multi=True)
# todo: need to fix
# collections = fields.ObjectField(
# properties={
# 'id': fields.IntegerField(attr='collection.id'),
# 'collection_type': fields.IntegerField(attr='collection.collection_type'),
# },
# multi=True)
class Django:

8
apps/search_indexes/documents/news.py
View File

@ -46,3 +46,11 @@ class NewsDocument(Document):
def prepare_description(self, instance):
return instance.description
def get_instances_from_related(self, related_instance):
"""If related_models is set, define how to retrieve the Car instance(s) from the related model.
The related_models option should be used with caution because it can lead in the index
to the updating of a lot of items.
"""
if isinstance(related_instance, models.NewsType):
return related_instance.news_set.all()

2
project/urls/web.py
View File

@ -20,7 +20,7 @@ app_name = 'web'
urlpatterns = [
path('account/', include('account.urls.web')),
path('re_blocks/', include('advertisement.urls.web')),
path('collection/', include('collection.urls.web')),
path('collections/', include('collection.urls.web')),
path('establishments/', include('establishment.urls.web')),
path('news/', include('news.urls.web')),
path('notifications/', include('notification.urls.web')),