Rebuild product attribute entities

Product attributes had a mechanism to point at related model instances
in a generic way, but nobody managed to understand or get it working.
This comment removes that logic, including the AttributeEntity and
AttributeEntityType models.

Instead, this commit models the relation via a generic foreign key on
ProductAttributeValue.

I don't think there's a good default behaviour for the entity selection
as presumably each deployment will want to limit the selection in some
way. Therefore, there's currently no frontend support for it.

variants.json has been rebuilt by executing the migration and dumping
the correct data afterwards. That explains the other changes in it, as
usually we'd just use vim line matching to shape it into a form that
lets us build the sandbox.

docs/source/releases/v0.8.rst

@@ -319,6 +319,12 @@ Misc
   trivial ``ProductAttribute.get_validator`` and the unused
   ``ProductAttribute.is_value_valid`` methods have been removed.
 
+* It is now possible to use product attributes to add a relation to arbitrary
+  model instances. There was some (presumably broken) support for it before,
+  but you should now be able to use product attributes of type ``entity`` as
+  expected. There's currently no frontend or dashboard support for it, as there
+  is no good default behaviour.
+
 .. _rewritten: https://github.com/tangentlabs/django-oscar/commit/d8b4dbfed17be90846ea4bc47b5f7b39ad944c24
 
 Basket line stockrecords

oscar/apps/catalogue/abstract_models.py

@@ -16,6 +16,8 @@ from django.db import models
 from django.db.models import Sum, Count
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.functional import cached_property
+from django.contrib.contenttypes.generic import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 
 from treebeard.mp_tree import MP_Node
 
@@ -620,10 +622,6 @@ class AbstractProductAttribute(models.Model):
         'catalogue.AttributeOptionGroup', blank=True, null=True,
         verbose_name=_("Option Group"),
         help_text=_('Select an option group if using type "Option"'))
-    entity_type = models.ForeignKey(
-        'catalogue.AttributeEntityType', blank=True, null=True,
-        verbose_name=_("Entity Type"),
-        help_text=_('Select an entity type if using type "Entity"'))
     required = models.BooleanField(_('Required'), default=False)
 
     class Meta:
@@ -666,14 +664,9 @@ class AbstractProductAttribute(models.Model):
             raise ValidationError(_("Must be a boolean"))
 
     def _validate_entity(self, value):
-        if not isinstance(value, get_model('catalogue', 'AttributeEntity')):
-            raise ValidationError(
-                _("Must be an AttributeEntity model object instance"))
-        if not value.pk:
-            raise ValidationError(_("Model has not been saved yet"))
-        if value.type != self.entity_type:
-            raise ValidationError(
-                _("Entity must be of type %s" % self.entity_type.name))
+        # This feels rather naive
+        if not isinstance(value, models.Model):
+            raise ValidationError(_("Must be a model instance"))
 
     def _validate_option(self, value):
         if not isinstance(value, get_model('catalogue', 'AttributeOption')):
@@ -743,8 +736,8 @@ class AbstractProductAttributeValue(models.Model):
 
     For example: number_of_pages = 295
     """
-    attribute = models.ForeignKey('catalogue.ProductAttribute',
-                                  verbose_name=_("Attribute"))
+    attribute = models.ForeignKey(
+        'catalogue.ProductAttribute', verbose_name=_("Attribute"))
     product = models.ForeignKey(
         'catalogue.Product', related_name='attribute_values',
         verbose_name=_("Product"))
@@ -758,15 +751,18 @@ class AbstractProductAttributeValue(models.Model):
     value_option = models.ForeignKey(
         'catalogue.AttributeOption', blank=True, null=True,
         verbose_name=_("Value Option"))
-    value_entity = models.ForeignKey(
-        'catalogue.AttributeEntity', blank=True, null=True,
-        verbose_name=_("Value Entity"))
     value_file = models.FileField(
         upload_to=settings.OSCAR_IMAGE_FOLDER, max_length=255,
         blank=True, null=True)
     value_image = models.ImageField(
         upload_to=settings.OSCAR_IMAGE_FOLDER, max_length=255,
         blank=True, null=True)
+    value_entity = GenericForeignKey(
+        'entity_content_type', 'entity_object_id')
+    entity_content_type = models.ForeignKey(
+        ContentType, null=True, blank=True, editable=False)
+    entity_object_id = models.PositiveIntegerField(
+        null=True, blank=True, editable=False)
 
     def _get_value(self):
         return getattr(self, 'value_%s' % self.attribute.type)
@@ -810,6 +806,14 @@ class AbstractProductAttributeValue(models.Model):
     def _richtext_as_text(self):
         return strip_tags(self.value)
 
+    @property
+    def _entity_as_text(self):
+        """
+        Returns the unicode representation of the related model. You likely
+        want to customise this (and maybe _entity_as_html) if you use entities.
+        """
+        return unicode(self.value)
+
     @property
     def value_as_html(self):
         """
