Merge branch 'feature/47793_upgrade_django_to_3.2' into 'develop'

[#47793] upgrade django to 3.2

See merge request bevillingsplatform/bevillingsplatform!1176

backend/bevillingsplatform/settings.py

@@ -172,6 +172,8 @@
  }
 }
 
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 
 # Password validation
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators

backend/core/admin.py

@@ -72,7 +72,7 @@ def has_view_permission(self, request, obj=None):
  user = request.user
  return user.is_authenticated and user.is_workflow_engine_or_admin()
 
- def has_add_permission(self, request):
+ def has_add_permission(self, request, obj=None):
  """Override has_add_permission for InlineModelAdmin."""
  user = request.user
  return user.is_authenticated and user.is_workflow_engine_or_admin()

backend/core/apps.py

@@ -17,3 +17,15 @@ class CoreConfig(AppConfig):
  def ready(self):
  """Defer import of signals until ready."""
  import core.signals # noqa
+
+
+class ModifiedConstanceDatabaseConfig(AppConfig):
+ """Modified django-constance AppConfig.
+
+ While we wait for django-constance to provide their
+ own apps.py specifying default_auto_field:
+ https://github.com/jazzband/django-constance/pull/449
+ """
+
+ name = "constance.backends.database"
+ default_auto_field = "django.db.models.AutoField"

backend/core/managers.py

@@ -75,16 +75,22 @@ def paid_date_or_date_lte(self, date):
  def strict_amount_sum(self):
  """Sum over Payments amount."""
  return (
- self.aggregate(amount_sum=Coalesce(Sum("amount"), 0))["amount_sum"]
+ self.aggregate(
+ amount_sum=Coalesce(
+ Sum("amount"), 0, output_field=DecimalField()
+ )
+ )["amount_sum"]
  or 0
  )
 
  def amount_sum(self):
  """Sum over Payments with paid_amount overruling amount."""
  return (
- self.aggregate(amount_sum=Coalesce(Sum(self.amount_case), 0))[
- "amount_sum"
- ]
+ self.aggregate(
+ amount_sum=Coalesce(
+ Sum(self.amount_case), 0, output_field=DecimalField()
+ )
+ )["amount_sum"]
  or 0
  )
 
@@ -454,7 +460,14 @@ def get_duplicate_sbsys_id_appropriations_for_dst(self):
  .exclude(sbsys_common=None)
  .values("sbsys_common")
  .annotate(ids=ArrayAgg("id", distinct=True))
- .annotate(id_count=Func("ids", Value(1), function="array_length"))
+ .annotate(
+ id_count=Func(
+ "ids",
+ Value(1),
+ function="array_length",
+ output_field=IntegerField(),
+ )
+ )
  .filter(id_count__gt=1)
  )
 

backend/core/migrations/0106_auto_20220110_1945.py

@@ -0,0 +1,301 @@
+# Generated by Django 3.2.11 on 2022-01-10 18:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("core", "0105_auto_20211028_1127"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="accountaliasmapping",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="activity",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="activitycategory",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="activitydetails",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="appropriation",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="approvallevel",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="case",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="dstpayload",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="effort",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="effortstep",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="historicalcase",
+ name="id",
+ field=models.BigIntegerField(
+ auto_created=True, blank=True, db_index=True, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="historicalpayment",
+ name="id",
+ field=models.BigIntegerField(
+ auto_created=True, blank=True, db_index=True, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="historicalrateperdate",
+ name="id",
+ field=models.BigIntegerField(
+ auto_created=True, blank=True, db_index=True, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="internalpaymentrecipient",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="municipality",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="payment",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="paymentdateexclusion",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="paymentmethoddetails",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="paymentschedule",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="rateperdate",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="relatedperson",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="schooldistrict",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="section",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="sectioninfo",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="serviceprovider",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="targetgroup",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="team",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="first_name",
+ field=models.CharField(
+ blank=True, max_length=150, verbose_name="first name"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="variablerate",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ]

backend/core/templates/core/admin/accountaliasmapping/change_list.html

@@ -1,5 +1,5 @@
 {% extends "admin/change_list.html" %}
-{% load i18n admin_urls admin_static admin_list %}
+{% load i18n admin_urls static admin_list %}
 
 {% block content %}
  <h1>{% trans "Tilføj Kontoalias fra CSV fil" %}</h1>