diff -r 006c5270128c -r 34a75bd8d0b9 src/notes/api/views/sync.py --- a/src/notes/api/views/sync.py Fri Jul 28 18:22:46 2017 +0200 +++ b/src/notes/api/views/sync.py Tue Jul 25 19:11:26 2017 +0200 @@ -1,4 +1,5 @@ import datetime +import logging from auditlog.models import LogEntry from django.utils import timezone @@ -7,6 +8,7 @@ from rest_framework.response import Response from rest_framework.views import APIView +logger = logging.getLogger(__name__) class ListLogsView(APIView): """ @@ -17,17 +19,18 @@ """ permission_classes = (permissions.IsAuthenticated,) - def __filter_object(self, queryset, modified_since): - log_entries = LogEntry.objects.get_for_objects(queryset) + def __filter_object(self, model, user, modified_since): + log_entries = LogEntry.objects.get_for_model(model).filter(actor=user) if modified_since: log_entries = log_entries.filter(timestamp__gte=modified_since) - return log_entries + return log_entries.order_by('timestamp') - def __process_log_entries(self, queryset, modified_since): + def __process_log_entries(self, model, user, modified_since): ''' Process log entries ''' - log_entries = self.__filter_object(queryset, modified_since) + log_entries = self.__filter_object(model, user, modified_since) + logger.debug("LOG ENTRies %r", list(log_entries)) res = {} for log_entry in log_entries: @@ -76,8 +79,8 @@ ) user = request.user - res_sessions = self.__process_log_entries(Session.objects.filter(owner=user), modified_since) - res_notes = self.__process_log_entries(Note.objects.filter(session__owner=user), modified_since) + res_sessions = self.__process_log_entries(Session, user, modified_since) + res_notes = self.__process_log_entries(Note, user, modified_since) return Response({ 'sessions': res_sessions.values(),