Fix django deprecation warnings

timed/employment/models.py

@@ -48,6 +48,7 @@ class PublicHoliday(models.Model):
     name     = models.CharField(max_length=50)
     date     = models.DateField()
     location = models.ForeignKey(Location,
+                                 on_delete=models.CASCADE,
                                  related_name='public_holidays')
 
     def __str__(self):
@@ -132,9 +133,10 @@ class AbsenceCredit(models.Model):
     """
 
     user         = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                     on_delete=models.CASCADE,
                                      related_name='absence_credits')
     comment      = models.CharField(max_length=255, blank=True)
-    absence_type = models.ForeignKey(AbsenceType)
+    absence_type = models.ForeignKey(AbsenceType, on_delete=models.PROTECT)
     date         = models.DateField()
     days         = models.IntegerField(default=0)
     transfer     = models.BooleanField(default=False)
@@ -151,6 +153,7 @@ class OvertimeCredit(models.Model):
     """
 
     user     = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                 on_delete=models.CASCADE,
                                  related_name='overtime_credits')
     comment  = models.CharField(max_length=255, blank=True)
     date     = models.DateField()
@@ -209,8 +212,10 @@ class Employment(models.Model):
     """
 
     user             = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                         on_delete=models.CASCADE,
                                          related_name='employments')
-    location         = models.ForeignKey(Location, related_name='employments')
+    location         = models.ForeignKey(Location, related_name='employments',
+                                         on_delete=models.PROTECT)
     percentage       = models.IntegerField(validators=[
                                            MinValueValidator(0),
                                            MaxValueValidator(100)])

timed/employment/tests/test_absence_balance.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import (AbsenceCreditFactory,

timed/employment/tests/test_absence_credit.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import (AbsenceCreditFactory,

timed/employment/tests/test_absence_type.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import AbsenceTypeFactory

timed/employment/tests/test_employment.py

@@ -3,7 +3,7 @@
 from datetime import date, timedelta
 
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment import factories

timed/employment/tests/test_location.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import LocationFactory

timed/employment/tests/test_overtime_credit.py

@@ -1,6 +1,6 @@
 """Tests for the overtime credits endpoint."""
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import OvertimeCreditFactory, UserFactory

timed/employment/tests/test_public_holiday.py

@@ -1,6 +1,6 @@
 from datetime import date
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import PublicHolidayFactory

timed/employment/tests/test_user.py

@@ -2,7 +2,7 @@
 
 import pytest
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import (AbsenceTypeFactory, EmploymentFactory,

timed/employment/tests/test_worktime_balance.py

@@ -1,7 +1,7 @@
 from datetime import date, timedelta
 
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.duration import duration_string
 from rest_framework import status
 

timed/projects/models.py

@@ -73,6 +73,7 @@ class Project(models.Model):
     archived        = models.BooleanField(default=False)
     estimated_time  = models.DurationField(blank=True, null=True)
     customer        = models.ForeignKey('projects.Customer',
+                                        on_delete=models.CASCADE,
                                         related_name='projects')
     billing_type    = models.ForeignKey(BillingType, on_delete=models.SET_NULL,
                                         blank=True, null=True,
@@ -108,6 +109,7 @@ class Task(models.Model):
     estimated_time  = models.DurationField(blank=True, null=True)
     archived        = models.BooleanField(default=False)
     project         = models.ForeignKey('projects.Project',
+                                        on_delete=models.CASCADE,
                                         related_name='tasks')
     cost_center     = models.ForeignKey(CostCenter, on_delete=models.SET_NULL,
                                         blank=True, null=True,

timed/projects/tests/test_billing_type.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.status import HTTP_200_OK
 
 from timed.projects.factories import BillingTypeFactory

timed/projects/tests/test_cost_center.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.status import HTTP_200_OK
 
 from timed.projects.factories import CostCenterFactory

timed/projects/tests/test_customer.py

@@ -1,6 +1,6 @@
 """Tests for the customers endpoint."""
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.projects.factories import CustomerFactory

timed/projects/tests/test_project.py

@@ -1,7 +1,7 @@
 """Tests for the projects endpoint."""
 from datetime import timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import UserFactory

timed/projects/tests/test_task.py

@@ -1,7 +1,7 @@
 """Tests for the tasks endpoint."""
 from datetime import date, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.projects.factories import TaskFactory

timed/reports/tests/test_customer_statistic.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.tracking.factories import ReportFactory
 

timed/reports/tests/test_month_statistic.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.tracking.factories import ReportFactory
 

timed/reports/tests/test_project_statistic.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.tracking.factories import ReportFactory
 

timed/reports/tests/test_task_statistic.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.projects.factories import TaskFactory
 from timed.tracking.factories import ReportFactory

timed/reports/tests/test_user_statistic.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.tracking.factories import ReportFactory
 

timed/reports/tests/test_work_report.py

@@ -4,7 +4,7 @@
 
 import ezodf
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.status import HTTP_200_OK, HTTP_400_BAD_REQUEST
 
 from timed.projects.factories import (CustomerFactory, ProjectFactory,

timed/reports/tests/test_year_statistic.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from timed.tracking.factories import ReportFactory
 

timed/subscription/models.py

@@ -23,7 +23,7 @@ def __str__(self):
 class Package(models.Model):
     """Representing a subscription package."""
 
-    subscription = models.ForeignKey(Subscription)
+    subscription = models.ForeignKey(Subscription, on_delete=models.CASCADE)
     duration     = models.DurationField()
     price        = MoneyField(max_digits=7, decimal_places=2,
                               default_currency='CHF')
@@ -36,7 +36,8 @@ class SubscriptionProject(models.Model):
     A project can only be assigned to one subscription.
     """
 
