Updated item apply_terms to take multiple terms

django/website/data_layer/models.py

@@ -23,7 +23,7 @@ class Message(DataLayerModel):
     terms = models.ManyToManyField(Term, related_name="items")
     network_provider = models.CharField(max_length=200, blank=True)
 
-    def apply_terms(self, term):
+    def apply_terms(self, terms):
         # TODO: test this
         """ Add or replace value of term.taxonomy for current Item
 
@@ -37,10 +37,16 @@ class Message(DataLayerModel):
         # This should really be built out with an explicity through model
         # in taxonomies, with a generic foreign ken to the content type
         # being classified, then this logic could live there.
-        if term.taxonomy.is_optional:
-            self.delete_all_terms(term.taxonomy)
+        if isinstance(terms, Term):
+            terms = [terms]
 
-        self.terms.add(term)
+        if len(terms) == 1:
+            [term] = terms
+
+            if term.taxonomy.is_optional:
+                self.delete_all_terms(term.taxonomy)
+
+        self.terms.add(*terms)
 
     def delete_all_terms(self, taxonomy):
         for term in self.terms.filter(taxonomy=taxonomy):

django/website/data_layer/tests/item_tests.py

@@ -143,4 +143,17 @@ def test_apply_terms_adds_term_for_tags():
     assert list(item.terms.all()) == [term1]
 
     item.apply_terms(term2)
-    assert set(item.terms.all()) == set([term1, term2])
+    assert term1 in item.terms.all()
+    assert term2 in item.terms.all()
+
+
+@pytest.mark.django_db
+def test_apply_terms_adds_multiple_terms():
+    item = ItemFactory()
+    taxonomy = TaxonomyFactory(multiplicity='multiple')
+    term1 = TermFactory(taxonomy=taxonomy)
+    term2 = TermFactory(taxonomy=taxonomy)
+
+    item.apply_terms((term1, term2))
+    assert term1 in item.terms.all()
+    assert term2 in item.terms.all()