Minor upgrades and test fixes.

[wolnelektury.git] / src / catalogue / api / views.py

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index 932f9cd..abe8064 100644 (file)
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -30,6 +30,10 @@ from . import serializers
 book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 
 book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 

+class LegacyListAPIView(ListAPIView):
+    pagination_class = None
+
+

 class CreateOnPutMixin:
     '''
     Creates a new model instance when PUTting a nonexistent resource.
 class CreateOnPutMixin:
     '''
     Creates a new model instance when PUTting a nonexistent resource.


@@ -47,7 +51,7 @@ class CreateOnPutMixin:
                 raise
 
 
                 raise
 
 

-class CollectionList(ListAPIView):
+class CollectionList(LegacyListAPIView):

     queryset = Collection.objects.filter(listed=True)
     serializer_class = serializers.CollectionListSerializer
 
     queryset = Collection.objects.filter(listed=True)
     serializer_class = serializers.CollectionListSerializer
 


@@ -61,7 +65,7 @@ class CollectionDetail(CreateOnPutMixin, RetrieveUpdateAPIView):
 
 
 @vary_on_auth  # Because of 'liked'.
 
 
 @vary_on_auth  # Because of 'liked'.

-class BookList(ListAPIView):
+class BookList(LegacyListAPIView):

     permission_classes = [DjangoModelPermissionsOrAnonReadOnly]
     queryset = Book.objects.none()  # Required for DjangoModelPermissions
     serializer_class = serializers.BookListSerializer
     permission_classes = [DjangoModelPermissionsOrAnonReadOnly]
     queryset = Book.objects.none()  # Required for DjangoModelPermissions
     serializer_class = serializers.BookListSerializer


@@ -179,6 +183,19 @@ class BookList(ListAPIView):
         return Response({}, status=status.HTTP_201_CREATED)
 
 
         return Response({}, status=status.HTTP_201_CREATED)
 
 

+class BookList2(ListAPIView):
+    permission_classes = [DjangoModelPermissionsOrAnonReadOnly]
+    queryset = Book.objects.none()  # Required for DjangoModelPermissions
+    serializer_class = serializers.BookSerializer2
+
+    def get_queryset(self):
+        books = Book.objects.all()
+        books = books.filter(findable=True)
+        books = order_books(books, True)
+
+        return books
+
+

 @vary_on_auth  # Because of 'liked'.
 class BookDetail(RetrieveAPIView):
     queryset = Book.objects.all()
 @vary_on_auth  # Because of 'liked'.
 class BookDetail(RetrieveAPIView):
     queryset = Book.objects.all()


@@ -186,13 +203,19 @@ class BookDetail(RetrieveAPIView):
     serializer_class = serializers.BookDetailSerializer
 
 
     serializer_class = serializers.BookDetailSerializer
 
 

+class BookDetail2(RetrieveAPIView):
+    queryset = Book.objects.all()
+    lookup_field = 'slug'
+    serializer_class = serializers.BookSerializer2
+
+

 @vary_on_auth  # Because of embargo links.
 class EbookList(BookList):
     serializer_class = serializers.EbookSerializer
 
 
 @method_decorator(never_cache, name='dispatch')
 @vary_on_auth  # Because of embargo links.
 class EbookList(BookList):
     serializer_class = serializers.EbookSerializer
 
 
 @method_decorator(never_cache, name='dispatch')

-class Preview(ListAPIView):
+class Preview(LegacyListAPIView):

     #queryset = Book.objects.filter(preview=True)
     serializer_class = serializers.BookPreviewSerializer
 
     #queryset = Book.objects.filter(preview=True)
     serializer_class = serializers.BookPreviewSerializer
 


@@ -205,7 +228,7 @@ class Preview(ListAPIView):
 
 
 @vary_on_auth  # Because of 'liked'.
 
 
 @vary_on_auth  # Because of 'liked'.

-class FilterBookList(ListAPIView):
+class FilterBookList(LegacyListAPIView):

     serializer_class = serializers.FilterBookListSerializer
 
     def parse_bool(self, s):
     serializer_class = serializers.FilterBookListSerializer
 
     def parse_bool(self, s):


@@ -289,16 +312,12 @@ class EpubView(RetrieveAPIView):
         return HttpResponse(self.get_object().get_media('epub'))
 
 
         return HttpResponse(self.get_object().get_media('epub'))
 
 

-class TagCategoryView(ListAPIView):
+class TagCategoryView(LegacyListAPIView):

     serializer_class = serializers.TagSerializer
 
     def get_queryset(self):
         category = self.kwargs['category']
         tags = Tag.objects.filter(category=category).exclude(items=None).order_by('slug')
     serializer_class = serializers.TagSerializer
 
     def get_queryset(self):
         category = self.kwargs['category']
         tags = Tag.objects.filter(category=category).exclude(items=None).order_by('slug')

-        if self.request.query_params.get('book_only') == 'true':
-            tags = tags.filter(for_books=True)
-        if self.request.GET.get('picture_only') == 'true':
-            tags = filter(for_pictures=True)

 
         after = self.request.query_params.get('after')
         count = self.request.query_params.get('count')
 
         after = self.request.query_params.get('after')
         count = self.request.query_params.get('count')


@@ -377,7 +396,7 @@ class TagView(RetrieveAPIView):
 
 
 @vary_on_auth  # Because of 'liked'.
 
 
 @vary_on_auth  # Because of 'liked'.

-class FragmentList(ListAPIView):
+class FragmentList(LegacyListAPIView):

     serializer_class = serializers.FragmentSerializer
 
     def get_queryset(self):
     serializer_class = serializers.FragmentSerializer
 
     def get_queryset(self):