Merge remote-tracking branch 'zawadzki/new-design'

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

diff --git a/src/api/models.py b/src/api/models.py
index 9a86c2c..28bc880 100644 (file)
--- a/src/api/models.py
+++ b/src/api/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -15,7 +14,7 @@ from catalogue.models import Book, Tag
 class Deleted(models.Model):
     object_id = models.IntegerField()
     slug = models.SlugField(_('slug'), max_length=120, blank=True, db_index=True)
 class Deleted(models.Model):
     object_id = models.IntegerField()
     slug = models.SlugField(_('slug'), max_length=120, blank=True, db_index=True)

-    content_type = models.ForeignKey(ContentType)
+    content_type = models.ForeignKey(ContentType, models.CASCADE)

     category = models.CharField(max_length=64, null=True, blank=True, db_index=True)
     created_at = models.DateTimeField(editable=False, db_index=True)
     deleted_at = models.DateTimeField(auto_now_add=True, db_index=True)
     category = models.CharField(max_length=64, null=True, blank=True, db_index=True)
     created_at = models.DateTimeField(editable=False, db_index=True)
     deleted_at = models.DateTimeField(auto_now_add=True, db_index=True)


@@ -31,20 +30,23 @@ def _pre_delete_handler(sender, instance, **kwargs):
         if sender == Tag:
             if instance.category in ('book', 'set'):
                 return
         if sender == Tag:
             if instance.category in ('book', 'set'):
                 return

-            else:
-                category = instance.category
+            category = instance.category

         else:
             category = None
         content_type = ContentType.objects.get_for_model(sender)
         Deleted.objects.create(
         else:
             category = None
         content_type = ContentType.objects.get_for_model(sender)
         Deleted.objects.create(

-            content_type=content_type, object_id=instance.id, created_at=instance.created_at, category=category,
-            slug=instance.slug)
+            content_type=content_type,
+            object_id=instance.id,
+            created_at=instance.created_at,
+            category=category,
+            slug=instance.slug
+        )

 pre_delete.connect(_pre_delete_handler)
 
 
 class BookUserData(models.Model):
 pre_delete.connect(_pre_delete_handler)
 
 
 class BookUserData(models.Model):

-    book = models.ForeignKey(Book)
-    user = models.ForeignKey(User)
+    book = models.ForeignKey(Book, models.CASCADE)
+    user = models.ForeignKey(User, models.CASCADE)

     complete = models.BooleanField(default=False)
     last_changed = models.DateTimeField(auto_now=True)
 
     complete = models.BooleanField(default=False)
     last_changed = models.DateTimeField(auto_now=True)
 


@@ -58,7 +60,6 @@ class BookUserData(models.Model):
         instance.complete = state == 'complete'
         instance.save()
         return instance
         instance.complete = state == 'complete'
         instance.save()
         return instance

-from django.conf import settings

 
 
 KEY_SIZE = 18
 
 
 KEY_SIZE = 18


@@ -77,7 +78,7 @@ class Nonce(models.Model):
     key = models.CharField(max_length=255)
 
     def __str__(self):
     key = models.CharField(max_length=255)
 
     def __str__(self):

-        return u"Nonce %s for %s" % (self.key, self.consumer_key)
+        return "Nonce %s for %s" % (self.key, self.consumer_key)

 
 
 class Consumer(models.Model):
 
 
 class Consumer(models.Model):


@@ -86,24 +87,30 @@ class Consumer(models.Model):
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')

-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, related_name='consumers')
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, models.CASCADE,
+        null=True, blank=True, related_name='consumers'
+    )

 
     def __str__(self):
 
     def __str__(self):

-        return u"Consumer %s with key %s" % (self.name, self.key)
+        return "Consumer %s with key %s" % (self.name, self.key)

 
 
 class Token(models.Model):
     REQUEST = 1
     ACCESS = 2
 
 
 class Token(models.Model):
     REQUEST = 1
     ACCESS = 2

-    TOKEN_TYPES = ((REQUEST, u'Request'), (ACCESS, u'Access'))
+    TOKEN_TYPES = ((REQUEST, 'Request'), (ACCESS, 'Access'))

 
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     token_type = models.IntegerField(choices=TOKEN_TYPES)
     timestamp = models.IntegerField()
     is_approved = models.BooleanField(default=False)
 
     key = models.CharField(max_length=KEY_SIZE)
     secret = models.CharField(max_length=SECRET_SIZE)
     token_type = models.IntegerField(choices=TOKEN_TYPES)
     timestamp = models.IntegerField()
     is_approved = models.BooleanField(default=False)

-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, related_name='tokens')
-    consumer = models.ForeignKey(Consumer)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, models.CASCADE,
+        null=True, blank=True, related_name='tokens'
+    )
+    consumer = models.ForeignKey(Consumer, models.CASCADE)

 
     def __str__(self):
 
     def __str__(self):

-        return u"%s Token %s for %s" % (self.get_token_type_display(), self.key, self.consumer)
+        return "%s Token %s for %s" % (self.get_token_type_display(), self.key, self.consumer)