[refactory] use decorator to reduce duplicate code

Author: szdytom

segmentoj/decorator.py

@@ -9,13 +9,13 @@ def _wrapped_view(request, *args, **kwargs):
             r = data.get(syllable_id)
             if r == None:
                 return Response(
-                    {"detail": "syllable {sid} is required".format(sid=syllable_id)},
+                    {'detail': 'syllable {sid} is required'.format(sid=syllable_id)},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
             if syllable_type != None and type(r) != syllable_type:
                 return Response(
-                    {"detail": "syllable {sid} has wrong type".format(sid=syllable_id)},
+                    {'detail': 'syllable {sid} has wrong type'.format(sid=syllable_id)},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
 
@@ -31,7 +31,7 @@ def _wrapped_view(request, *args, **kwargs):
             target = kwargs.get(parameter_id)
             if target == None:
                 return Response(
-                    {"detail": "{pid} in URI is required".format(pid=parameter_id)},
+                    {'detail': '{pid} in URI is required'.format(pid=parameter_id)},
                     status=status.HTTP_404_NOT_FOUND,
                 )
 
@@ -47,11 +47,29 @@ def decorator(func):
         def _wrapped_view(request, *args, **kwargs):
             if not request.user.is_authenticated:
                 return Response(
-                    {"detail": "Login Required"}, status=status.HTTP_401_UNAUTHORIZED
+                    {'detail': 'Login Required'}, status=status.HTTP_401_UNAUTHORIZED
                 )
 
             return func(request, *args, **kwargs)
 
         return _wrapped_view
 
     return decorator
+
+def parse_as_integer(sid):
+    def decorator(func):
+        def _wrapped_view(request, *args, **kwargs):
+            data = request.GET.copy()
+            if data.get(sid) is not None:
+                if data[sid].isdecimal():
+                    data[sid] = int(data[sid])
+                else:
+                    del data[sid]
+
+            request.GET = data
+
+            return func(request, *args, **kwargs)
+        
+        return _wrapped_view
+    
+    return decorator

segmentoj/settings.py

@@ -144,7 +144,7 @@
         'rest_framework.throttling.ScopedRateThrottle',  # use throttle_scope = 'xxx'
     ),
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
-    'PAGE_SIZE': 1,
+    'PAGE_SIZE': 5,
 }
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

status/views.py

@@ -10,7 +10,7 @@
 from .models import Status
 from .serializers import StatusSerializer, StatusListSerializer
 from problem.models import Problem
-from segmentoj.decorator import login_required, syllable_required, parameter_required
+from segmentoj.decorator import login_required, syllable_required, parameter_required, parse_as_integer
 from . import JudgeLang as JLang
 from . import JudgeState as JState
 
@@ -90,6 +90,10 @@ def cannot_judge(reason, state=JState.JUDGE_STATUS_CFGE):
 
 
 class StatusListView(APIView):
+
+    @method_decorator(parse_as_integer('problem'))
+    @method_decorator(parse_as_integer('lang'))
+    @method_decorator(parse_as_integer('owner'))
     def get(self, request):
         # Status List
 
@@ -102,18 +106,15 @@ def process(x):
         data = request.GET
 
         if data.get('problem') is not None:
-            if data['problem'].isdecimal():
-                status_filter['problem'] = get_object_or_404(Problem, pid=int(data['problem'])).id
+            status_filter['problem'] = get_object_or_404(Problem, pid=data['problem']).id
 
         if data.get('lang') is not None:
-            if data['lang'].isdecimal():
-                status_filter['lang'] = int(data['lang'])
+            status_filter['lang'] = data['lang']
 
         if data.get('owner') is not None:
-            if data['owner'].isdecimal():
-                status_filter['owner'] = int(data['owner'])
+            status_filter['owner'] = data['owner']
 
-        queryset = Status.objects.filter(**status_filter).order_by('-add_time')
+        queryset = Status.objects.filter(**status_filter).order_by('-id')
 
         pg = LimitOffsetPagination()
         statuses = pg.paginate_queryset(queryset=queryset, request=request, view=self)