implemented borrowing methods, "BORROWED" license acq, RESERVES

includes a schema migration!

core/migrations/0055_auto__add_field_acq_lib_acq.py

@@ -0,0 +1,319 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Acq.lib_acq'
+        db.add_column('core_acq', 'lib_acq',
+                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='loans', null=True, to=orm['core.Acq']),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Acq.lib_acq'
+        db.delete_column('core_acq', 'lib_acq_id')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'booxtream.boox': {
+            'Meta': {'object_name': 'Boox'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'download_link_epub': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'download_link_mobi': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}),
+            'downloads_remaining': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'expirydays': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'referenceid': ('django.db.models.fields.CharField', [], {'max_length': '32'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.acq': {
+            'Meta': {'object_name': 'Acq'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lib_acq': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'loans'", 'null': 'True', 'to': "orm['core.Acq']"}),
+            'license': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'acqs'", 'to': "orm['auth.User']"}),
+            'watermarked': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['booxtream.Boox']", 'null': 'True'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'acqs'", 'to': "orm['core.Work']"})
+        },
+        'core.author': {
+            'Meta': {'object_name': 'Author'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'editions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authors'", 'symmetrical': 'False', 'to': "orm['core.Edition']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        },
+        'core.badge': {
+            'Meta': {'object_name': 'Badge'},
+            'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '72', 'blank': 'True'})
+        },
+        'core.campaign': {
+            'Meta': {'object_name': 'Campaign'},
+            'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'cc_date_initial': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'deadline': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}),
+            'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}),
+            'dollar_per_day': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}),
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}),
+            'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}),
+            'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}),
+            'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'publisher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Publisher']"}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}),
+            'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}),
+            'type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"})
+        },
+        'core.campaignaction': {
+            'Meta': {'object_name': 'CampaignAction'},
+            'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'to': "orm['core.Campaign']"}),
+            'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '15'})
+        },
+        'core.celerytask': {
+            'Meta': {'object_name': 'CeleryTask'},
+            'active': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 10, 16, 0, 0)', 'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True'}),
+            'function_args': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
+            'function_name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tasks'", 'null': 'True', 'to': "orm['auth.User']"})
+        },
+        'core.claim': {
+            'Meta': {'object_name': 'Claim'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rights_holder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.RightsHolder']"}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '7'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['auth.User']"}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.Work']"})
+        },
+        'core.ebook': {
+            'Meta': {'object_name': 'Ebook'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'download_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ebooks'", 'to': "orm['core.Edition']"}),
+            'format': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'rights': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '1024'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+        },
+        'core.ebookfile': {
+            'Meta': {'object_name': 'EbookFile'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ebook_files'", 'to': "orm['core.Edition']"}),
+            'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'format': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'core.edition': {
+            'Meta': {'object_name': 'Edition'},
+            'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'publisher_name': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.PublisherName']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+            'unglued': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"})
+        },
+        'core.identifier': {
+            'Meta': {'unique_together': "(('type', 'value'),)", 'object_name': 'Identifier'},
+            'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'null': 'True', 'to': "orm['core.Edition']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['core.Work']"})
+        },
+        'core.key': {
+            'Meta': {'object_name': 'Key'},
+            'encrypted_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        'core.libpref': {
+            'Meta': {'object_name': 'Libpref'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'marc_link_target': ('django.db.models.fields.CharField', [], {'default': "'UNGLUE'", 'max_length': '6'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'libpref'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'core.marcrecord': {
+            'Meta': {'object_name': 'MARCRecord'},
+            'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'MARCrecords'", 'null': 'True', 'to': "orm['core.Edition']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'link_target': ('django.db.models.fields.CharField', [], {'default': "'DIRECT'", 'max_length': '6'})
+        },
+        'core.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'license': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'offers'", 'to': "orm['core.Work']"})
+        },
+        'core.premium': {
+            'Meta': {'object_name': 'Premium'},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}),
+            'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+        },
+        'core.press': {
+            'Meta': {'object_name': 'Press'},
+            'date': ('django.db.models.fields.DateField', [], {}),
+            'highlight': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'note': ('django.db.models.fields.CharField', [], {'max_length': '140', 'blank': 'True'}),
+            'source': ('django.db.models.fields.CharField', [], {'max_length': '140'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'core.publisher': {
+            'Meta': {'object_name': 'Publisher'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'key_publisher'", 'to': "orm['core.PublisherName']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        },
+        'core.publishername': {
+            'Meta': {'object_name': 'PublisherName'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'publisher': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'alternate_names'", 'null': 'True', 'to': "orm['core.Publisher']"})
+        },
+        'core.rightsholder': {
+            'Meta': {'object_name': 'RightsHolder'},
+            'can_sell': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rights_holder'", 'to': "orm['auth.User']"}),
+            'rights_holder_name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.subject': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Subject'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subjects'", 'symmetrical': 'False', 'to': "orm['core.Work']"})
+        },
+        'core.userprofile': {
+            'Meta': {'object_name': 'UserProfile'},
+            'avatar_source': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1', 'null': 'True'}),
+            'badges': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'holders'", 'symmetrical': 'False', 'to': "orm['core.Badge']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'facebook_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'goodreads_auth_secret': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'goodreads_auth_token': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'goodreads_user_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'goodreads_user_link': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'goodreads_user_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'home_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'kindle_email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}),
+            'librarything_id': ('django.db.models.fields.CharField', [], {'max_length': '31', 'blank': 'True'}),
+            'pic_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'tagline': ('django.db.models.fields.CharField', [], {'max_length': '140', 'blank': 'True'}),
+            'twitter_id': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'core.waswork': {
+            'Meta': {'object_name': 'WasWork'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moved': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+            'was': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Work']"})
+        },
+        'core.wishes': {
+            'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}),
+            'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}),
+            'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"})
+        },
+        'core.wishlist': {
+            'Meta': {'object_name': 'Wishlist'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}),
+            'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"})
+        },
+        'core.work': {
+            'Meta': {'ordering': "['title']", 'object_name': 'Work'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+            'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+            'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'})
+        }
+    }
+
+    complete_apps = ['core']

core/models.py

@@ -56,7 +56,8 @@ from regluit.core.parameters import (
     INDIVIDUAL,
     LIBRARY,
     BORROWED,
-    TESTING
+    TESTING,
+    RESERVE,
 )
     
 
@@ -258,7 +259,7 @@ class Acq(models.Model):
     """ 
     Short for Acquisition, this is a made-up word to describe the thing you acquire when you buy or borrow an ebook 
     """
-    CHOICES = ((INDIVIDUAL,'Individual license'),(LIBRARY,'Library License'),(BORROWED,'Borrowed from Library'), (TESTING,'Just for Testing'))
+    CHOICES = ((INDIVIDUAL,'Individual license'),(LIBRARY,'Library License'),(BORROWED,'Borrowed from Library'), (TESTING,'Just for Testing'), (RESERVE,'On Reserve'),)
     created = models.DateTimeField(auto_now_add=True)
     expires = models.DateTimeField(null=True)
     work = models.ForeignKey("Work", related_name='acqs', null=False)
@@ -268,6 +269,9 @@ class Acq(models.Model):
     watermarked = models.ForeignKey("booxtream.Boox",  null=True)
     nonce = models.CharField(max_length=32, null=True)
     
+    # when the acq is a loan, this points at the library's acq it's derived from 
+    lib_acq = models.ForeignKey("self", related_name="loans", null=True)
+    
     @property
     def expired(self):
         if self.expires is None:
@@ -276,13 +280,19 @@ class Acq(models.Model):
             return self.expires < datetime.now()
             
     def get_mobi_url(self):
+        if self.expired:
+            return ''
         return self.get_watermarked().download_link_mobi
         
     def get_epub_url(self):
+        if self.expired:
+            return ''
         return self.get_watermarked().download_link_epub
         
     def get_watermarked(self):
         if self.watermarked == None or self.watermarked.expired:
+            if self.on_reserve:
+                self.borrow(self.user)
             params={
                 'customeremailaddress': self.user.email,
                 'customername': self.user.username,
@@ -305,12 +315,45 @@ class Acq(models.Model):
     def _hash(self):
         return hashlib.md5('1c1a56974ef08edc%s:%s:%s'%(self.user.id,self.work.id,self.created)).hexdigest() 
         
+    def expire_in(self, delta):
+        self.expires = now()+delta
+        self.save()
+        
+    @property
+    def on_reserve(self):
+        return self.license==RESERVE
+        
+    def borrow(self, user=None):
+        if self.on_reserve:
+            self.license=BORROWED
+            self.expire_in(timedelta(days=14))
+            return self
+        if self.borrowable and user:
+            return Acq.objects.create(user=user,work=self.work,license= BORROWED)
+
+    @property
+    def borrowable(self): 
+        if self.license == RESERVE and not self.expired:
+            return True
+        if self.license != LIBRARY:
+            return False
+        return Acq.objects.filter(lib_acq=self,expires__gt=datetime.now()).count()==0
+         
+        
+
 def add_acq_nonce(sender, instance, created,  **kwargs):
     if created:
         instance.nonce=instance._hash()
         instance.save()
+def set_expiration(sender, instance, created,  **kwargs):
+    if created:
+        if instance.license == RESERVE:
+            instance.expire_in(timedelta(hours=2))
+        if instance.license == BORROWED:
+            instance.expire_in(timedelta(days=14))
 
 post_save.connect(add_acq_nonce,sender=Acq)
+post_save.connect(set_expiration,sender=Acq)
 
 class Campaign(models.Model):
     LICENSE_CHOICES = settings.CCCHOICES

core/parameters.py

@@ -1,3 +1,3 @@
 (REWARDS, BUY2UNGLUE) = (1, 2)
-(INDIVIDUAL, LIBRARY, BORROWED) = (1, 2, 3)
+(INDIVIDUAL, LIBRARY, BORROWED, RESERVE) = (1, 2, 3, 4)
 TESTING = 0

core/signals.py

@@ -31,7 +31,7 @@ regluit imports
 """
 from regluit.payment.signals import transaction_charged, transaction_failed, pledge_modified, pledge_created
 from regluit.utils.localdatetime import now
-from regluit.core.parameters import REWARDS, BUY2UNGLUE, LIBRARY
+from regluit.core.parameters import REWARDS, BUY2UNGLUE, LIBRARY, RESERVE
 from regluit.libraryauth.models import Library
 
 logger = logging.getLogger(__name__)
@@ -187,7 +187,8 @@ def handle_transaction_charged(sender,transaction=None, **kwargs):
         Acq = get_model('core', 'Acq')
         if transaction.offer.license == LIBRARY:
             library = Library.objects.get(id=transaction.extra['library_id'])
-            new_acq = Acq.objects.create(user=library.user,work=transaction.campaign.work,license= transaction.offer.license)
+            new_acq = Acq.objects.create(user=library.user,work=transaction.campaign.work,license= LIBRARY)
+            reserve_acq =  Acq.objects.create(user=transaction.user,work=transaction.campaign.work,license= RESERVE, lib_acq = new_acq)
         else:
             new_acq = Acq.objects.create(user=transaction.user,work=transaction.campaign.work,license= transaction.offer.license)
         transaction.campaign.update_left()

core/tests.py

@@ -57,8 +57,8 @@ from regluit.core.models import (
     EbookFile,
     Acq,
 )
-
+from regluit.libraryauth.models import Library
-from regluit.core.parameters import TESTING
+from regluit.core.parameters import TESTING, LIBRARY, RESERVE
 from regluit.frontend.views import safe_get_work
 from regluit.payment.models import Transaction
 from regluit.payment.parameters import PAYMENT_TYPE_AUTHORIZATION
@@ -864,5 +864,26 @@ class EbookFileTests(TestCase):
         self.assertRegexpMatches(url,'download.booxtream.com/')
         print url
 
+from .signals import handle_transaction_charged
+class LibTests(TestCase):
 
+    class transaction:
+        pass
+        
+    def test_purchase(self):
+        w = Work.objects.create(title="Work 1")
+        e = Edition.objects.create(title=w.title,work=w)
+        u = User.objects.create_user('test', 'test@example.org', 'testpass')
+        lu = User.objects.create_user('library', 'testu@example.org', 'testpass')
+        lib = Library.objects.create(user=lu)
+        c = Campaign.objects.create(work=w, type = parameters.BUY2UNGLUE, cc_date_initial= datetime(2020,1,1),target=1000, deadline=datetime(2020,1,1))
+        
+        new_acq = Acq.objects.create(user=lib.user,work=c.work,license= LIBRARY)
+        self.assertTrue(new_acq.borrowable)
+        reserve_acq =  Acq.objects.create(user=u,work=c.work,license= RESERVE, lib_acq = new_acq)
+        self.assertTrue(reserve_acq.borrowable)
+        print reserve_acq.expires
+        self.assertTrue(reserve_acq.expires< now()+timedelta(hours=3))
+        self.assertFalse(new_acq.borrowable)
+        self.assertTrue(reserve_acq.expires> now()+timedelta(hours=3))
         

frontend/templates/download.html

@@ -99,7 +99,7 @@ $j(document).ready(function() {
             </div>
         {% endif %}
         {% if acq %}
-            <h3>Download your ebook!</h3>
+            <h3>Download your ebook{% if acq.lib_acq %}{% if acq.on_reserve %}, on reserve for you at{% else %}, on loan to you at{% endif %} {{ acq.lib_acq.user.library }}{% endif %}</h3>
             <div class="ebook_download">
                     <a href="{{ formats.epub }}"><img src="/static/images/epub32.png" height="32" alt="epub" title="epub" /></a>
                     <a href="{{ formats.epub }}">EPUB</a> (for iBooks, Nook, Kobo)