fix

[wolnelektury.git] / src / social / models.py

diff --git a/src/social/models.py b/src/social/models.py
index e50ff07..45ee0f4 100644 (file)
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -4,7 +4,6 @@
 from datetime import datetime
 import uuid
 from oauthlib.common import urlencode, generate_token
 from datetime import datetime
 import uuid
 from oauthlib.common import urlencode, generate_token

-from pytz import utc

 from random import randint
 from django.db import models
 from django.conf import settings
 from random import randint
 from django.db import models
 from django.conf import settings


@@ -12,7 +11,7 @@ from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.core.mail import send_mail
 from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.core.mail import send_mail
 from django.urls import reverse

-from django.utils.timezone import now
+from django.utils.timezone import now, utc

 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from wolnelektury.utils import cached_render, clear_cached_renders
 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from wolnelektury.utils import cached_render, clear_cached_renders


@@ -278,6 +277,11 @@ class Progress(Syncable, models.Model):
         return super().save(*args, **kwargs)
 
 
         return super().save(*args, **kwargs)
 
 

+class ActiveManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(deleted=False)
+
+

 class UserList(Syncable, models.Model):
     slug = models.SlugField(unique=True)
     user = models.ForeignKey(User, models.CASCADE)
 class UserList(Syncable, models.Model):
     slug = models.SlugField(unique=True)
     user = models.ForeignKey(User, models.CASCADE)


@@ -290,7 +294,10 @@ class UserList(Syncable, models.Model):
     reported_timestamp = models.DateTimeField()
 
     syncable_fields = ['name', 'public', 'deleted']
     reported_timestamp = models.DateTimeField()
 
     syncable_fields = ['name', 'public', 'deleted']

-    
+
+    objects = ActiveManager()
+    all_objects = models.Manager()
+

     def get_absolute_url(self):
         return reverse(
             'tagged_object_list',
     def get_absolute_url(self):
         return reverse(
             'tagged_object_list',


@@ -337,12 +344,14 @@ class UserList(Syncable, models.Model):
                 favorites=True
             )
         except cls.DoesNotExist:
                 favorites=True
             )
         except cls.DoesNotExist:

+            n = now()

             if create:
                 return cls.objects.create(
                     user=user,
                     favorites=True,
             if create:
                 return cls.objects.create(
                     user=user,
                     favorites=True,

-                    slug=get_random_hash(name),
-                    updated_at=now()
+                    slug=get_random_hash('favorites'),
+                    updated_at=n,
+                    reported_timestamp=n,

                 )
             else:
                 return None
                 )
             else:
                 return None


@@ -350,7 +359,7 @@ class UserList(Syncable, models.Model):
             # merge?
             lists = list(cls.objects.filter(user=user, favorites=True))
             for l in lists[1:]:
             # merge?
             lists = list(cls.objects.filter(user=user, favorites=True))
             for l in lists[1:]:

-                t.userlistitem_set.all().update(
+                l.userlistitem_set.all().update(

                     list=lists[0]
                 )
                 l.delete()
                     list=lists[0]
                 )
                 l.delete()


@@ -364,14 +373,23 @@ class UserList(Syncable, models.Model):
         return ls.userlistitem_set.filter(deleted=False, book=book).exists()
 
     def append(self, book):
         return ls.userlistitem_set.filter(deleted=False, book=book).exists()
 
     def append(self, book):

-        # TODO: check for duplicates?

         n = now()
         n = now()

-        item = self.userlistitem_set.create(
+        items = self.userlistitem_set.filter(

             book=book,
             book=book,

-            order=(self.userlistitem_set.aggregate(m=models.Max('order'))['m'] or 0) + 1,
-            updated_at=n,
-            reported_timestamp=n,

         )
         )

+        if items.exists():
+            items.update(
+                deleted=False,
+                reported_timestamp=n,
+            )
+            item = items.first()
+        else:
+            item = self.userlistitem_set.create(
+                book=book,
+                order=(self.userlistitem_set.aggregate(m=models.Max('order'))['m'] or 0) + 1,
+                updated_at=n,
+                reported_timestamp=n,
+            )

         book.update_popularity()
         return item
 
         book.update_popularity()
         return item
 


@@ -400,11 +418,11 @@ class UserList(Syncable, models.Model):
 class UserListItem(Syncable, models.Model):
     list = models.ForeignKey(UserList, models.CASCADE)
     uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False, blank=True)
 class UserListItem(Syncable, models.Model):
     list = models.ForeignKey(UserList, models.CASCADE)
     uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False, blank=True)

-    order = models.IntegerField()
+    order = models.IntegerField(default=0)

     deleted = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     deleted = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

-    reported_timestamp = models.DateTimeField()
+    reported_timestamp = models.DateTimeField(default=now)

 
     book = models.ForeignKey('catalogue.Book', models.SET_NULL, null=True, blank=True)
     fragment = models.ForeignKey('catalogue.Fragment', models.SET_NULL, null=True, blank=True)
 
     book = models.ForeignKey('catalogue.Book', models.SET_NULL, null=True, blank=True)
     fragment = models.ForeignKey('catalogue.Fragment', models.SET_NULL, null=True, blank=True)


@@ -415,6 +433,14 @@ class UserListItem(Syncable, models.Model):
     
     syncable_fields = ['order', 'deleted', 'book', 'fragment', 'quote', 'bookmark', 'note']
 
     
     syncable_fields = ['order', 'deleted', 'book', 'fragment', 'quote', 'bookmark', 'note']
 

+    objects = ActiveManager()
+    all_objects = models.Manager()
+
+    def save(self, *args, **kwargs):
+        if not self.order:
+            self.order = self.list.userlistitem_set.all().count() + 1
+        super().save(*args, **kwargs)
+

     @classmethod
     def create_from_data(cls, user, data):
         if data.get('favorites'):
     @classmethod
     def create_from_data(cls, user, data):
         if data.get('favorites'):