Allow email login

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

diff --git a/src/social/models.py b/src/social/models.py
index 7f22f97..862db4c 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


@@ -366,14 +365,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