Move api.viewsets to api.views

Naming is much more clear this way

api/urls.py

@@ -3,25 +3,8 @@ from django.conf.urls import patterns, url, include
 from rest_framework import routers
 
 from . import views
-from . import viewsets
 
 rest_router = routers.DefaultRouter()
-rest_router.register(r'ducks', viewsets.DuckViewSet)
+rest_router.register(r'ducks', views.DuckViewSet)
 
-urlpatterns = patterns(
+urlpatterns = rest_router.urls
-    '',
-    url(
-        r'^',
-        include(rest_router.urls)
-    ),
-    url(
-        r'^duck/book/$',
-        views.duck_book,
-        name = 'book'
-    ),
-    url(
-        r'^duck/(?P<duck_id>\d+)/competence.json$',
-        views.DuckCompListView.as_view(),
-        name = 'complist'
-    ),
-)

api/views.py

@@ -1,93 +1,56 @@
-from django.http import JsonResponse, HttpResponse
+# -*- coding: utf-8 -*-
-from django.shortcuts import render, get_object_or_404
-from django.views import generic
 from django.conf import settings
-from django.views.decorators.http import require_POST
+from django.contrib.auth.models import User
+from django.shortcuts import get_object_or_404
+from rest_framework import viewsets
+from rest_framework.decorators import detail_route, list_route
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 
-import json
+from .serializers import DuckSerializer, CompetenceSerializer
+from booking.models import Duck, Competence, Booking
 
-from booking.models import Duck, Booking, Competence
+class DuckViewSet(viewsets.ModelViewSet):
+    serializer_class = DuckSerializer
+    queryset = Duck.objects.all()
 
-class DuckCompListView(generic.ListView):
+    @detail_route(methods=['post'], permission_classes=[IsAuthenticated])
-    template_name = 'api/duck_comp_list.json'
+    def book(self, request, pk=None):
-    context_object_name = 'comp_list'
+        duck = self.get_object()
+        competence = get_object_or_404(Competence, pk=request.data['competence'])
+        force = request.data.get('force', False)
 
-    def get_queryset(self):
+        # If the duck is already booked, return 'already-booked' as the
-        duck_id = self.kwargs['duck_id']
+        # result
-        duck = get_object_or_404(Duck, pk = duck_id)
+        if duck.booked_by() != None:
+            return Response({'status': 'already-booked'})
 
-        return duck.duckcompetence_set.all()
+        # Result 'fail' means a problem
-
+        result = 'fail'
-@require_POST
-def duck_book(request):
-    """Book a duck to the logged in user.
-
-    Return value:
-    HttpResponse with status_code = 400 if response.jsondata misses
-                                        duck_id or comp_id
-    HttpResponse with status_code = 401 if the user is not authenticated
-    HttpResponse with status_code = 404 if the duck or comp is not found
-    response.jsondata.success = 0 if the duck is already booked
-    response.jsondata.success = 1 if the duck's competence is too low
-                                  (use request.jsondata.force = True
-                                  to force)
-    response.jsondata.success = 2 if the booking was successful"""
-
-    user = request.user
-
-    # Check if user is authenticated; if not, return HTTP 401
-    if not user.is_authenticated():
-        res = HttpResponse()
-        res.status_code = 401
-
-        return res
-
-    # Decode the request body
-    encoding = settings.DEFAULT_CHARSET if request.encoding == None else request.encoding
-    json_content = request.body.decode(encoding)
-    j = json.loads(json_content)
-
-    # If there is no duck_id or no comp_id in the request, return HTTP 400
-    if 'duck_id' not in  j or 'comp_id' not in j:
-        res = HttpResponse()
-        res.status_code = 400
-
-        return res
-
-    duck_id = j['duck_id']
-    comp_id = j['comp_id']
-
-    # Find the duck and the competence; if any of them non-existant,
-    # return HTTP 404
-    duck = get_object_or_404(Duck, pk = duck_id)
-    comp = get_object_or_404(Competence, pk = comp_id)
-
-    # If the duck is already booked, return 0 as the result
-    if duck.booked_by() != None:
-        return JsonResponse({'success': 0})
-
-    # Result 0 means a problem
-    result = 0
-    comp_level = 0
-
-    # Check if the duck has the requested competence
-    dcomp_list = duck.duckcompetence_set.filter(comp = comp)
-
-    if len(dcomp_list) < 1:
         comp_level = 0
-    else:
-        comp_level = dcomp_list[0].level()
 
-    # If the competence level is too low, set result to 1
+        # Check if the duck has the requested competence
-    if comp_level <= settings.COMP_WARN_LEVEL:
+        dcomp_list = duck.duckcompetence_set.filter(comp=competence)
-        result = 1
 
-    # If the duck has high enough competence or the booking is forced,
+        if len(dcomp_list) < 1:
-    # return success (2)
+            comp_level = 0
-    if result != 1 or 'force' in j:
+        else:
-        result = 2
+            comp_level = dcomp_list[0].level()
 
-        booking = Booking(duck = duck, user = user, comp_req = comp)
+        # If the competence level is too low, set result to 'bad-comp'
-        booking.save()
+        if comp_level <= settings.COMP_WARN_LEVEL:
+            result = 'bad-comp'
 
-    return JsonResponse({'success': result})
+        # If the duck has high enough competence or the booking is
+        # forced, return status 'success'
+        if result != 'bad-comp' or force:
+            result = 'ok'
+
+            booking = Booking(duck=duck, user=request.user, comp_req=competence)
+            booking.save()
+
+        return Response({'status': result})
+
+    @list_route(methods=['post'], permission_classes=[IsAuthenticated])
+    def donate(self, request):
+        return Response({'Woot!'})

api/viewsets.py

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.contrib.auth.models import User
-
-from rest_framework import viewsets, permissions
-
-from .serializers import DuckSerializer
-from booking.models import Duck
-
-class DuckViewSet(viewsets.ReadOnlyModelViewSet):
-    queryset = Duck.objects.all()
-    serializer_class = DuckSerializer