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

International news

Browse Source
This commit is contained in:
Kuroshini 2019-10-16 14:11:07 +03:00
parent 90fad60fc6
commit 153ccd7bd9
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/news/models.py
View File

@ -86,6 +86,10 @@ class NewsQuerySet(TranslationQuerysetMixin):
"""Returns news with tag 'cook' qs.""" """Returns news with tag 'cook' qs."""
return self.filter(tags__value=News.RECIPES_TAG_VALUE) return self.filter(tags__value=News.RECIPES_TAG_VALUE)
def international_news(self):
"""Returns only international news qs."""
return self.filter(tags__value=News.INTERNATIONAL_TAG_VALUE)
def published(self): def published(self):
"""Return only published news""" """Return only published news"""
now = timezone.now() now = timezone.now()
@ -151,6 +155,7 @@ class News(BaseAttributes, TranslatedFieldsMixin):
(PUBLISHED_EXCLUSIVE, _('Published exclusive')), (PUBLISHED_EXCLUSIVE, _('Published exclusive')),
) )
INTERNATIONAL_TAG_VALUE = 'international'
RECIPES_TAG_VALUE = 'cook' RECIPES_TAG_VALUE = 'cook'
old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None) old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None)

11
apps/news/views.py
View File

@ -18,7 +18,7 @@ class NewsMixinView:
permission_classes = (permissions.AllowAny,) permission_classes = (permissions.AllowAny,)
serializer_class = serializers.NewsBaseSerializer serializer_class = serializers.NewsBaseSerializer
def get_queryset(self): def get_queryset(self, *args, **kwargs):
"""Override get_queryset method.""" """Override get_queryset method."""
qs = models.News.objects.published() \ qs = models.News.objects.published() \
.with_base_related() \ .with_base_related() \
@ -27,7 +27,10 @@ class NewsMixinView:
country_code = self.request.country_code country_code = self.request.country_code
if country_code: if country_code:
qs = qs.by_country_code(country_code) if kwargs.get('international_preferred') and country_code in settings.INTERNATIONAL_COUNTRY_CODES:
qs = qs.international_news()
else:
qs = qs.by_country_code(country_code)
return qs return qs
@ -37,6 +40,10 @@ class NewsListView(NewsMixinView, generics.ListAPIView):
serializer_class = serializers.NewsListSerializer serializer_class = serializers.NewsListSerializer
filter_class = filters.NewsListFilterSet filter_class = filters.NewsListFilterSet
def get_queryset(self, *args, **kwargs):
kwargs.update({'international_preferred': True})
return super().get_queryset(*args, **kwargs)
class NewsDetailView(NewsMixinView, generics.RetrieveAPIView): class NewsDetailView(NewsMixinView, generics.RetrieveAPIView):
"""News detail view.""" """News detail view."""

1
project/settings/base.py
View File

@ -493,3 +493,4 @@ FALLBACK_LOCALE = 'en-GB'
CAROUSEL_ITEMS = [230, 231, 232] CAROUSEL_ITEMS = [230, 231, 232]
ESTABLISHMENT_CHOSEN_TAGS = ['gastronomic', 'en_vogue', 'terrace', 'streetfood', 'business', 'bar_cocktail', 'brunch', 'pop'] ESTABLISHMENT_CHOSEN_TAGS = ['gastronomic', 'en_vogue', 'terrace', 'streetfood', 'business', 'bar_cocktail', 'brunch', 'pop']
NEWS_CHOSEN_TAGS = ['eat', 'drink', 'cook', 'style', 'international', 'event', 'partnership'] NEWS_CHOSEN_TAGS = ['eat', 'drink', 'cook', 'style', 'international', 'event', 'partnership']
INTERNATIONAL_COUNTRY_CODES = ['www', 'main', 'next']