fix

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

diff --git a/src/social/api/views.py b/src/social/api/views.py
index 867a05a..ea8b128 100644 (file)
--- a/src/social/api/views.py
+++ b/src/social/api/views.py
@@ -1,8 +1,11 @@
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #

+from datetime import datetime
+from pytz import utc

 from django.http import Http404
 from django.http import Http404

-from rest_framework.generics import ListAPIView, ListCreateAPIView, RetrieveAPIView, RetrieveUpdateAPIView, RetrieveUpdateDestroyAPIView, DestroyAPIView, get_object_or_404
+from django.utils.timezone import now
+from rest_framework.generics import ListAPIView, ListCreateAPIView, RetrieveAPIView, RetrieveUpdateAPIView, RetrieveUpdateDestroyAPIView, get_object_or_404

 from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from rest_framework import serializers
 from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from rest_framework import serializers


@@ -13,9 +16,11 @@ from catalogue.api.helpers import order_books, books_after
 from catalogue.api.serializers import BookSerializer
 from catalogue.models import Book
 import catalogue.models
 from catalogue.api.serializers import BookSerializer
 from catalogue.models import Book
 import catalogue.models

-from social.utils import likes, get_set

 from social.views import get_sets_for_book_ids
 from social.views import get_sets_for_book_ids

+from social.utils import likes

 from social import models
 from social import models

+import bookmarks.models
+from bookmarks.api.views import BookmarkSerializer

 
 
 @never_cache
 
 
 @never_cache


@@ -30,9 +35,9 @@ class LikeView(APIView):
         book = get_object_or_404(Book, slug=slug)
         action = request.query_params.get('action', 'like')
         if action == 'like':
         book = get_object_or_404(Book, slug=slug)
         action = request.query_params.get('action', 'like')
         if action == 'like':

-            book.like(request.user)
+            models.UserList.like(request.user, book)

         elif action == 'unlike':
         elif action == 'unlike':

-            book.unlike(request.user)
+            models.UserList.unlike(request.user, book)

         return Response({})
 
 
         return Response({})
 
 


@@ -46,12 +51,12 @@ class LikeView2(APIView):
 
     def put(self, request, slug):
         book = get_object_or_404(Book, slug=slug)
 
     def put(self, request, slug):
         book = get_object_or_404(Book, slug=slug)

-        book.like(request.user)
+        models.UserList.like(request.user, book)

         return Response({"likes": likes(request.user, book)})
 
     def delete(self, request, slug):
         book = get_object_or_404(Book, slug=slug)
         return Response({"likes": likes(request.user, book)})
 
     def delete(self, request, slug):
         book = get_object_or_404(Book, slug=slug)

-        book.unlike(request.user)
+        models.UserList.unlike(request.user, book)

         return Response({"likes": likes(request.user, book)})
 
 
         return Response({"likes": likes(request.user, book)})
 
 


@@ -75,52 +80,109 @@ class MyLikesView(APIView):
     permission_classes = [IsAuthenticated]
 
     def get(self, request):
     permission_classes = [IsAuthenticated]
 
     def get(self, request):

-        ids = catalogue.models.tag.TagRelation.objects.filter(tag__user=request.user).values_list('object_id', flat=True).distinct()
-        books = Book.objects.filter(id__in=ids)
-        books = {b.id: b.slug for b in books}
-        res = get_sets_for_book_ids(ids, request.user)
-        res = {books[bid]: v for bid, v in res.items()}
-
-        res = list(books.values())
-        res.sort()
-        return Response(res)
+        ul = models.UserList.get_favorites_list(request.user)
+        if ul is None:
+            return Response([])
+        return Response(
+            ul.userlistitem_set.exclude(deleted=True).exclude(book=None).values_list('book__slug', flat=True)
+        )

 
 
 
 

-class TaggedBooksField(serializers.Field):
+class UserListItemsField(serializers.Field):

     def to_representation(self, value):
     def to_representation(self, value):

