arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-12-28 02:08:08 +00:00
Code Issues Releases Wiki Activity

Collection erializer: make the item a child instead of trying to merge them.

Browse Source
This commit is contained in:
Tom Hacohen 2020-07-22 11:31:08 +03:00
parent 3d6ba634ce
commit 9c129e5731
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django_etebase/serializers.py
View File

@ -208,15 +208,11 @@ class CollectionSerializer(serializers.ModelSerializer):
accessLevel = serializers.SerializerMethodField('get_access_level_from_context') accessLevel = serializers.SerializerMethodField('get_access_level_from_context')
stoken = serializers.CharField(read_only=True) stoken = serializers.CharField(read_only=True)
uid = serializers.CharField(source='main_item.uid') item = CollectionItemSerializer(many=False, source='main_item')
encryptionKey = BinaryBase64Field(source='main_item.encryptionKey', required=False, default=None, allow_null=True)
etag = serializers.CharField(allow_null=True, write_only=True)
version = serializers.IntegerField(min_value=0, source='main_item.version')
content = CollectionItemRevisionSerializer(many=False, source='main_item.content')
class Meta: class Meta:
model = models.Collection model = models.Collection
fields = ('uid', 'version', 'accessLevel', 'encryptionKey', 'collectionKey', 'content', 'stoken', 'etag') fields = ('item', 'accessLevel', 'collectionKey', 'stoken')
def get_access_level_from_context(self, obj): def get_access_level_from_context(self, obj):
request = self.context.get('request', None) request = self.context.get('request', None)
@ -228,13 +224,9 @@ class CollectionSerializer(serializers.ModelSerializer):
"""Function that's called when this serializer creates an item""" """Function that's called when this serializer creates an item"""
collection_key = validated_data.pop('collectionKey') collection_key = validated_data.pop('collectionKey')
etag = validated_data.pop('etag')
main_item_data = validated_data.pop('main_item') main_item_data = validated_data.pop('main_item')
uid = main_item_data.pop('uid') etag = main_item_data.pop('etag')
version = main_item_data.pop('version')
revision_data = main_item_data.pop('content') revision_data = main_item_data.pop('content')
encryption_key = main_item_data.pop('encryptionKey')
instance = self.__class__.Meta.model(**validated_data) instance = self.__class__.Meta.model(**validated_data)
@ -243,8 +235,7 @@ class CollectionSerializer(serializers.ModelSerializer):
raise serializers.ValidationError('etag is not None') raise serializers.ValidationError('etag is not None')
instance.save() instance.save()
main_item = models.CollectionItem.objects.create( main_item = models.CollectionItem.objects.create(**main_item_data, collection=instance)
uid=uid, encryptionKey=encryption_key, version=version, collection=instance)
instance.main_item = main_item instance.main_item = main_item
instance.save() instance.save()