Refactor submissions API

scipost_django/api/urls.py

@@ -15,8 +15,7 @@ from organizations.api.viewsets import (
     OrganizationPublicAPIViewSet,
     OrganizationNAPViewSet
 )
-# The non-api viewsets below should be deprecated:
-from submissions.viewsets import SubmissionViewSet
+from submissions.api.viewsets import SubmissionPublicAPIViewSet
 
 # Next two: old style, to be deprecated:
 from conflicts.viewsets import ConflictOfInterestViewSet
@@ -38,7 +37,7 @@ router.register('organizations', OrganizationPublicAPIViewSet)
 router.register('nap', OrganizationNAPViewSet)
 
 # submissions
-router.register('submissions', SubmissionViewSet)
+router.register('submissions', SubmissionPublicAPIViewSet)
 
 # Next two: old style, to be deprecated:
 router.register(r'news', NewsItemViewSet)

scipost_django/submissions/serializers/__init__.py → scipost_django/submissions/api/serializers/__init__.py

@@ -2,4 +2,4 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from .submission import SubmissionSerializer
+from .submission import SubmissionPublicSerializer

scipost_django/submissions/serializers/submission.py → scipost_django/submissions/api/serializers/submission.py

@@ -4,10 +4,10 @@ __license__ = "AGPL v3"
 
 from rest_framework import serializers
 
-from ..models import Submission
+from submissions.models import Submission
 
 
-class SubmissionSerializer(serializers.ModelSerializer):
+class SubmissionPublicSerializer(serializers.ModelSerializer):
     identifier = serializers.CharField(source='preprint.identifier_w_vn_nr')
     submission_date = serializers.CharField(source='submission_date_ymd')
     url = serializers.URLField(source='get_absolute_url')

scipost_django/submissions/viewsets/__init__.py → scipost_django/submissions/api/viewsets/__init__.py

@@ -2,4 +2,4 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from .submission import SubmissionViewSet
+from .submission import SubmissionPublicAPIViewSet

scipost_django/submissions/viewsets/submission.py → scipost_django/submissions/api/viewsets/submission.py

@@ -2,43 +2,25 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
 __license__ = "AGPL v3"
 
 
-from django_filters import rest_framework as df_filters
-
 from rest_framework import viewsets
 from rest_framework.permissions import AllowAny
 
 from api.viewsets.mixins import FilteringOptionsActionMixin
 
-from ..models import Submission
-from ..serializers import SubmissionSerializer
-
-
-class SubmissionFilterSet(df_filters.FilterSet):
-    class Meta:
-        model = Submission
-        fields = {
-            'title': ['icontains', 'contains', 'istartswith', 'iregex', 'regex'],
-            'author_list': ['icontains', 'contains', 'iregex', 'regex'],
-            'abstract': ['icontains', 'contains', 'iregex', 'regex'],
-            'submission_date': [
-                'date__year', 'date__month', 'date__exact',
-                'date__year__gte', 'date__year__lte', 'date__year__range',
-                'date__gte', 'date__lte', 'date__range'
-            ],
-            'acad_field__name': ['icontains',],
-            'specialties__name': ['icontains',],
-            'topics__name': ['icontains',],
-        }
+from submissions.models import Submission
+from submissions.api.filtersets import SubmissionPublicAPIFilterSet
+from submissions.api.serializers import SubmissionPublicSerializer
 
 
-class SubmissionViewSet(FilteringOptionsActionMixin,
-                         viewsets.ReadOnlyModelViewSet):
+class SubmissionPublicAPIViewSet(
+        FilteringOptionsActionMixin,
+        viewsets.ReadOnlyModelViewSet):
     queryset = Submission.objects.public_newest().unpublished()
     permission_classes = [AllowAny,]
-    serializer_class = SubmissionSerializer
+    serializer_class = SubmissionPublicSerializer
     search_fields = ['title', 'author_list', 'abstract']
     ordering_fields = ['submission_date',]
-    filterset_class = SubmissionFilterSet
+    filterset_class = SubmissionPublicAPIFilterSet
     default_filtering_fields = [
         'title__icontains',
         'author_list__icontains',