-        return catalogue.models.Book.tagged.with_all([value]).values_list('slug', flat=True)
+        return value.userlistitem_set.exclude(deleted=True).exclude(book=None).values_list('book__slug', flat=True)

 
     def to_internal_value(self, value):
         return {'books': catalogue.models.Book.objects.filter(slug__in=value)}
 
 
 class UserListSerializer(serializers.ModelSerializer):
 
     def to_internal_value(self, value):
         return {'books': catalogue.models.Book.objects.filter(slug__in=value)}
 
 
 class UserListSerializer(serializers.ModelSerializer):

-    books = TaggedBooksField(source='*')
+    client_id = serializers.CharField(write_only=True, required=False)
+    books = UserListItemsField(source='*', required=False)
+    timestamp = serializers.IntegerField(required=False)

 
     class Meta:
 
     class Meta:

-        model = catalogue.models.Tag
-        fields = ['name', 'slug', 'books']
-        read_only_fields = ['slug']
+        model = models.UserList
+        fields = [
+            'timestamp',
+            'client_id',
+            'name',
+            'slug',
+            'favorites',
+            'deleted',
+            'books',
+        ]
+        read_only_fields = ['favorites']
+        extra_kwargs = {
+            'slug': {
+                'required': False
+            }
+        }

 
     def create(self, validated_data):
 
     def create(self, validated_data):

-        instance = get_set(validated_data['user'], validated_data['name'])
-        catalogue.models.tag.TagRelation.objects.filter(tag=instance).delete()
+        instance = models.UserList.get_by_name(
+            validated_data['user'],
+            validated_data['name'],
+            create=True
+        )
+        instance.userlistitem_set.all().delete()

         for book in validated_data['books']:
         for book in validated_data['books']:

-            catalogue.models.Tag.objects.add_tag(book, instance)
+            instance.append(book)

         return instance
 
     def update(self, instance, validated_data):
         return instance
 
     def update(self, instance, validated_data):

-        catalogue.models.tag.TagRelation.objects.filter(tag=instance).delete()
+        instance.userlistitem_set.all().delete()

         for book in validated_data['books']:
         for book in validated_data['books']:

-            catalogue.models.Tag.objects.add_tag(book, instance)
+            instance.append(instance)

         return instance
 
 class UserListBooksSerializer(UserListSerializer):
     class Meta:
         return instance
 
 class UserListBooksSerializer(UserListSerializer):
     class Meta:

-        model = catalogue.models.Tag
+        model = models.UserList

         fields = ['books']
 
 
         fields = ['books']
 
 

+class UserListItemSerializer(serializers.ModelSerializer):
+    client_id = serializers.CharField(write_only=True, required=False)
+    favorites = serializers.BooleanField(required=False)
+    list_slug = serializers.SlugRelatedField(
+        queryset=models.UserList.objects.all(),
+        source='list',
+        slug_field='slug',
+        required=False,
+    )
+    timestamp = serializers.IntegerField(required=False)
+    book_slug = serializers.SlugRelatedField(
+        queryset=Book.objects.all(),
+        source='book',
+        slug_field='slug',
+        required=False
+    )
+
+    class Meta:
+        model = models.UserListItem
+        fields = [
+            'client_id',
+            'uuid',
+            'order',
+            'list_slug',
+            'timestamp',
+            'favorites',
+            'deleted',
+
+            'book_slug',
+            'fragment',
+            'quote',
+            'bookmark',
+            'note',
+        ]
+        extra_kwargs = {
+            'order': {
+                'required': False
+            }
+        }
+
+

 @never_cache
 class ListsView(ListCreateAPIView):
     permission_classes = [IsAuthenticated]
 @never_cache
 class ListsView(ListCreateAPIView):
     permission_classes = [IsAuthenticated]


@@ -128,7 +190,11 @@ class ListsView(ListCreateAPIView):
     serializer_class = UserListSerializer
 
     def get_queryset(self):
     serializer_class = UserListSerializer
 
     def get_queryset(self):

