corbz/ticket-website
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

jones-dev #19

Merged
corbz merged 106 commits from jones-dev into master 2024-01-26 17:39:03 +00:00
Conversation 0 Commits 106 Files Changed 103 +4 -146
1 changed files with 4 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 917b904790 - Show all commits

150
apps/api/views.py
View File

@ -1,17 +1,12 @@
# -*- encoding: utf-8 -*-
import logging
from typing import Any
from operator import or_, and_
from functools import reduce
from django_filters import rest_framework as rest_filters
from django.db.models import Q, Count
from django.http import HttpRequest
from django.core.cache import cache
from django.views.decorators.cache import cache_page
from django.utils.decorators import method_decorator
from django.core.exceptions import ValidationError
from rest_framework.views import APIView
from rest_framework.response import Response
from rest_framework import status, permissions, filters, generics
@ -19,7 +14,7 @@ from rest_framework.pagination import PageNumberPagination
from rest_framework.authentication import SessionAuthentication, TokenAuthentication
from apps.home.models import Ticket, TicketPriority, TicketTag
from apps.authentication.models import Department, User
from apps.authentication.models import Department
from .serializers import (
TicketSerializer, TicketTagSerializer, TicketPrioritySerializer,
UserSerializer
@ -27,13 +22,6 @@ from .serializers import (
log = logging.getLogger(__name__)
def respond_error(error: Exception, status: Any) -> Response:
logging.error(error)
return Response({
"detail": str(error),
"error": error.__class__.__name__
}, status=status)
class TicketPaginiation(PageNumberPagination):
page_size = 25
@ -69,136 +57,6 @@ class TicketListApiView(generics.ListAPIView):
return queryset
# ALLOWED_FILTERS = (
# "uuid__in", "priority", "tags__in", "author__department", "search"
# )
# MATCHER_MAP = {
# "contains": lambda k, v: {k: v[0]},
# "in": lambda k, v: {k: v}
# }
# @method_decorator(cache_page(60 * 5))
# def get(self, request: HttpRequest) -> Response:
# """Returns a response containing tickets matching the given filters."""
# try:
# kwargs = self._parse_querystring(request)
# data = self._new_get_tickets(**kwargs)
# return Response(data, status=status.HTTP_200_OK)
# except KeyError as error:
# return respond_error(error, status.HTTP_400_BAD_REQUEST)
# except ValidationError as error:
# return respond_error(error, status.HTTP_400_BAD_REQUEST)
# def post(self, request):
# """Create a new ticket"""
# serializer = TicketSerializer(data={
# })
# if not serializer.is_valid():
# return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
# serializer.save()
# return Response(serializer.data, status=status.HTTP_201_CREATED)
# def _parse_querystring(self, request: HttpRequest) -> dict:
# """"""
# def _new_get_tickets(self, **filters) -> dict:
# """"""
# def _get_tickets(self, request: HttpRequest) -> dict:
# """Returns a response containing tickets matching the given filters.
# Parameters
# ----------
# request : HttpRequest
# The request containing the filters.
# Returns
# -------
# Response
# A response containing the tickets data.
# Raises
# ------
# KeyError
# If any given filter key isn't in `self.ALLOWED_FILTERS`.
# ValidationError
# If any ValidationErrors are raised by Django while applying filters.
# """
# queryset = Ticket.objects.all()
# for key, values in request.GET.lists():
# key = key.removesuffix("[]")
# # format is not intended for this function
# if key == "format":
# continue
# if key not in self.ALLOWED_FILTERS:
# raise KeyError(key)
# if not key.endswith("__in"):
# values = values[0]
# # search filter is a user text input
# if key == "search":
# clean_value = values.split()
# log.debug("clean values %s", clean_value)
# or_filters = [
# Q(**{"title__contains": clean_value}),
# Q(**{"description__contains": clean_value}),
# Q(**{"author__forename__contains": clean_value}),
# Q(**{"author__surname__contains": clean_value})
# ]
# name_values = values.split(" ")
# if len(name_values) == 2:
# log.debug("looking for author %s %s", *name_values)
# users = User.objects.filter(Q(forename__contains=name_values[0]) | Q(surname__contains=name_values[1]))
# log.debug("found %s authors under that name", users.count())
# for user in users:
# log.debug("%s %s", user.fullname.lower(), values.lower())
# if user.fullname.lower() == values.lower():
# log.debug("adding author to filter")
# or_filters.append(Q(**{"author": user}))
# queryset = queryset.filter(reduce(or_, or_filters))
# continue
# if "all" in values:
# continue
# # if it doesn't end with "__in", assume we are looking for an exact match
# if not key.endswith("__in"):
# queryset = queryset.filter(Q(**{key: values}))
# continue
# # Chain the filters to create an AND query (Q() & Q() doesnt work?)
# for value in values:
# filter_kwargs = {key: [value]}
# queryset = queryset.filter(Q(**filter_kwargs))
# tickets = queryset.order_by("-edit_timestamp")
# serializer = TicketSerializer(tickets, many=True)
# log.debug("Query successful showing %s results", tickets.count())
# return serializer.data
class FilterCountApiView(APIView):
permission_classes = [permissions.IsAuthenticated]
@ -227,4 +85,4 @@ class FilterCountApiView(APIView):
for department in departments:
data["department_counts"][str(department.uuid)] = tickets.filter(author__department=department).count()
return Response(data, status=status.HTTP_200_OK)
return Response(data, status=status.HTTP_200_OK)