Refactor query code into customizable class

helpdesk/views/staff.py

@@ -27,18 +27,14 @@ from django.utils import timezone
 from django.views.generic.edit import FormView, UpdateView
 
 from helpdesk.query import (
+    get_query_class,
     query_to_dict,
-    get_query,
-    apply_query,
-    query_tickets_by_args,
     query_to_base64,
     query_from_base64,
 )
 
 from helpdesk.user import HelpdeskUser
 
-from helpdesk.serializers import DatatablesTicketSerializer
-
 from helpdesk.decorators import (
     helpdesk_staff_member_required, helpdesk_superuser_required,
     is_helpdesk_staff
@@ -71,6 +67,7 @@ import re
 
 
 User = get_user_model()
+Query = get_query_class()
 
 if helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE:
     # treat 'normal' users like 'staff'
@@ -896,7 +893,7 @@ def ticket_list(request):
 
     urlsafe_query = query_to_base64(query_params)
 
-    get_query(urlsafe_query, huser)
+    Query(huser, base64query=urlsafe_query).refresh_query()
 
     user_saved_queries = SavedSearch.objects.filter(Q(user=request.user) | Q(shared__exact=True))
 
@@ -964,55 +961,16 @@ def datatables_ticket_list(request, query):
     on the table. query_tickets_by_args is at lib.py, DatatablesTicketSerializer is in
     serializers.py. The serializers and this view use django-rest_framework methods
     """
-    objects = get_query(query, HelpdeskUser(request.user))
-    model_object = query_tickets_by_args(objects, '-date_created', **request.query_params)
-    serializer = DatatablesTicketSerializer(model_object['items'], many=True)
-    result = dict()
-    result['data'] = serializer.data
-    result['draw'] = model_object['draw']
-    result['recordsTotal'] = model_object['total']
-    result['recordsFiltered'] = model_object['count']
+    query = Query(HelpdeskUser(request.user), base64query=query)
+    result = query.get_datatables_context(**request.query_params)
     return (JsonResponse(result, status=status.HTTP_200_OK))
 
 
 @helpdesk_staff_member_required
 @api_view(['GET'])
 def timeline_ticket_list(request, query):
-    """
-    Datatable on ticket_list.html uses this view from to get objects to display
-    on the table. query_tickets_by_args is at lib.py, DatatablesTicketSerializer is in
-    serializers.py. The serializers and this view use django-rest_framework methods
-    """
-    tickets = get_query(query, HelpdeskUser(request.user))
-    events = []
-
-    def mk_timeline_date(date):
-        return {
-            'year': date.year,
-            'month': date.month,
-            'day': date.day,
-            'hour': date.hour,
-            'minute': date.minute,
-            'second': date.second,
-            'second': date.second,
-        }
-    for ticket in tickets:
-        for followup in ticket.followup_set.all():
-            event = {
-                'start_date': mk_timeline_date(followup.date),
-                'text': {
-                    'headline': ticket.title + '<br/>' + followup.title,
-                    'text': (followup.comment if followup.comment else _('No text')) + '<br/> <a href="%s" class="btn" role="button">%s</a>' %
-                    (reverse('helpdesk:view', kwargs={'ticket_id': ticket.pk}), _("View ticket")),
-                },
-                'group': _('Messages'),
-            }
-            events.append(event)
-
-    result = {
-        'events': events,
-    }
-    return (JsonResponse(result, status=status.HTTP_200_OK))
+    query = Query(HelpdeskUser(request.user), base64query=query)
+    return (JsonResponse(query.get_timeline_context(), status=status.HTTP_200_OK))
 
 
 @helpdesk_staff_member_required