modified bill model, delete 'title', add 'wallet'

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"
 

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)
+    categories = models.SmallIntegerField(verbose_name="bill categories", choices = categories, default=11)
\ No newline at end of file
+
+    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

core/serializers/bill.py

@@ -12,7 +12,7 @@ class BillSerializer(serializers.ModelSerializer):
         fields = (
             'user',
             'url',
-            'title',
+            'wallet',
             'date',
             'datetime',
             'price',