Merge branch 'master' into appdev

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

diff --git a/src/catalogue/api/serializers.py b/src/catalogue/api/serializers.py
index 60e52a0..609fa74 100644 (file)
--- a/src/catalogue/api/serializers.py
+++ b/src/catalogue/api/serializers.py
@@ -50,7 +50,7 @@ class AuthorItemSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tag
         fields = [
     class Meta:
         model = Tag
         fields = [

-            'url', 'href', 'name'
+            'url', 'href', 'name', 'slug'

         ]
 
 class AuthorSerializer(AuthorItemSerializer):
         ]
 
 class AuthorSerializer(AuthorItemSerializer):


@@ -59,7 +59,7 @@ class AuthorSerializer(AuthorItemSerializer):
     class Meta:
         model = Tag
         fields = [
     class Meta:
         model = Tag
         fields = [

-            'url', 'href', 'name', 'slug', 'sort_key', 'description',
+            'id', 'url', 'href', 'name', 'slug', 'sort_key', 'description',

             'genitive', 'photo', 'photo_thumb', 'photo_attribution',
         ]
 
             'genitive', 'photo', 'photo_thumb', 'photo_attribution',
         ]
 


@@ -71,7 +71,7 @@ class EpochItemSerializer(serializers.ModelSerializer):
     )
     class Meta:
         model = Tag
     )
     class Meta:
         model = Tag

-        fields = ['url', 'href', 'name']
+        fields = ['url', 'href', 'name', 'slug']

 
 class EpochSerializer(EpochItemSerializer):
     class Meta:
 
 class EpochSerializer(EpochItemSerializer):
     class Meta:


@@ -89,7 +89,7 @@ class GenreItemSerializer(serializers.ModelSerializer):
     )
     class Meta:
         model = Tag
     )
     class Meta:
         model = Tag

-        fields = ['url', 'href', 'name']
+        fields = ['url', 'href', 'name', 'slug']

 
 class GenreSerializer(GenreItemSerializer):
     class Meta:
 
 class GenreSerializer(GenreItemSerializer):
     class Meta:


@@ -107,7 +107,7 @@ class KindItemSerializer(serializers.ModelSerializer):
     )
     class Meta:
         model = Tag
     )
     class Meta:
         model = Tag

-        fields = ['url', 'href', 'name']
+        fields = ['url', 'href', 'name', 'slug']

 
 class KindSerializer(KindItemSerializer):
     class Meta:
 
 class KindSerializer(KindItemSerializer):
     class Meta:


@@ -117,6 +117,18 @@ class KindSerializer(KindItemSerializer):
             'collective_noun',
         ]
 
             'collective_noun',
         ]
 

+class ThemeSerializer(serializers.ModelSerializer):
+    url = AbsoluteURLField()
+    href = AbsoluteURLField(
+        view_name='catalogue_api_theme',
+        view_args=('slug',)
+    )
+    class Meta:
+        model = Tag
+        fields = [
+            'url', 'href', 'name', 'slug', 'sort_key', 'description',
+        ]
+

 
 class TranslatorSerializer(serializers.Serializer):
     name = serializers.CharField(source='*')
 
 class TranslatorSerializer(serializers.Serializer):
     name = serializers.CharField(source='*')


@@ -156,6 +168,8 @@ class BookSerializer2(serializers.ModelSerializer):
             'epub', 'mobi', 'pdf', 'html', 'txt', 'fb2', 'xml',
             'cover_thumb', 'cover',
             'isbn_pdf', 'isbn_epub', 'isbn_mobi',
             'epub', 'mobi', 'pdf', 'html', 'txt', 'fb2', 'xml',
             'cover_thumb', 'cover',
             'isbn_pdf', 'isbn_epub', 'isbn_mobi',

+            'abstract',
+            'has_mp3_file',

         ]
 
 class BookSerializer11Labs(serializers.ModelSerializer):
         ]
 
 class BookSerializer11Labs(serializers.ModelSerializer):


@@ -237,6 +251,17 @@ class MediaSerializer(LegacyMixin, serializers.ModelSerializer):
         legacy_non_null_fields = ['director', 'artist']
 
 
         legacy_non_null_fields = ['director', 'artist']
 
 

+class MediaSerializer2(MediaSerializer):
+    size = serializers.SerializerMethodField()
+
+    class Meta:
+        model = BookMedia
+        fields = ['url', 'director', 'type', 'name', 'part_name', 'artist', 'duration', 'size']
+
+    def get_size(self, obj):
+        return obj.file.size
+
+

 class BookDetailSerializer(LegacyMixin, serializers.ModelSerializer):
     url = AbsoluteURLField()
 
 class BookDetailSerializer(LegacyMixin, serializers.ModelSerializer):
     url = AbsoluteURLField()
 


@@ -352,7 +377,16 @@ class FragmentDetailSerializer(serializers.ModelSerializer):
         fields = ['book', 'anchor', 'text', 'url', 'themes']
 
 
         fields = ['book', 'anchor', 'text', 'url', 'themes']
 
 

+class FragmentSerializer2(serializers.ModelSerializer):
+    url = AbsoluteURLField()
+    html = serializers.CharField(source='text')
+
+    class Meta:
+        model = Fragment
+        fields = ['anchor', 'html', 'url']
+
+

 class FilterTagSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tag
 class FilterTagSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tag

-        fields = ['id', 'category', 'name']
+        fields = ['id', 'category', 'name', 'slug']