Merge pull request #25 from BirkbeckCTP/django_three_two

Updated for django 3.2

Author: mauromsl

migrations/0039_auto_20221216_1329.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.16 on 2022-12-16 13:29
+
+from django.conf import settings
+import django.core.files.storage
+from django.db import migrations, models
+import django.db.models.deletion
+import plugins.consortial_billing.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('consortial_billing', '0038_auto_20190823_1144'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='banding',
+            name='billing_agent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='consortial_billing.billingagent'),
+        ),
+        migrations.AlterField(
+            model_name='institution',
+            name='supporter_level',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='consortial_billing.supportlevel'),
+        ),
+        migrations.AlterField(
+            model_name='poll',
+            name='file',
+            field=models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(location='/home/ajrbyers/Code/janeway/src/media'), upload_to=plugins.consortial_billing.models.file_upload_path),
+        ),
+        migrations.AlterField(
+            model_name='poll',
+            name='staffer',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

models.py

@@ -33,7 +33,12 @@ class Banding(models.Model):
     name = models.CharField(max_length=200, blank=False, unique=True)
     currency = models.CharField(max_length=255, blank=True, null=True)
     default_price = models.IntegerField(blank=True, null=True, default=0)
-    billing_agent = models.ForeignKey('BillingAgent', null=True, blank=True)
+    billing_agent = models.ForeignKey(
+        'BillingAgent',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+    )
     display = models.BooleanField(default=True)
     redirect_url = models.URLField(blank=True, null=True)
     size = models.CharField(max_length=20, choices=banding_choices(), default='small')
@@ -91,7 +96,12 @@ class Institution(models.Model):
 
     multiplier = models.DecimalField(decimal_places=2, max_digits=3, default=1.0)
 
-    supporter_level = models.ForeignKey(SupportLevel, blank=True, null=True)
+    supporter_level = models.ForeignKey(
+        SupportLevel,
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+    )
 
     referral_code = models.UUIDField(default=uuid.uuid4)
 
@@ -119,7 +129,10 @@ class Renewal(models.Model):
     date = models.DateField(default=timezone.now)
     amount = models.DecimalField(decimal_places=2, max_digits=20, blank=False)
     currency = models.CharField(max_length=255, blank=False)
-    institution = models.ForeignKey(Institution)
+    institution = models.ForeignKey(
+        Institution,
+        on_delete=models.CASCADE,
+    )
     billing_complete = models.BooleanField(default=False)
     date_renewed = models.DateTimeField(blank=True, null=True)
 
@@ -134,7 +147,10 @@ def __str__(self):
 
 
 class ExcludedUser(models.Model):
-    user = models.ForeignKey('core.Account')
+    user = models.ForeignKey(
+        'core.Account',
+        on_delete=models.CASCADE,
+    )
 
 
 class Signup(models.Model):
@@ -154,7 +170,11 @@ class Signup(models.Model):
 
 
 class Poll(models.Model):
-    staffer = models.ForeignKey('core.Account')
+    staffer = models.ForeignKey(
+        'core.Account',
+        null=True,
+        on_delete=models.SET_NULL,
+    )
     name = models.CharField(max_length=255)
     text = models.TextField(null=True)
     file = models.FileField(upload_to=file_upload_path, null=True, blank=True, storage=fs)
@@ -189,8 +209,14 @@ def __str__(self):
 
 
 class IncreaseOptionBand(models.Model):
-    banding = models.ForeignKey(Banding)
-    option = models.ForeignKey(Option)
+    banding = models.ForeignKey(
+        Banding,
+        on_delete=models.CASCADE,
+    )
+    option = models.ForeignKey(
+        Option,
+        on_delete=models.CASCADE,
+    )
     price_increase = models.DecimalField(max_digits=10, decimal_places=2, default=0.00)
 
     def __str__(self):
@@ -199,15 +225,29 @@ def __str__(self):
 
 
 class Vote(models.Model):
-    institution = models.ForeignKey(Institution)
-    poll = models.ForeignKey(Poll)
+    institution = models.ForeignKey(
+        Institution,
+        on_delete=models.CASCADE,
+    )
+    poll = models.ForeignKey(
+        Poll,
+        on_delete=models.CASCADE,
+    )
     aye = models.ManyToManyField(Option, related_name="vote_aye")
     no = models.ManyToManyField(Option, related_name="vote_no")
 
 
 class Referral(models.Model):
-    referring_institution = models.ForeignKey(Institution, related_name='referring_institution')
-    new_institution = models.ForeignKey(Institution, related_name='new_institution')
+    referring_institution = models.ForeignKey(
+        Institution,
+        related_name='referring_institution',
+        on_delete=models.CASCADE,
+    )
+    new_institution = models.ForeignKey(
+        Institution,
+        related_name='new_institution',
+        on_delete=models.CASCADE,
+    )
     referring_discount = models.DecimalField(decimal_places=2, max_digits=10, blank=True, null=True)
     referent_discount = models.DecimalField(decimal_places=2, max_digits=10, blank=True, null=True)
     datetime = models.DateTimeField(default=timezone.now)

plugin_settings.py

@@ -3,11 +3,11 @@
 PLUGIN_NAME = 'Consortial Billing'
 DESCRIPTION = 'This is a plugin to handle consortial billing.'
 AUTHOR = 'Martin Paul Eve'
-VERSION = '1.1'
+VERSION = '1.2'
 SHORT_NAME = 'consortial_billing'
 DISPLAY_NAME = 'supporters'
 MANAGER_URL = 'consortial_index'
-JANEWAY_VERSION = "1.3.6"
+JANEWAY_VERSION = "1.5.0"
 
 
 def get_self():