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

List APIs: return a done field to indicate the fetch is done.

Browse Source
This commit is contained in:
Tom Hacohen 2020-06-22 13:03:58 +03:00
parent 2d7b90e848
commit 6117cac111
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django_etebase/views.py
View File

@ -122,8 +122,10 @@ class BaseViewSet(viewsets.ModelViewSet):
queryset = queryset[:limit] queryset = queryset[:limit]
queryset, new_stoken = self.get_queryset_stoken(queryset) queryset, new_stoken = self.get_queryset_stoken(queryset)
new_stoken = new_stoken or stoken new_stoken = new_stoken or stoken
# This is not the most efficient way of implementing this, but it's good enough
done = len(queryset) < limit
return queryset, new_stoken return queryset, new_stoken, done
# Change how our list works by default # Change how our list works by default
def list(self, request, collection_uid=None): def list(self, request, collection_uid=None):
@ -193,13 +195,14 @@ class CollectionViewSet(BaseViewSet):
def list(self, request): def list(self, request):
queryset = self.get_queryset() queryset = self.get_queryset()
queryset, new_stoken = self.filter_by_stoken_and_limit(request, queryset) queryset, new_stoken, done = self.filter_by_stoken_and_limit(request, queryset)
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'stoken': new_stoken, 'stoken': new_stoken,
'done': done,
} }
stoken_obj = self.get_stoken_obj(request) stoken_obj = self.get_stoken_obj(request)
@ -256,13 +259,14 @@ class CollectionItemViewSet(BaseViewSet):
def list(self, request, collection_uid=None): def list(self, request, collection_uid=None):
queryset = self.get_queryset() queryset = self.get_queryset()
queryset, new_stoken = self.filter_by_stoken_and_limit(request, queryset) queryset, new_stoken, done = self.filter_by_stoken_and_limit(request, queryset)
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'stoken': new_stoken, 'stoken': new_stoken,
'done': done,
} }
return Response(ret) return Response(ret)
@ -275,6 +279,7 @@ class CollectionItemViewSet(BaseViewSet):
serializer = CollectionItemRevisionSerializer(col_it.revisions.order_by('-id'), many=True) serializer = CollectionItemRevisionSerializer(col_it.revisions.order_by('-id'), many=True)
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'done': True, # we always return all the items, so it's always done
} }
return Response(ret) return Response(ret)
@ -308,6 +313,7 @@ class CollectionItemViewSet(BaseViewSet):
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'stoken': new_stoken, 'stoken': new_stoken,
'done': True, # we always return all the items, so it's always done
} }
return Response(ret) return Response(ret)