⬆️ Major bumps and django checks

Notably to django 3.2

main/api/views.py

@@ -1,6 +1,5 @@
 from rest_framework import mixins
-from rest_framework.decorators import list_route
-from rest_framework.permissions import AllowAny
+from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from main.api.serializers import ProductSerializer, ProductStatSerializer
@@ -14,7 +13,7 @@ class ProductViewSet(mixins.ListModelMixin,
     serializer_class = ProductSerializer
     queryset = Product.objects.all()
 
-    @list_route(methods=['get'])
+    @action(detail=False, methods=['get'])
     def group_by_user(self, request):
         products = self.get_queryset().filter(active=True)
         serializer = ProductStatSerializer(products, many=True)

main/apps.py

@@ -2,7 +2,7 @@ from django.apps import AppConfig
 
 
 class BBSAppConfig(AppConfig):
-    name = 'bbs'
+    name = 'main'
     verbose_name = 'Biceps Bar System'
 
     def ready(self):

main/models.py

@@ -3,11 +3,10 @@ from datetime import datetime
 
 from django.conf import settings
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 
-@python_2_unicode_compatible
+
 class Product(models.Model):
     name = models.CharField(max_length=64)
     sale_price_int = models.FloatField()
@@ -53,9 +52,9 @@ class Product(models.Model):
         ordering = ['name']
 
 
-@python_2_unicode_compatible
+
 class Order(models.Model):
-    customer = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, related_name='orders')
+    customer = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True, blank=True, related_name='orders')
     order_sum = models.FloatField(db_column='sum')
     created = models.DateTimeField(auto_now_add=True)
 
@@ -69,10 +68,10 @@ class Order(models.Model):
         return "{}: {} kr".format(self.customer or "Ekstern", self.order_sum)
 
 
-@python_2_unicode_compatible
+
 class OrderLine(models.Model):
-    order = models.ForeignKey('main.Order', related_name='orderlines')
-    product = models.ForeignKey('main.Product', related_name='orderlines')
+    order = models.ForeignKey('main.Order', on_delete=models.CASCADE, related_name='orderlines')
+    product = models.ForeignKey('main.Product', on_delete=models.CASCADE, related_name='orderlines')
     amount = models.IntegerField()
     unit_price = models.FloatField(verbose_name=_('Enhetspris'))
 
@@ -87,10 +86,10 @@ class OrderLine(models.Model):
         unique_together = ('order', 'product')
 
 
-@python_2_unicode_compatible
+
 class Transaction(models.Model):
     """ Money """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='transactions')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='transactions')
     amount = models.FloatField()
     created = models.DateTimeField(auto_now_add=True)
 
@@ -98,11 +97,11 @@ class Transaction(models.Model):
         return "{}: {}: {}".format(self.id, self.user, self.amount)
 
 
-@python_2_unicode_compatible
+
 class InventoryTransaction(models.Model):
     """ Goods """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='inventory_transactions')
-    product = models.ForeignKey('main.Product', related_name='transactions', verbose_name=_('Produkt'))
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='inventory_transactions')
+    product = models.ForeignKey('main.Product', on_delete=models.CASCADE, related_name='transactions', verbose_name=_('Produkt'))
     amount = models.FloatField(verbose_name=_('Antall'))
     unit_price = models.FloatField(verbose_name=_('Enhetspris'))
     comment = models.TextField(verbose_name=_('Kommentar'), blank=True)
@@ -121,9 +120,9 @@ class InventoryTransaction(models.Model):
             self.unit_price)
 
 
-@python_2_unicode_compatible
+
 class UserProfile(models.Model):
-    user = models.OneToOneField(settings.AUTH_USER_MODEL, related_name='profile')
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='profile')
     balance = models.FloatField(default=0.0)
     image = models.URLField(blank=True)
 

main/views/general.py

@@ -6,11 +6,12 @@ from datetime import datetime, timedelta
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.db.models import Min
 from django.forms import formset_factory
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, redirect
+from django.urls import reverse
+
 from main.forms import OrderLineForm, OrderForm, DepositForm
 from main.models import Product, OrderLine, Order, Transaction
 from main.utils import users_format_js, users_with_perm