Entity attribute update (#4205)

* Product attribute entities can be created in bulk, but not updated in bulk

* Added test for delete also

src/oscar/apps/catalogue/abstract_models.py

@@ -968,6 +968,10 @@ class AbstractProductAttribute(models.Model):
     def is_file(self):
         return self.type in [self.FILE, self.IMAGE]
 
+    @property
+    def is_entity(self):
+        return self.type == self.ENTITY
+
     def __str__(self):
         return self.name
 

src/oscar/apps/catalogue/product_attributes.py

@@ -254,6 +254,11 @@ class ProductAttributesContainer:
                         if bound_value_obj is None:
                             to_be_deleted.append(value_obj.pk)
                         else:
+                            if bound_value_obj.attribute.is_entity:
+                                # entities can be bulk_created, but not bulk_saved
+                                bound_value_obj.save()
+                                continue
+
                             if bound_value_obj.attribute.is_file:
                                 # with bulk_create the file is save just fine, but
                                 # with buld_update, it's not, so we have to performa

tests/unit/catalogue/test_product_attributes.py

@@ -6,6 +6,7 @@ from django.test import TestCase
 
 from oscar.core.loading import get_model
 from oscar.test.factories import (
+    PartnerFactory,
     ProductAttributeFactory,
     ProductClassFactory,
     ProductFactory,
@@ -289,6 +290,48 @@ class ProductAttributeTest(TestCase):
         self.assertEqual(html, "<h1>Hi</h1>")
         self.assertTrue(hasattr(html, "__html__"))
 
+    def test_entity_attributes(self):
+        unrelated_object = PartnerFactory()
+        _ = ProductAttributeFactory(
+            type="entity",
+            product_class=self.product_class,
+            name="entity",
+            code="entity",
+        )
+        self.product.attr.entity = unrelated_object
+        self.product.attr.weight = 3
+        self.product.save()
+
+        self.product.refresh_from_db()
+        self.assertEqual(self.product.attr.entity, unrelated_object)
+
+        another_product = ProductFactory(
+            title="Aother",
+            stockrecords=None,
+            product_class=self.product_class,
+            structure="standalone",
+            upc="henk1239",
+        )
+
+        self.product.attr.entity = another_product
+        self.product.attr.weight = 5
+        self.product.save()
+
+        self.product.refresh_from_db()
+        self.assertEqual(self.product.attr.entity, another_product)
+
+        self.product.attr.entity = None
+        self.product.save()
+
+        self.product.refresh_from_db()
+
+        self.assertEqual(self.product.attr.entity, None)
+
+        product = Product.objects.get(pk=self.product.pk)
+        with self.assertRaises(AttributeError):
+            # pylint: disable=pointless-statement
+            product.attr.entity
+
 
 class MultiOptionTest(TestCase):
     fixtures = ["productattributes"]