From d0add89dcd82fef7cf36b6b04f3e52720b221ead Mon Sep 17 00:00:00 2001
From: Chris Li <c58li@uwaterloo.ca>
Date: Wed, 5 Apr 2023 02:50:25 -0400
Subject: [PATCH] Auth modified.
---
core/api/bill.py | 6 +-----
core/api/billPriceSum.py | 10 ++++------
core/api/billSearch.py | 8 +++-----
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/core/api/bill.py b/core/api/bill.py
index 01fc0ac..271f098 100644
--- a/core/api/bill.py
+++ b/core/api/bill.py
@@ -50,11 +50,7 @@ class BillDetail(mixins.RetrieveModelMixin,
generics.GenericAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
- # authentication_classes = [
- # authentication.SessionAuthentication,
- # authentication.TokenAuthentication
- # ]
- # permission_classes = (permissions.IsAuthenticated,)
+ permission_classes = (permissions.IsAuthenticated,)
lookup_field = "pk"
def get(self, request, *args, **kwargs):
diff --git a/core/api/billPriceSum.py b/core/api/billPriceSum.py
index 1056d08..7a5d83f 100644
--- a/core/api/billPriceSum.py
+++ b/core/api/billPriceSum.py
@@ -1,16 +1,13 @@
from rest_framework import generics, response
from core.models.bill import Bill, BillSearchQuerySet
from core.serializers.bill import BillSerializer
-from rest_framework import authentication
+from rest_framework import permissions, authentication
from django.db.models import Sum
class BillSumPriceListView(generics.ListAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
- authentication_classes = [
- authentication.SessionAuthentication,
- authentication.TokenAuthentication
- ]
+ permission_classes = (permissions.IsAuthenticated,)
def get(self, request, *args, **kwargs):
@@ -27,7 +24,8 @@ class BillSumPriceListView(generics.ListAPIView):
8: "Electronics",
9: "Travel",
10: "House & Car",
- 11: "Others",
+ 11: "Salary",
+ 12: "Others"
}
queryset = self.filter_queryset(self.get_queryset())
user = None
diff --git a/core/api/billSearch.py b/core/api/billSearch.py
index a976a1b..7520737 100644
--- a/core/api/billSearch.py
+++ b/core/api/billSearch.py
@@ -1,15 +1,12 @@
from rest_framework import generics
from core.models.bill import Bill, BillSearchQuerySet
from core.serializers.bill import BillSerializer
-from rest_framework import authentication
+from rest_framework import permissions, authentication
class SearchBillListView(generics.ListAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
- authentication_classes = [
- authentication.SessionAuthentication,
- authentication.TokenAuthentication
- ]
+ permission_classes = (permissions.IsAuthenticated,)
# item = categories -----> keyword = 1/2/3/4/5 ..
# price -----> keyword = price
@@ -17,6 +14,7 @@ class SearchBillListView(generics.ListAPIView):
# title -----> keyword = title
def get_queryset(self, *args, **kwargs):
+ print(self.request.query_params)
qs = BillSearchQuerySet(Bill)
item = self.request.GET.get("item")
result = Bill.objects.none()
--
GitLab