@@ -868,53 +872,6 @@ class AbstractAttributeOption(models.Model):
         verbose_name_plural = _('Attribute Options')
 
 
-class AbstractAttributeEntity(models.Model):
-    """
-    Provides an attribute type to enable relationships with other models
-    """
-    name = models.CharField(_("Name"), max_length=255)
-    slug = models.SlugField(
-        _("Slug"), max_length=255, unique=False, blank=True)
-    type = models.ForeignKey(
-        'catalogue.AttributeEntityType', related_name='entities',
-        verbose_name=_("Type"))
-
-    def __unicode__(self):
-        return self.name
-
-    class Meta:
-        abstract = True
-        verbose_name = _('Attribute Entity')
-        verbose_name_plural = _('Attribute Entities')
-
-    def save(self, *args, **kwargs):
-        if not self.slug:
-            self.slug = slugify(self.name)
-        super(AbstractAttributeEntity, self).save(*args, **kwargs)
-
-
-class AbstractAttributeEntityType(models.Model):
-    """
-    Provides the name of the model involved in an entity relationship
-    """
-    name = models.CharField(_("Name"), max_length=255)
-    slug = models.SlugField(
-        _("Slug"), max_length=255, unique=False, blank=True)
-
-    def __unicode__(self):
-        return self.name
-
-    class Meta:
-        abstract = True
-        verbose_name = _('Attribute Entity Type')
-        verbose_name_plural = _('Attribute Entity Types')
-
-    def save(self, *args, **kwargs):
-        if not self.slug:
-            self.slug = slugify(self.name)
-        super(AbstractAttributeEntityType, self).save(*args, **kwargs)
-
-
 class AbstractOption(models.Model):
     """
     An option that can be selected for a particular item when the product

oscar/apps/catalogue/admin.py

@@ -2,8 +2,6 @@ from django.contrib import admin
 from oscar.core.loading import get_model
 from treebeard.admin import TreeAdmin
 
-AttributeEntity = get_model('catalogue', 'AttributeEntity')
-AttributeEntityType = get_model('catalogue', 'AttributeEntityType')
 AttributeOption = get_model('catalogue', 'AttributeOption')
 AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
 Category = get_model('catalogue', 'Category')
@@ -71,10 +69,6 @@ class AttributeOptionGroupAdmin(admin.ModelAdmin):
     inlines = [AttributeOptionInline, ]
 
 
-class AttributeEntityAdmin(admin.ModelAdmin):
-    list_display = ('name', )
-
-
 class CategoryAdmin(TreeAdmin):
     pass
 
@@ -84,8 +78,6 @@ admin.site.register(Product, ProductAdmin)
 admin.site.register(ProductAttribute, ProductAttributeAdmin)
 admin.site.register(ProductAttributeValue, ProductAttributeValueAdmin)
 admin.site.register(AttributeOptionGroup, AttributeOptionGroupAdmin)
-admin.site.register(AttributeEntity, AttributeEntityAdmin)
-admin.site.register(AttributeEntityType)
 admin.site.register(Option, OptionAdmin)
 admin.site.register(ProductImage)
 admin.site.register(Category, CategoryAdmin)

oscar/apps/catalogue/migrations/0024_auto__del_attributeentity__del_attributeentitytype__del_field_producta.py

@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'AttributeEntity'
+        db.delete_table(u'catalogue_attributeentity')
+
+        # Deleting model 'AttributeEntityType'
+        db.delete_table(u'catalogue_attributeentitytype')
+
+        # Deleting field 'ProductAttributeValue.value_entity'
+        db.delete_column(u'catalogue_productattributevalue', 'value_entity_id')
+
+        # Adding field 'ProductAttributeValue.entity_content_type'
+        db.add_column(u'catalogue_productattributevalue', 'entity_content_type',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'], null=True, blank=True),
+                      keep_default=False)
+
+        # Adding field 'ProductAttributeValue.entity_object_id'
+        db.add_column(u'catalogue_productattributevalue', 'entity_object_id',
+                      self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'ProductAttribute.entity_type'
+        db.delete_column(u'catalogue_productattribute', 'entity_type_id')
+
+
+    def backwards(self, orm):
+        # Adding model 'AttributeEntity'
+        db.create_table(u'catalogue_attributeentity', (
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, blank=True)),
+            ('type', self.gf('django.db.models.fields.related.ForeignKey')(related_name='entities', to=orm['catalogue.AttributeEntityType'])),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal(u'catalogue', ['AttributeEntity'])
+
+        # Adding model 'AttributeEntityType'
+        db.create_table(u'catalogue_attributeentitytype', (
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=255, blank=True)),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal(u'catalogue', ['AttributeEntityType'])
+
+        # Adding field 'ProductAttributeValue.value_entity'
+        db.add_column(u'catalogue_productattributevalue', 'value_entity',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntity'], null=True, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'ProductAttributeValue.entity_content_type'
+        db.delete_column(u'catalogue_productattributevalue', 'entity_content_type_id')
+
+        # Deleting field 'ProductAttributeValue.entity_object_id'
+        db.delete_column(u'catalogue_productattributevalue', 'entity_object_id')
+
+        # Adding field 'ProductAttribute.entity_type'
+        db.add_column(u'catalogue_productattribute', 'entity_type',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.AttributeEntityType'], null=True, blank=True),
+                      keep_default=False)
+
+
+    models = {
+        u'catalogue.attributeoption': {
+            'Meta': {'object_name': 'AttributeOption'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'options'", 'to': u"orm['catalogue.AttributeOptionGroup']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'option': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'catalogue.attributeoptiongroup': {
+            'Meta': {'object_name': 'AttributeOptionGroup'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        u'catalogue.category': {
+            'Meta': {'ordering': "['full_name']", 'object_name': 'Category'},
+            'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'})
+        },
+        u'catalogue.option': {
+            'Meta': {'object_name': 'Option'},
+            'code': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'Required'", 'max_length': '128'})
+        },
+        u'catalogue.product': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Product'},
+            'attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.ProductAttribute']", 'through': u"orm['catalogue.ProductAttributeValue']", 'symmetrical': 'False'}),
+            'categories': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Category']", 'through': u"orm['catalogue.ProductCategory']", 'symmetrical': 'False'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_discountable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'variants'", 'null': 'True', 'to': u"orm['catalogue.Product']"}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'products'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': u"orm['catalogue.ProductClass']"}),
+            'product_options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'rating': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'recommended_products': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Product']", 'symmetrical': 'False', 'through': u"orm['catalogue.ProductRecommendation']", 'blank': 'True'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'upc': ('oscar.models.fields.NullCharField', [], {'max_length': '64', 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        u'catalogue.productattribute': {
+            'Meta': {'ordering': "['code']", 'object_name': 'ProductAttribute'},
+            'code': ('django.db.models.fields.SlugField', [], {'max_length': '128'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'option_group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOptionGroup']", 'null': 'True', 'blank': 'True'}),
+            'product_class': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attributes'", 'null': 'True', 'to': u"orm['catalogue.ProductClass']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'text'", 'max_length': '20'})
+        },
+        u'catalogue.productattributevalue': {
+            'Meta': {'unique_together': "(('attribute', 'product'),)", 'object_name': 'ProductAttributeValue'},
+            'attribute': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.ProductAttribute']"}),
+            'entity_content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}),
+            'entity_object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_values'", 'to': u"orm['catalogue.Product']"}),
+            'value_boolean': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'value_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'value_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'value_float': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'value_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'value_integer': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'value_option': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.AttributeOption']", 'null': 'True', 'blank': 'True'}),
+            'value_richtext': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        u'catalogue.productcategory': {
+            'Meta': {'ordering': "['product', 'category']", 'unique_together': "(('product', 'category'),)", 'object_name': 'ProductCategory'},
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Category']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
+        },
+        u'catalogue.productclass': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ProductClass'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'options': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['catalogue.Option']", 'symmetrical': 'False', 'blank': 'True'}),
+            'requires_shipping': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'slug': ('oscar.models.fields.autoslugfield.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '128', 'separator': "u'-'", 'blank': 'True', 'unique': 'True', 'populate_from': "'name'", 'overwrite': 'False'}),
+            'track_stock': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        u'catalogue.productimage': {
+            'Meta': {'ordering': "['display_order']", 'unique_together': "(('product', 'display_order'),)", 'object_name': 'ProductImage'},
+            'caption': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'display_order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'original': ('django.db.models.fields.files.ImageField', [], {'max_length': '255'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'images'", 'to': u"orm['catalogue.Product']"})
+        },
+        u'catalogue.productrecommendation': {
+            'Meta': {'ordering': "['primary', '-ranking']", 'unique_together': "(('primary', 'recommendation'),)", 'object_name': 'ProductRecommendation'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'primary_recommendations'", 'to': u"orm['catalogue.Product']"}),
+            'ranking': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}),
+            'recommendation': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['catalogue.Product']"})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['catalogue']

oscar/apps/catalogue/models.py

@@ -40,14 +40,6 @@ class AttributeOption(AbstractAttributeOption):
     pass
 
 
-class AttributeEntity(AbstractAttributeEntity):
-    pass
-
-
-class AttributeEntityType(AbstractAttributeEntityType):
-    pass
-
-
 class Option(AbstractOption):
     pass
 

oscar/apps/dashboard/catalogue/forms.py

@@ -224,10 +224,11 @@ def _attr_multi_option_field(attribute):
 
 
 def _attr_entity_field(attribute):
-    return forms.ModelChoiceField(
-        label=attribute.name,
-        required=attribute.required,
-        queryset=attribute.entity_type.entities.all())
+    # Product entities don't have out-of-the-box supported in the ProductForm.
+    # There is no ModelChoiceField for generic foreign keys, and there's no
+    # good default behaviour anyway; offering a choice of *all* model instances
+    # is hardly useful.
+    return None
 
 
 def _attr_numeric_field(attribute):
@@ -329,11 +330,12 @@ class ProductForm(forms.ModelForm):
 
     def add_attribute_fields(self, is_parent=False):
         for attribute in self.instance.product_class.attributes.all():
-            self.fields['attr_%s' % attribute.code] \
-                = self.get_attribute_field(attribute)
-            # Attributes are not required for a parent product
-            if is_parent:
-                self.fields['attr_%s' % attribute.code].required = False
+            field = self.get_attribute_field(attribute)
+            if field:
+                self.fields['attr_%s' % attribute.code] = field
+                # Attributes are not required for a parent product
+                if is_parent:
+                    self.fields['attr_%s' % attribute.code].required = False
 
     def get_attribute_field(self, attribute):
         return self.FIELD_FACTORIES[attribute.type](attribute)

oscar/test/newfactories.py

@@ -26,7 +26,7 @@ __all__ = ["UserFactory", "CountryFactory", "UserAddressFactory",
            "BasketFactory", "VoucherFactory", "ProductFactory",
            "StockRecordFactory", "ProductAttributeFactory",
            "ProductAttributeValueFactory", "AttributeOptionGroupFactory",
-           "AttributeOptionFactory"]
+           "AttributeOptionFactory", "PartnerFactory"]
 
 
 class UserFactory(factory.DjangoModelFactory):

sites/sandbox/fixtures/variants.json

@@ -57,7 +57,7 @@
         "parent": null, 
         "title": "Oscar T-shirt", 
         "date_updated": "2013-12-12T16:33:57.426Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-12T16:33:57.426Z", 
         "product_options": [], 
@@ -74,7 +74,7 @@
         "parent": 1, 
         "title": "", 
         "date_updated": "2013-12-12T16:34:14.023Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-12T16:34:14.023Z", 
         "product_options": [], 
@@ -91,7 +91,7 @@
         "parent": 1, 
         "title": "", 
         "date_updated": "2013-12-12T16:34:32.170Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-12T16:34:32.170Z", 
         "product_options": [], 
@@ -108,7 +108,7 @@
         "parent": 1, 
         "title": "", 
         "date_updated": "2013-12-12T17:32:15.016Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-12T17:32:15.016Z", 
         "product_options": [], 
@@ -125,7 +125,7 @@
         "parent": null, 
         "title": "commandlinefu T-shirt", 
         "date_updated": "2013-12-13T11:34:21.810Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:34:21.810Z", 
         "product_options": [], 
@@ -142,7 +142,7 @@
         "parent": 5, 
         "title": "", 
         "date_updated": "2013-12-13T11:37:08.138Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:37:08.138Z", 
         "product_options": [], 
@@ -159,7 +159,7 @@
         "parent": 5, 
         "title": "", 
         "date_updated": "2013-12-13T11:37:45.834Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:37:45.834Z", 
         "product_options": [], 
@@ -176,7 +176,7 @@
         "parent": null, 
         "title": "Tangent T-shirt", 
         "date_updated": "2013-12-13T11:38:15.107Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:38:15.107Z", 
         "product_options": [], 
@@ -193,7 +193,7 @@
         "parent": 8, 
         "title": "", 
         "date_updated": "2013-12-13T11:38:49.769Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:38:49.769Z", 
         "product_options": [], 
@@ -210,7 +210,7 @@
         "parent": 8, 
         "title": "", 
         "date_updated": "2013-12-13T11:39:12.859Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:39:12.859Z", 
         "product_options": [], 
@@ -227,7 +227,7 @@
         "parent": 8, 
         "title": "", 
         "date_updated": "2013-12-13T11:39:53.073Z", 
-        "upc": null, 
+        "upc": "", 
         "is_discountable": true, 
         "date_created": "2013-12-13T11:39:53.073Z", 
         "product_options": [], 
@@ -239,11 +239,10 @@
     "pk": 1, 
     "model": "catalogue.productattribute", 
     "fields": {
-        "code": "size", 
+        "required": true, 
         "product_class": 1, 
-        "entity_type": null, 
         "option_group": 1, 
-        "required": true, 
+        "code": "size", 
         "type": "option", 
         "name": "Size"
     }
@@ -256,12 +255,15 @@
         "value_integer": null, 
         "product": 2, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 1, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -272,12 +274,15 @@
         "value_integer": null, 
         "product": 3, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 2, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -288,12 +293,15 @@
         "value_integer": null, 
         "product": 4, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 3, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -304,12 +312,15 @@
         "value_integer": null, 
         "product": 6, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 1, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -320,12 +331,15 @@
         "value_integer": null, 
         "product": 7, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 2, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -336,12 +350,15 @@
         "value_integer": null, 
         "product": 9, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 1, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -352,12 +369,15 @@
         "value_integer": null, 
         "product": 10, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 2, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {
@@ -368,12 +388,15 @@
         "value_integer": null, 
         "product": 11, 
         "value_float": null, 
+        "entity_content_type": null, 
         "value_text": null, 
         "attribute": 1, 
         "value_richtext": null, 
-        "value_entity": null, 
+        "entity_object_id": null, 
+        "value_image": "", 
         "value_option": 3, 
-        "value_boolean": null
+        "value_boolean": null, 
+        "value_file": ""
     }
 },
 {

tests/integration/catalogue/product_tests.py

@@ -5,7 +5,6 @@ from django.core.exceptions import ValidationError
 
 from oscar.apps.catalogue.models import (Product, ProductClass,
                                          ProductAttribute,
-                                         AttributeOptionGroup,
                                          AttributeOption)
 from oscar.test import factories
 
@@ -127,3 +126,12 @@ class ProductAttributeCreationTests(TestCase):
         invalid_option = AttributeOption(option='invalid option')
         self.assertRaises(
             ValidationError, pa.validate_value, invalid_option)
+
+    def test_entity_attributes(self):
+        unrelated_object = factories.PartnerFactory()
+        attribute = factories.ProductAttributeFactory(type='entity')
+
+        attribute_value = factories.ProductAttributeValueFactory(
+            attribute=attribute, value_entity=unrelated_object)
+
+        self.assertEqual(attribute_value.value, unrelated_object)