-        return catalogue.models.Tag.objects.filter(user=self.request.user).exclude(name='')
+        return models.UserList.objects.filter(
+            user=self.request.user,
+            favorites=False,
+            deleted=False
+        )

 
     def perform_create(self, serializer):
         serializer.save(user=self.request.user)
 
     def perform_create(self, serializer):
         serializer.save(user=self.request.user)


@@ -141,7 +207,10 @@ class ListView(RetrieveUpdateDestroyAPIView):
     serializer_class = UserListSerializer
 
     def get_object(self):
     serializer_class = UserListSerializer
 
     def get_object(self):

-        return get_object_or_404(catalogue.models.Tag, slug=self.kwargs['slug'], user=self.request.user)
+        return get_object_or_404(
+            models.UserList,
+            slug=self.kwargs['slug'],
+            user=self.request.user)

 
     def perform_update(self, serializer):
         serializer.save(user=self.request.user)
 
     def perform_update(self, serializer):
         serializer.save(user=self.request.user)


@@ -151,18 +220,25 @@ class ListView(RetrieveUpdateDestroyAPIView):
         serializer.is_valid(raise_exception=True)
         instance = self.get_object()
         for book in serializer.validated_data['books']:
         serializer.is_valid(raise_exception=True)
         instance = self.get_object()
         for book in serializer.validated_data['books']:

-            catalogue.models.Tag.objects.add_tag(book, instance)
+            instance.append(book)

         return Response(self.get_serializer(instance).data)
 
         return Response(self.get_serializer(instance).data)
 

+    def perform_destroy(self, instance):
+        instance.update(
+            deleted=True,
+            updated_at=now()
+        )
+

 
 @never_cache
 class ListItemView(APIView):
     permission_classes = [IsAuthenticated]
 
     def delete(self, request, slug, book):
 
 @never_cache
 class ListItemView(APIView):
     permission_classes = [IsAuthenticated]
 
     def delete(self, request, slug, book):

-        instance = get_object_or_404(catalogue.models.Tag, slug=slug, user=self.request.user)
+        instance = get_object_or_404(
+            models.UserList, slug=slug, user=self.request.user)

         book = get_object_or_404(catalogue.models.Book, slug=book)
         book = get_object_or_404(catalogue.models.Book, slug=book)

-        catalogue.models.Tag.objects.remove_tag(book, instance)
+        instance.remove(book=book)

         return Response(UserListSerializer(instance).data)
 
 
         return Response(UserListSerializer(instance).data)
 
 


@@ -180,7 +256,7 @@ class ShelfView(ListAPIView):
         after = self.request.query_params.get('after')
         count = int(self.request.query_params.get('count', 50))
         if state == 'likes':
         after = self.request.query_params.get('after')
         count = int(self.request.query_params.get('count', 50))
         if state == 'likes':

-            books = Book.tagged.with_any(self.request.user.tag_set.all())
+            books = Book.objects.filter(userlistitem__list__user=self.request.user)

         else:
             ids = BookUserData.objects.filter(user=self.request.user, complete=state == 'complete')\
                 .values_list('book_id', flat=True)
         else:
             ids = BookUserData.objects.filter(user=self.request.user, complete=state == 'complete')\
                 .values_list('book_id', flat=True)


@@ -201,19 +277,31 @@ class ProgressSerializer(serializers.ModelSerializer):
         view_name='catalogue_api_book',
         lookup_field='slug'
     )
         view_name='catalogue_api_book',
         lookup_field='slug'
     )

-    book_slug = serializers.SlugRelatedField(source='book', read_only=True, slug_field='slug')
+    book_slug = serializers.SlugRelatedField(
+        queryset=Book.objects.all(),
+        source='book',
+        slug_field='slug')
+    timestamp = serializers.IntegerField(required=False)

 
     class Meta:
         model = models.Progress
 
     class Meta:
         model = models.Progress

