From 322778baf3e62111fa9b896317969c49632fbb6f Mon Sep 17 00:00:00 2001
From: Yirou Qiu <y2qiu@uwaterloo.ca>
Date: Sun, 19 Mar 2023 17:00:01 -0400
Subject: [PATCH] modified bill model, delete 'title', add 'wallet'
---
core/api/bill.py | 16 ++++++++--------
core/models/bill.py | 26 ++++++++++++++++++--------
core/serializers/bill.py | 2 +-
3 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/core/api/bill.py b/core/api/bill.py
index 184dc1e..661a1dd 100644
--- a/core/api/bill.py
+++ b/core/api/bill.py
@@ -8,10 +8,10 @@ from rest_framework import permissions, authentication
class BillListCreate(mixins.ListModelMixin, mixins.CreateModelMixin, generics.GenericAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
- # authentication_classes = [
- # authentication.SessionAuthentication,
- # authentication.TokenAuthentication
- # ]
+ authentication_classes = [
+ authentication.SessionAuthentication,
+ authentication.TokenAuthentication
+ ]
permission_classes = (permissions.IsAuthenticated,)
def get(self, request, *args, **kwargs):
@@ -50,10 +50,10 @@ class BillDetail(mixins.RetrieveModelMixin,
generics.GenericAPIView):
queryset = Bill.objects.all()
serializer_class = BillSerializer
- # authentication_classes = [
- # authentication.SessionAuthentication,
- # authentication.TokenAuthentication
- # ]
+ authentication_classes = [
+ authentication.SessionAuthentication,
+ authentication.TokenAuthentication
+ ]
permission_classes = (permissions.IsAuthenticated,)
lookup_field = "pk"
diff --git a/core/models/bill.py b/core/models/bill.py
index 349bafa..e834fc3 100644
--- a/core/models/bill.py
+++ b/core/models/bill.py
@@ -42,12 +42,12 @@ class BillSearchQuerySet(models.QuerySet):
qs = self.filter(user=user).filter(lookup)
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 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):
@@ -65,7 +65,7 @@ class Bill(UUIDModel):
user = models.ForeignKey(User, default=1, null=True, on_delete=models.SET_NULL)
- title = models.CharField(max_length = 120)
+ # title = models.CharField(max_length = 120)
date = models.DateField(verbose_name="payment time", default = datetime.date.today)
@@ -92,4 +92,14 @@ class Bill(UUIDModel):
)
- categories = models.SmallIntegerField(verbose_name="bill categories", choices = categories, default=11)
\ No newline at end of file
+ categories = models.SmallIntegerField(verbose_name="bill categories", choices = categories, default=11)
+
+ wallet = (
+ (1, "checking account"),
+ (2, "credit account"),
+ (3, "cash"),
+ (4, "savings account"),
+ (5, "other")
+ )
+
+ wallet = models.SmallIntegerField(verbose_name="wallet", choices=wallet, default=3)
\ No newline at end of file
diff --git a/core/serializers/bill.py b/core/serializers/bill.py
index d3dfdff..b50cae2 100644
--- a/core/serializers/bill.py
+++ b/core/serializers/bill.py
@@ -12,7 +12,7 @@ class BillSerializer(serializers.ModelSerializer):
fields = (
'user',
'url',
- 'title',
+ 'wallet',
'date',
'datetime',
'price',
--
GitLab