Added multiplicity field to Taxonomy

django/website/taxonomies/migrations/0003_taxonomy_multiplicity.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taxonomies', '0002_auto_20150716_2018'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='taxonomy',
+            name='multiplicity',
+            field=models.CharField(default=b'optional', max_length=30, choices=[(b'optional', 'Zero or One'), (b'multiple', 'Zero or More')]),
+        ),
+    ]

django/website/taxonomies/models.py

@@ -26,21 +26,22 @@ class Taxonomy(models.Model):
 
     @property
     def is_optional(self):
-        #  return self.multiplicity == self.OPTIONAL
-        return True
+        return self.multiplicity == 'optional'
 
     def __unicode__(self):
         return self.name
 
+    multiplicity = models.CharField(
+        choices=(
+            ('optional', _('Zero or One')),
+            ('multiple', _('Zero or More')),
+        ),
+        default='optional',
+        max_length=30,
+    )
+
     # My thoughts on how this grows...
     #
-    # multiplicity = models.CharField(
-    #   ...
-    #   choices=(
-    #     ('optional', _('Zero or One')),
-    #     ('multiple', _('Zero or More')),
-    #   )
-    # )
     #
     # vocabulary = models.CharField(
     #   ...

django/website/taxonomies/tests/taxonomy_tests.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals, absolute_import
 import pytest
 
 from ..models import Taxonomy
-
+from .factories import TaxonomyFactory
 
 @pytest.mark.django_db
 def test_taxonomies_have_a_slug():
@@ -36,3 +36,17 @@ def test_taxonomies_cannot_have_colon_in_slug():
     taxonomy2.save()
 
     assert ':' not in taxonomy2.slug
+
+
+@pytest.mark.django_db
+def test_is_optional_true_for_multiplicity_optional():
+    taxonomy = TaxonomyFactory(multiplicity='optional')
+
+    assert taxonomy.is_optional
+
+
+@pytest.mark.django_db
+def test_is_optional_false_for_multiplicity_multiple():
+    taxonomy = TaxonomyFactory(multiplicity='multiple')
+
+    assert not taxonomy.is_optional