Merge branch 'feature/news_web_view_update' into 'develop'

Feature/news web view update

See merge request gm/gm-backend!144

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}')

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',
         )