replace unique uid constraint for unique together with added_by

Author: willemarcel

osmchadjango/supervise/migrations/0015_auto_20181129_1135.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.0.9 on 2018-11-29 11:35
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('supervise', '0014_auto_20180307_1417'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='blacklisteduser',
+            name='uid',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterUniqueTogether(
+            name='blacklisteduser',
+            unique_together={('uid', 'added_by')},
+        ),
+    ]

osmchadjango/supervise/models.py

@@ -53,7 +53,7 @@ class Meta:
 
 class BlacklistedUser(models.Model):
     username = models.CharField(max_length=1000)
-    uid = models.CharField(max_length=255, unique=True)
+    uid = models.CharField(max_length=255)
     added_by = models.ForeignKey(User, on_delete=models.CASCADE)
     date = models.DateTimeField(auto_now_add=True)
 
@@ -65,4 +65,5 @@ def save(self, *args, **kwargs):
         super(BlacklistedUser, self).save(*args, **kwargs)
 
     class Meta:
+        unique_together = ('uid', 'added_by')
         ordering = ['-date']

osmchadjango/supervise/tests/test_models.py

@@ -149,7 +149,8 @@ def test_other_geometry_types(self):
 
 class TestBlacklistedUserModel(TestCase):
     def setUp(self):
-        self.user = UserFactory(is_staff=True)
+        self.user = UserFactory()
+        self.other_user = UserFactory()
         self.blacklisted = BlacklistedUser.objects.create(
             username='Bad User',
             uid='3434',
@@ -187,4 +188,9 @@ def test_validation(self):
             uid='5643',
             added_by=self.user,
             )
-        self.assertEqual(BlacklistedUser.objects.count(), 2)
+        BlacklistedUser.objects.create(
+            username='Bad User',
+            uid='5643',
+            added_by=self.other_user,
+            )
+        self.assertEqual(BlacklistedUser.objects.count(), 3)