diff --git a/products/serializers.py b/products/serializers.py index d39b689..a1e0832 100644 --- a/products/serializers.py +++ b/products/serializers.py @@ -3,14 +3,14 @@ from rest_framework import serializers from taggit_serializer.serializers import TagListSerializerField, TaggitSerializer from products.models import Product -from utils.tag_serializers import SingleTagSerializerField +from utils.tag_serializers import SingleTagSerializerField, CustomTagSerializer -class ProductSerializer(TaggitSerializer, serializers.ModelSerializer): +class ProductSerializer(CustomTagSerializer, serializers.ModelSerializer): - tags = TagListSerializerField( ) - category = SingleTagSerializerField() # main tag category - attributes = TagListSerializerField() + tags = TagListSerializerField(required=False) + category = SingleTagSerializerField(required=False) # main tag category + attributes = TagListSerializerField(required=False) class Meta: model = Product diff --git a/products/tests.py b/products/tests.py index c8f964e..3f77e89 100644 --- a/products/tests.py +++ b/products/tests.py @@ -116,9 +116,9 @@ class ProductViewSetTest(APITestCase): 'update_date': datetime.datetime.now().isoformat()+'Z', 'discount': '0.05', 'stock': 22, - # tags = models.ManyToMany(Tag, null=True, blank=True ) - # category = models.ForeignKey(Tag, null=true) # main tag category - # attributes = models.ManyToMany(Tag, null=True, blank=True ) + 'tags': ['tag1, tag2'], + # 'category': 'MayorTagCategory', + # 'attributes': ['color/red', 'size/xxl'], 'identifiers': '34rf34f43c43', } @@ -128,6 +128,7 @@ class ProductViewSetTest(APITestCase): # Query endpoint response = self.client.post(self.endpoint, data=data, format='json') + import ipdb; ipdb.set_trace() # Assert endpoint returns created status self.assertEqual(response.status_code, status.HTTP_201_CREATED) @@ -160,9 +161,9 @@ class ProductViewSetTest(APITestCase): 'update_date': datetime.datetime.now().isoformat()+'Z', 'discount': '0.05', 'stock': 22, - # tags = models.ManyToMany(Tag, null=True, blank=True ) - # category = models.ForeignKey(Tag, null=true) # main tag category - # attributes = models.ManyToMany(Tag, null=True, blank=True ) + 'tags': ['tag1x, tag2x'], + 'category': 'MayorTagCategory2', + 'attributes': ['color/blue', 'size/m'], 'identifiers': '34rf34f43c43', } diff --git a/utils/tag_serializers.py b/utils/tag_serializers.py index b5893a6..49dca92 100644 --- a/utils/tag_serializers.py +++ b/utils/tag_serializers.py @@ -1,5 +1,6 @@ from rest_framework import serializers +from taggit_serializer.serializers import TagListSerializerField, TaggitSerializer class SingleTag(str): @@ -37,3 +38,40 @@ class SingleTagSerializerField(serializers.Field): value = value.name value = SingleTag(value) return value + + +class CustomTagSerializer(serializers.Serializer): + + def create(self, validated_data): + to_be_tagged, validated_data = self._pop_tags(validated_data) + + tag_object = super(CustomTagSerializer, self).create(validated_data) + + return self._save_tags(tag_object, to_be_tagged) + + def update(self, instance, validated_data): + to_be_tagged, validated_data = self._pop_tags(validated_data) + + tag_object = super(CustomTagSerializer, self).update( + instance, validated_data) + + return self._save_tags(tag_object, to_be_tagged) + + def _save_tags(self, tag_object, tags): + for key in tags.keys(): + tag_values = tags.get(key) + getattr(tag_object, key).set(*tag_values) + + return tag_object + + def _pop_tags(self, validated_data): + to_be_tagged = {} + import ipdb; ipdb.set_trace() + for key in self.fields.keys(): + field = self.fields[key] + if isinstance(field, TagListSerializerField): + if key in validated_data: + to_be_tagged[key] = validated_data.pop(key) + + return (to_be_tagged, validated_data) +