-        fields = ['book', 'book_slug', 'last_mode', 'text_percent',
-    'text_anchor',
-    'audio_percent',
-    'audio_timestamp',
-    'implicit_text_percent',
-    'implicit_text_anchor',
-    'implicit_audio_percent',
-    'implicit_audio_timestamp',
-    ]
+        fields = [
+            'timestamp',
+            'book', 'book_slug', 'last_mode', 'text_percent',
+            'text_anchor',
+            'audio_percent',
+            'audio_timestamp',
+            'implicit_text_percent',
+            'implicit_text_anchor',
+            'implicit_audio_percent',
+            'implicit_audio_timestamp',
+        ]
+        extra_kwargs = {
+            'last_mode': {
+                'required': False,
+                'default': 'text',
+            }
+        }

 
 
 class TextProgressSerializer(serializers.ModelSerializer):
 
 
 class TextProgressSerializer(serializers.ModelSerializer):


@@ -276,3 +364,108 @@ class AudioProgressView(ProgressMixin, RetrieveUpdateAPIView):
         serializer.instance.last_mode = 'audio'
         serializer.save()
 
         serializer.instance.last_mode = 'audio'
         serializer.save()
 

+
+
+@never_cache
+class SyncView(ListAPIView):
+    permission_classes = [IsAuthenticated]
+    sync_id_field = 'slug'
+    sync_id_serializer_field = 'slug'
+    sync_user_field = 'user'
+
+    def get_queryset(self):
+        try:
+            timestamp = int(self.request.GET.get('ts'))
+        except:
+            timestamp = 0
+
+        timestamp = datetime.fromtimestamp(timestamp, tz=utc)
+        
+        data = []
+        return self.get_queryset_for_ts(timestamp)
+
+    def get_queryset_for_ts(self, timestamp):
+        return self.model.objects.filter(
+            updated_at__gt=timestamp,
+            **{
+                self.sync_user_field: self.request.user
+            }
+        ).order_by('updated_at')
+
+    def get_instance(self, user, data):
+        sync_id = data.get(self.sync_id_serializer_field)
+        if not sync_id:
+            return None
+        return self.model.objects.filter(**{
+            self.sync_user_field: user,
+            self.sync_id_field: sync_id
+        }).first()
+
+    def post(self, request):
+        new_ids = []
+        data = request.data
+        for item in data:
+            instance = self.get_instance(request.user, item)
+            ser = self.get_serializer(
+                instance=instance,
+                data=item
+            )
+            ser.is_valid(raise_exception=True)
+            synced_instance = self.model.sync(
+                request.user,
+                instance,
+                ser.validated_data
+            )
+            if instance is None and 'client_id' in ser.validated_data and synced_instance is not None:
+                new_ids.append({
+                    'client_id': ser.validated_data['client_id'],
+                    self.sync_id_serializer_field: getattr(synced_instance, self.sync_id_field),
+                })
+        return Response(new_ids)
+
+
+class ProgressSyncView(SyncView):
+    model = models.Progress
+    serializer_class = ProgressSerializer
+    
+    sync_id_field = 'book__slug'
+    sync_id_serializer_field = 'book_slug'
+
+
+class UserListSyncView(SyncView):
+    model = models.UserList
+    serializer_class = UserListSerializer
+
+
+class UserListItemSyncView(SyncView):
+    model = models.UserListItem
+    serializer_class = UserListItemSerializer
+
+    sync_id_field = 'uuid'
+    sync_id_serializer_field = 'uuid'
+    sync_user_field = 'list__user'
+
+    def get_queryset_for_ts(self, timestamp):
+        qs = self.model.objects.filter(
+            updated_at__gt=timestamp,
+            **{
+                self.sync_user_field: self.request.user
+            }
+        )
+        if self.request.query_params.get('favorites'):
+            qs = qs.filter(list__favorites=True)
+        return qs.order_by('updated_at')
+
+
+class BookmarkSyncView(SyncView):
+    model = bookmarks.models.Bookmark
+    serializer_class = BookmarkSerializer
+
+    sync_id_field = 'uuid'
+    sync_id_serializer_field = 'uuid'
+
+    def get_queryset_for_ts(self, timestamp):
+        return self.model.objects.filter(
+            user=self.request.user,
+            created_at__gt=timestamp
+        ).order_by('created_at')