Merge pull request #2096 from freedomofpress/handle-500-autocomplete

Adds full_clean step in autocomplete object creation

Author: chigby

common/models/pages.py

@@ -700,7 +700,10 @@ class CommonTag(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_comma(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(
         max_length=255,

common/tests/test_common_tag.py

@@ -26,3 +26,7 @@ def test_tags_incident_count_property(self):
     def test_validation_autocomplete_tag_creation(self):
         with self.assertRaises(ValidationError):
             CommonTag.autocomplete_create('hello,world')
+
+        CommonTag.autocomplete_create('tag')
+        with self.assertRaises(ValidationError):
+            CommonTag.autocomplete_create('tag')

incident/models/items.py

@@ -11,7 +11,10 @@ class Journalist(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(max_length=255, validators=[validate_disallow_AND])
 
@@ -26,7 +29,10 @@ class Institution(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(max_length=255, unique=True, validators=[validate_disallow_AND])
 
@@ -41,7 +47,10 @@ class GovernmentWorker(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(max_length=255, unique=True, validators=[validate_disallow_AND])
 
@@ -57,7 +66,10 @@ class Meta:
 class LawEnforcementOrganization(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(max_length=255, unique=True)
 
@@ -96,7 +108,10 @@ class Charge(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(
         max_length=255,
@@ -115,7 +130,10 @@ class Nationality(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(
         max_length=255,
@@ -135,7 +153,10 @@ class PoliticianOrPublic(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(
         max_length=255,
@@ -155,7 +176,10 @@ class Meta:
 class Venue(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
-        return kls.objects.create(title=value)
+        instance = kls(title=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     title = models.CharField(
         max_length=255,

incident/models/snippets.py

@@ -10,7 +10,10 @@ class Equipment(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
         validate_disallow_AND(value)
-        return kls.objects.create(name=value)
+        instance = kls(name=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     autocomplete_search_field = 'name'
 
@@ -37,7 +40,10 @@ def __str__(self):
 class State(ClusterableModel):
     @classmethod
     def autocomplete_create(kls, value):
-        return kls.objects.create(name=value)
+        instance = kls(name=value)
+        instance.full_clean()
+        instance.save()
+        return instance
 
     autocomplete_search_field = 'name'
 

incident/tests/test_category_field_values.py

@@ -19,8 +19,11 @@
     IncidentPage,
     Institution,
     Journalist,
+    LawEnforcementOrganization,
     Nationality,
     PoliticianOrPublic,
+    State,
+    Venue,
     choices,
 )
 from incident.tests.factories import (
@@ -190,18 +193,37 @@ def assert_boolean(self, field_name, render_function):
             {field_name: '0'},
         )
 
-    def assert_validation(self, model_name):
+    def assert_and_validation(self, model_name):
         with self.assertRaises(ValidationError):
             model_name.autocomplete_create('hello AND world')
 
+    def assert_duplicate_validation(self, model_name):
+        model_name.autocomplete_create('title')
+        with self.assertRaises(ValidationError):
+            model_name.autocomplete_create('title')
+
     def test_validation_autocomplete_field_creation(self):
-        self.assert_validation(Equipment)
-        self.assert_validation(Journalist)
-        self.assert_validation(Institution)
-        self.assert_validation(GovernmentWorker)
-        self.assert_validation(Charge)
-        self.assert_validation(Nationality)
-        self.assert_validation(PoliticianOrPublic)
+        self.assert_and_validation(Equipment)
+        self.assert_and_validation(Journalist)
+        self.assert_and_validation(Institution)
+        self.assert_and_validation(GovernmentWorker)
+        self.assert_and_validation(Charge)
+        self.assert_and_validation(Nationality)
+        self.assert_and_validation(PoliticianOrPublic)
+
+        self.assert_duplicate_validation(Equipment)
+        self.assert_duplicate_validation(State)
+        self.assert_duplicate_validation(Institution)
+        self.assert_duplicate_validation(GovernmentWorker)
+        self.assert_duplicate_validation(LawEnforcementOrganization)
+        self.assert_duplicate_validation(Charge)
+        self.assert_duplicate_validation(Nationality)
+        self.assert_duplicate_validation(PoliticianOrPublic)
+        self.assert_duplicate_validation(Venue)
+
+        # Journalist is not unique, so calling same thing should not raise any error
+        Journalist.autocomplete_create('title')
+        self.assertEqual(Journalist.autocomplete_create('title').title, 'title')
 
     def test_arrest_status(self):
         self.assert_choices(