diff --git a/apps/news/filters.py b/apps/news/filters.py index 6ade7eeb..e8e35307 100644 --- a/apps/news/filters.py +++ b/apps/news/filters.py @@ -20,6 +20,16 @@ class NewsListFilterSet(filters.FilterSet): tag_value__in = filters.CharFilter(method='in_tags') type = filters.CharFilter(method='by_type') + state = filters.NumberFilter() + + SORT_BY_CREATED_CHOICE = "created" + SORT_BY_START_CHOICE = "start" + SORT_BY_CHOICES = ( + (SORT_BY_CREATED_CHOICE, "created"), + (SORT_BY_START_CHOICE, "start"), + ) + sort_by = filters.ChoiceFilter(method='sort_by_field', choices=SORT_BY_CHOICES) + class Meta: """Meta class""" model = models.News @@ -29,6 +39,8 @@ class NewsListFilterSet(filters.FilterSet): 'tag_group', 'tag_value__exclude', 'tag_value__in', + 'state', + 'sort_by', ) def in_tags(self, queryset, name, value): @@ -58,3 +70,6 @@ class NewsListFilterSet(filters.FilterSet): return queryset.filter(news_type__name=value) else: return queryset + + def sort_by_field(self, queryset, name, value): + return queryset.order_by(f'-{value}') diff --git a/apps/news/serializers.py b/apps/news/serializers.py index 4eaeaeb4..4a84fa11 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -162,6 +162,7 @@ class NewsDetailWebSerializer(NewsDetailSerializer): class NewsBackOfficeBaseSerializer(NewsBaseSerializer): """News back office base serializer.""" + is_published = serializers.CharField(source='is_publish', read_only=True) class Meta(NewsBaseSerializer.Meta): """Meta class.""" @@ -169,6 +170,7 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): fields = NewsBaseSerializer.Meta.fields + ( 'title', 'subtitle', + 'is_published', )