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

Bulk_get: implement stoken, limit and inline

Browse Source
This commit is contained in:
Tom Hacohen 2020-04-16 17:12:51 +03:00
parent 19b93265d7
commit d134934f8c
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
django_etesync/views.py
View File

@ -164,18 +164,14 @@ class CollectionItemViewSet(BaseViewSet):
def list(self, request, collection_uid=None): def list(self, request, collection_uid=None):
stoken = request.GET.get('stoken', None) stoken = request.GET.get('stoken', None)
limit = int(request.GET.get('limit', 50))
queryset = self.get_queryset() queryset = self.get_queryset()
queryset = self.filter_by_stoken_and_limit(request, queryset)
if stoken is not None:
last_rev = get_object_or_404(CollectionItemRevision.objects.all(), uid=stoken)
queryset = queryset.filter(revisions__id__gt=last_rev.id)
queryset = queryset[:limit]
serializer = self.serializer_class(queryset, context=self.get_serializer_context(), many=True) serializer = self.serializer_class(queryset, context=self.get_serializer_context(), many=True)
queryset = self.filter_by_stoken_and_limit(request, queryset)
new_stoken = serializer.data[-1]['content']['uid'] if len(serializer.data) > 0 else stoken new_stoken = serializer.data[-1]['content']['uid'] if len(serializer.data) > 0 else stoken
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
@ -193,13 +189,31 @@ class CollectionItemViewSet(BaseViewSet):
@action_decorator(detail=False, methods=['POST']) @action_decorator(detail=False, methods=['POST'])
def bulk_get(self, request, collection_uid=None): def bulk_get(self, request, collection_uid=None):
stoken = request.GET.get('stoken', None)
queryset = self.get_queryset() queryset = self.get_queryset()
if isinstance(request.data, list): if isinstance(request.data, list):
queryset = queryset.filter(uid__in=request.data) queryset = queryset.filter(uid__in=request.data)
serializer = self.get_serializer_class()(queryset, many=True) queryset = self.filter_by_stoken_and_limit(request, queryset)
return Response(serializer.data, status=status.HTTP_200_OK)
serializer = self.get_serializer_class()(queryset, context=self.get_serializer_context(), many=True)
new_stoken = serializer.data[-1]['content']['uid'] if len(serializer.data) > 0 else stoken
ret = {
'data': serializer.data,
}
return Response(ret, headers={'X-EteSync-SToken': new_stoken})
def filter_by_stoken_and_limit(self, request, queryset):
stoken = request.GET.get('stoken', None)
limit = int(request.GET.get('limit', 50))
if stoken is not None:
last_rev = get_object_or_404(CollectionItemRevision.objects.all(), uid=stoken)
queryset = queryset.filter(revisions__id__gt=last_rev.id)
return queryset[:limit]
class CollectionItemChunkViewSet(viewsets.ViewSet): class CollectionItemChunkViewSet(viewsets.ViewSet):