[GNUnet-SVN] [taler-bank] 01/04: fix ascending order in query set

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

commit c20b274b7d62031f0df25c8ee7607ae03a0620a6
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sun May 7 11:59:07 2017 +0200

    fix ascending order in query set
---
 talerbank/app/tests.py | 14 ++++++++++----
 talerbank/app/views.py |  5 ++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py
index a73e2db..4f81bcb 100644
--- a/talerbank/app/tests.py
+++ b/talerbank/app/tests.py
@@ -117,22 +117,28 @@ class HistoryTestCase(TestCase):
         response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "+4"},
                          **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
         self.assertEqual(200, response.status_code)
+
+        # Get a delta=+1 record in the middle of the list: FAILS
+        response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "+1", "start": "5"},
+                         **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
+        logger.info(response.content.decode("utf-8"))
+        data = response.content.decode("utf-8")
+        data = json.loads(data)
+        self.assertEqual(data["data"][0]["row_id"], 6)
+
         # Get latest record
         response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "-1"},
                          **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
         data = response.content.decode("utf-8")
         data = json.loads(data)
         self.assertEqual(data["data"][0]["subject"], "h")
-        logger.info("latest row_id: %s" % data["data"][0]["row_id"])
+
         # Get non-existent record: the latest plus one in the future
         response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "+1", "start": "10"},
                          **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
         data = response.content.decode("utf-8")
         self.assertJSONEqual(data, {"data": []})
 
-        # Get a delta=+1 record in the middle of the list
-        response = c.get(reverse("history", urlconf=urls), {"auth": "basic", 
"delta": "+1", "start": "5"},
-                         **{"HTTP_X_TALER_BANK_USERNAME": "User", 
"HTTP_X_TALER_BANK_PASSWORD": "Password"})
 
 # This tests whether a bank account goes red and then
 # goes green again
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index e0bb3c0..7d2cb6d 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -357,6 +357,7 @@ def history(request):
         sign_filter = Q(id__lt=start)
     elif "+" == sign and start:
         sign_filter = Q(id__gt=start)
+        sign = ""
 
     # direction (debit/credit)
     direction = request.GET.get("direction")
@@ -376,9 +377,7 @@ def history(request):
 
     # FIXME *DO* return 204 No content when history is empty.
 
-    qs = BankTransaction.objects.filter(query_string, sign_filter)
-    if 0 < qs.count():
-        qs = qs.order_by("%sid" % sign)[:delta]
+    qs = BankTransaction.objects.filter(query_string, 
sign_filter).order_by("%sid" % sign)[:delta]
     for entry in qs:
         counterpart = entry.credit_account.user.username
         sign_ = "-"

-- 
To stop receiving notification emails like this one, please contact
address@hidden