CollectionItem: implement both update and create.

This commit is contained in:
Tom Hacohen 2020-05-19 13:00:54 +03:00
parent 23dcbc1f9e
commit 4c7e30eca5
2 changed files with 19 additions and 22 deletions

View File

@ -123,27 +123,18 @@ class CollectionItemSerializer(serializers.ModelSerializer):
"""Function that's called when this serializer creates an item""" """Function that's called when this serializer creates an item"""
stoken = validated_data.pop('stoken') stoken = validated_data.pop('stoken')
revision_data = validated_data.pop('content') revision_data = validated_data.pop('content')
instance = self.__class__.Meta.model(**validated_data) uid = validated_data.pop('uid')
Model = self.__class__.Meta.model
with transaction.atomic(): with transaction.atomic():
if stoken is not None: instance, created = Model.objects.get_or_create(uid=uid, defaults=validated_data)
raise serializers.ValidationError('Stoken is not None') cur_stoken = instance.stoken if not created else None
instance.save() if cur_stoken != stoken:
raise serializers.ValidationError('Wrong stoken. Expected {} got {}'.format(cur_stoken, stoken))
process_revisions_for_item(instance, revision_data)
return instance
def update(self, instance, validated_data):
"""Function that's called when this serializer is meant to update an item"""
stoken = validated_data.pop('stoken')
revision_data = validated_data.pop('content')
with transaction.atomic():
if stoken != instance.stoken:
raise serializers.ValidationError('Wrong stoken. Expected {} got {}'.format(instance.stoken, stoken))
if not created:
# We don't have to use select_for_update here because the unique constraint on current guards against # We don't have to use select_for_update here because the unique constraint on current guards against
# the race condition. But it's a good idea because it'll lock and wait rather than fail. # the race condition. But it's a good idea because it'll lock and wait rather than fail.
current_revision = instance.revisions.filter(current=True).select_for_update().first() current_revision = instance.revisions.filter(current=True).select_for_update().first()
@ -154,6 +145,10 @@ class CollectionItemSerializer(serializers.ModelSerializer):
return instance return instance
def update(self, instance, validated_data):
# We never update, we always update in the create method
raise NotImplementedError()
class CollectionItemDepSerializer(serializers.ModelSerializer): class CollectionItemDepSerializer(serializers.ModelSerializer):
stoken = serializers.CharField() stoken = serializers.CharField()

View File

@ -187,8 +187,10 @@ class CollectionItemViewSet(BaseViewSet):
# We can't have destroy because we need to get data from the user (in the body) such as hmac. # We can't have destroy because we need to get data from the user (in the body) such as hmac.
return Response(status=status.HTTP_405_METHOD_NOT_ALLOWED) return Response(status=status.HTTP_405_METHOD_NOT_ALLOWED)
def update(self, request, collection_uid=None, uid=None):
return Response(status=status.HTTP_405_METHOD_NOT_ALLOWED)
def partial_update(self, request, collection_uid=None, uid=None): def partial_update(self, request, collection_uid=None, uid=None):
# FIXME: implement, or should it be implemented elsewhere?
return Response(status=status.HTTP_405_METHOD_NOT_ALLOWED) return Response(status=status.HTTP_405_METHOD_NOT_ALLOWED)
def list(self, request, collection_uid=None): def list(self, request, collection_uid=None):