PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Transaction: make it possible to pass a global stoken to block by.

Browse Source
This commit is contained in:
Tom Hacohen 2020-05-19 14:54:44 +03:00
parent eeaea6e6ab
commit ae4aafcf96
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django_etesync/views.py
View File

@ -70,16 +70,27 @@ class BaseViewSet(viewsets.ModelViewSet):
user = self.request.user user = self.request.user
return queryset.filter(members__user=user) return queryset.filter(members__user=user)
def filter_by_stoken_and_limit(self, request, queryset): def get_stoken_rev(self, request):
stoken = request.GET.get('stoken', None) stoken = request.GET.get('stoken', None)
if stoken is not None:
return get_object_or_404(CollectionItemRevision.objects.all(), uid=stoken)
return None
def filter_by_stoken_and_limit(self, request, queryset):
limit = int(request.GET.get('limit', 50)) limit = int(request.GET.get('limit', 50))
stoken_id_field = self.stoken_id_field + '__id' stoken_id_field = self.stoken_id_field + '__id'
if stoken is not None: stoken_rev = self.get_stoken_rev(request)
last_rev = get_object_or_404(CollectionItemRevision.objects.all(), uid=stoken) if stoken_rev is not None:
last_rev = get_object_or_404(CollectionItemRevision.objects.all(), uid=stoken_rev.uid)
filter_by = {stoken_id_field + '__gt': last_rev.id} filter_by = {stoken_id_field + '__gt': last_rev.id}
queryset = queryset.filter(**filter_by) queryset = queryset.filter(**filter_by)
stoken = stoken_rev.uid
else:
stoken = None
new_stoken_id = queryset.aggregate(stoken_id=Max(stoken_id_field))['stoken_id'] new_stoken_id = queryset.aggregate(stoken_id=Max(stoken_id_field))['stoken_id']
new_stoken = CollectionItemRevision.objects.get(id=new_stoken_id).uid if new_stoken_id is not None else stoken new_stoken = CollectionItemRevision.objects.get(id=new_stoken_id).uid if new_stoken_id is not None else stoken
@ -239,8 +250,13 @@ class CollectionItemViewSet(BaseViewSet):
@action_decorator(detail=False, methods=['POST']) @action_decorator(detail=False, methods=['POST'])
def transaction(self, request, collection_uid=None): def transaction(self, request, collection_uid=None):
stoken = request.GET.get('stoken', None)
collection_object = get_object_or_404(self.get_collection_queryset(Collection.objects), uid=collection_uid) collection_object = get_object_or_404(self.get_collection_queryset(Collection.objects), uid=collection_uid)
if stoken is not None and stoken != collection_object.stoken:
content = {'code': 'stale_stoken', 'detail': 'Stoken is too old'}
return Response(content, status=status.HTTP_400_BAD_REQUEST)
items = request.data.get('items') items = request.data.get('items')
deps = request.data.get('deps', None) deps = request.data.get('deps', None)
# FIXME: It should just be one serializer # FIXME: It should just be one serializer