Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • c58li/ece651_backend
1 result
Show changes
Commits on Source (7)
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 django.db.models import Sum
class BillSumPriceListView(generics.ListAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
authentication_classes = [
authentication.SessionAuthentication,
authentication.TokenAuthentication
]
def get(self, request, *args, **kwargs):
item = request.GET.get('item')
categorieModel = {
1: "Food",
2: "Groceries",
3: "Transportation",
4: "clothing",
5: "Entertainment",
6: "Bill",
7: "Sports",
8: "Electronics",
9: "Travel",
10: "House & Car",
11: "Others",
}
queryset = self.filter_queryset(self.get_queryset())
user = None
if self.request.user.is_authenticated:
user = self.request.user
data = {}
for i in range(1,12):
qs = BillSearchQuerySet(Bill).searchCategories(query=i, user=user)
if item == 'today':
qs = qs.searchToday(user=user)
elif item == 'month':
qs = qs.searchThisMonth(user=user)
total_price = qs.aggregate(Sum('price'))
data[categorieModel[i]] = total_price['price__sum']
return response.Response(data)
BillSumPriceListViewAPI = BillSumPriceListView.as_view()
\ No newline at end of file
...@@ -35,5 +35,4 @@ class SearchBillListView(generics.ListAPIView): ...@@ -35,5 +35,4 @@ class SearchBillListView(generics.ListAPIView):
result = qs.searchToday(user=user) result = qs.searchToday(user=user)
elif item == "title": elif item == "title":
result = qs.searchTitle(keyword, user=user) result = qs.searchTitle(keyword, user=user)
print(result)
return result return result
\ No newline at end of file
...@@ -41,20 +41,7 @@ class BillSearchQuerySet(models.QuerySet): ...@@ -41,20 +41,7 @@ class BillSearchQuerySet(models.QuerySet):
if user is not None: if user is not None:
qs = self.filter(user=user).filter(lookup) qs = self.filter(user=user).filter(lookup)
return qs return qs
# def searchTitle(self, keyword, user=None):
# lookup = Q(title__contains = keyword)
# qs = self.filter(lookup)
# if user is not None:
# qs = self.filter(user=user).filter(lookup)
# return qs
# def categorieAmount(self, date, categories, user=None):
# if date == "day":
# qs = self.searchCategories(categories, user=user).searchToday(user=user)
# elif date == "month":
# qs = self.searchCategories(categories, user=user).searchThisMonth(user=user)
class BillManager(models.Manager): class BillManager(models.Manager):
......
...@@ -8,6 +8,7 @@ from core.api.profile import ProfileViewSet ...@@ -8,6 +8,7 @@ from core.api.profile import ProfileViewSet
from core.api.coupon import CouponViewSet from core.api.coupon import CouponViewSet
from core.api.bill import * from core.api.bill import *
from core.api.billSearch import SearchBillListView from core.api.billSearch import SearchBillListView
from core.api.billPriceSum import BillSumPriceListViewAPI
router = routers.DefaultRouter() router = routers.DefaultRouter()
...@@ -36,7 +37,10 @@ urlpatterns += [ ...@@ -36,7 +37,10 @@ urlpatterns += [
path('api/bill/<uuid:pk>/', bill_detail_api, name="bill-detail"), path('api/bill/<uuid:pk>/', bill_detail_api, name="bill-detail"),
# bill search # bill search
path('api/bill/search/', SearchBillListView.as_view(), name="bill-search") path('api/bill/search/', SearchBillListView.as_view(), name="bill-search"),
# bill price list searched by categories
path('api/bill/price-sum/', BillSumPriceListViewAPI, name="bill-price-sum")
] ]
......