-    project = models.OneToOneField('projects.Project')
+    project = models.OneToOneField('projects.Project',
+                                   on_delete=models.CASCADE)
     subscription = models.ForeignKey(Subscription, on_delete=models.CASCADE)
 
 
@@ -63,6 +64,7 @@ class CustomerPassword(models.Model):
     once customer center will go live.
     """
 
-    customer = models.OneToOneField('projects.Customer')
+    customer = models.OneToOneField('projects.Customer',
+                                    on_delete=models.CASCADE)
     password = models.CharField(_('password'), max_length=128,
                                 null=True, blank=True)

timed/tests/client.py

@@ -2,7 +2,7 @@
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import exceptions, status
 from rest_framework.test import APIClient
 from rest_framework_jwt.settings import api_settings

timed/tracking/models.py

@@ -19,8 +19,10 @@ class Activity(models.Model):
     task     = models.ForeignKey('projects.Task',
                                  null=True,
                                  blank=True,
+                                 on_delete=models.SET_NULL,
                                  related_name='activities')
     user     = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                 on_delete=models.CASCADE,
                                  related_name='activities')
 
     @property
@@ -56,6 +58,7 @@ class ActivityBlock(models.Model):
     """
 
     activity      = models.ForeignKey('tracking.Activity',
+                                      on_delete=models.CASCADE,
                                       related_name='blocks')
     from_time = models.TimeField()
     to_time   = models.TimeField(blank=True, null=True)
@@ -77,6 +80,7 @@ class Attendance(models.Model):
     from_time     = models.TimeField()
     to_time       = models.TimeField()
     user          = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                      on_delete=models.CASCADE,
                                       related_name='attendances')
 
     def __str__(self):
@@ -106,13 +110,15 @@ class Report(models.Model):
     duration     = models.DurationField()
     review       = models.BooleanField(default=False)
     not_billable = models.BooleanField(default=False)
-    task         = models.ForeignKey('projects.Task', related_name='reports')
+    task         = models.ForeignKey('projects.Task', related_name='reports',
+                                     on_delete=models.PROTECT)
     activity     = models.ForeignKey(Activity,
                                      null=True,
                                      blank=True,
                                      on_delete=models.SET_NULL,
                                      related_name='reports')
     user         = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                     on_delete=models.PROTECT,
                                      related_name='reports')
     verified_by  = models.ForeignKey(settings.AUTH_USER_MODEL,
                                      on_delete=models.SET_NULL,
@@ -161,7 +167,7 @@ def get_queryset(self):
                 models.Q(end_date__isnull=True)
             ),
             start_date__lte=models.OuterRef('date'),
-            user_id=models.OuterRef(models.OuterRef('user'))
+            user=models.OuterRef(models.OuterRef('user'))
         ).values('location')[:1]
 
         queryset = super().get_queryset()
@@ -183,8 +189,10 @@ class Absence(models.Model):
     comment  = models.TextField(blank=True)
     date     = models.DateField()
     type     = models.ForeignKey('employment.AbsenceType',
-                                 related_name='absences')
+                                 related_name='absences',
+                                 on_delete=models.PROTECT)
     user     = models.ForeignKey(settings.AUTH_USER_MODEL,
+                                 on_delete=models.CASCADE,
                                  related_name='absences')
     objects = AbsenceManager()
 

timed/tracking/tests/test_absence.py

@@ -1,6 +1,6 @@
 import datetime
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.employment.factories import (AbsenceTypeFactory, EmploymentFactory,

timed/tracking/tests/test_activity.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.projects.factories import TaskFactory

timed/tracking/tests/test_activity_block.py

@@ -2,7 +2,7 @@
 
 from datetime import time
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.tracking.factories import ActivityBlockFactory, ActivityFactory

timed/tracking/tests/test_attendance.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from timed.tracking.factories import AttendanceFactory

timed/tracking/tests/test_report.py

@@ -4,7 +4,7 @@
 
 import pyexcel
 import pytest
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.duration import duration_string
 from rest_framework import status