diff --git a/core/api/bill.py b/core/api/bill.py index 01fc0ac277c80791381135dfc6a5a82670148169..271f0988eb828bc5557807d0cba46bc367524b2d 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 1056d08af40f348c93068787fc4f3f1224d98514..7a5d83fe7bb299e4eac8de28ae98ec1b26392e36 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 a976a1b483be482b73eccb35b8ba281462918c68..75207375917863d689c003d47c3858c6356c9c35 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()