From 7e9f2ea5614a9580458ce588810afbe99162a591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Thu, 5 Mar 2020 10:27:33 +0100
Subject: [PATCH] Cleanup/reorder uncloud_pay views

---
 uncloud/uncloud_pay/models.py |  2 +-
 uncloud/uncloud_pay/views.py  | 71 ++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/uncloud/uncloud_pay/models.py b/uncloud/uncloud_pay/models.py
index e209dbb..8c9fc76 100644
--- a/uncloud/uncloud_pay/models.py
+++ b/uncloud/uncloud_pay/models.py
@@ -171,7 +171,7 @@ class PaymentMethod(models.Model):
         pass
 
 ###
-# Bills & Payments.
+# Bills.
 
 class Bill(models.Model):
     uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
diff --git a/uncloud/uncloud_pay/views.py b/uncloud/uncloud_pay/views.py
index 32e7238..a22c616 100644
--- a/uncloud/uncloud_pay/views.py
+++ b/uncloud/uncloud_pay/views.py
@@ -16,43 +16,7 @@ from datetime import datetime
 import uncloud_pay.stripe as uncloud_stripe
 
 ###
-# Standard user views:
-
-class BalanceViewSet(viewsets.ViewSet):
-    # here we return a number
-    # number = sum(payments) - sum(bills)
-
-    #bills = Bill.objects.filter(owner=self.request.user)
-    #payments = Payment.objects.filter(owner=self.request.user)
-
-    # sum_paid = sum([ amount for amount payments..,.  ]) # you get the picture
-    # sum_to_be_paid = sum([ amount for amount bills..,.  ]) # you get the picture
-    pass
-
-
-class BillViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = BillSerializer
-    permission_classes = [permissions.IsAuthenticated]
-
-    def get_queryset(self):
-        return Bill.objects.filter(owner=self.request.user)
-
-    def unpaid(self, request):
-        return Bill.objects.filter(owner=self.request.user, paid=False)
-
-class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = PaymentSerializer
-    permission_classes = [permissions.IsAuthenticated]
-
-    def get_queryset(self):
-        return Payment.objects.filter(owner=self.request.user)
-
-class OrderViewSet(viewsets.ReadOnlyModelViewSet):
-    serializer_class = OrderSerializer
-    permission_classes = [permissions.IsAuthenticated]
-
-    def get_queryset(self):
-        return Order.objects.filter(owner=self.request.user)
+# Users.
 
 class UserViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = UserSerializer
@@ -61,6 +25,16 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
     def get_queryset(self):
         return get_user_model().objects.all()
 
+###
+# Payments and Payment Methods.
+
+class PaymentViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = PaymentSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self):
+        return Payment.objects.filter(owner=self.request.user)
+
 class PaymentMethodViewSet(viewsets.ModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
 
@@ -152,9 +126,30 @@ class PaymentMethodViewSet(viewsets.ModelViewSet):
             error = 'Could not fetch payment method from stripe. Please try again.'
             return Response({'error': error})
 
+###
+# Bills and Orders.
+
+class BillViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = BillSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self):
+        return Bill.objects.filter(owner=self.request.user)
+
+    def unpaid(self, request):
+        return Bill.objects.filter(owner=self.request.user, paid=False)
+
+
+class OrderViewSet(viewsets.ReadOnlyModelViewSet):
+    serializer_class = OrderSerializer
+    permission_classes = [permissions.IsAuthenticated]
+
+    def get_queryset(self):
+        return Order.objects.filter(owner=self.request.user)
+
 
 ###
-# Admin views.
+# Old admin stuff.
 
 class AdminPaymentViewSet(viewsets.ModelViewSet):
     serializer_class = PaymentSerializer