From d9dc38947c88f211f7deef2454f3a15251ed23d3 Mon Sep 17 00:00:00 2001
From: zorun <github@bitsofnetworks.org>
Date: Sun, 26 Apr 2020 14:22:54 +0200
Subject: [PATCH] Fix string representation of bills (#584)

Currently the string representation of a Bill is: "<amount> for <description>"

It is used in the History Page to describe changes that were applied to
Bills, for instance:

    Bill "42.0 for Test" renamed to "Another Test"

This is inconsistent, not easy to read, and the "for" in the middle is not
translatable.

To solve this issue, simply switch the string representation of a bill to
its description.

Co-authored-by: Baptiste Jonglez <git@bitsofnetworks.org>
---
 ihatemoney/models.py      |  2 +-
 ihatemoney/tests/tests.py | 36 +++++++++++++-----------------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/ihatemoney/models.py b/ihatemoney/models.py
index dca86110..742bc8ca 100644
--- a/ihatemoney/models.py
+++ b/ihatemoney/models.py
@@ -460,7 +460,7 @@ class Bill(db.Model):
             return 0
 
     def __str__(self):
-        return f"{self.amount} for {self.what}"
+        return self.what
 
     def __repr__(self):
         return (
diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py
index b50fae6c..62cb0485 100644
--- a/ihatemoney/tests/tests.py
+++ b/ihatemoney/tests/tests.py
@@ -2598,7 +2598,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('25.0 for fromage à raclette')} added",
+            f"Bill {em_surround('fromage à raclette')} added",
             resp.data.decode("utf-8"),
         )
 
@@ -2619,26 +2619,26 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('25.0 for fromage à raclette')} added",
+            f"Bill {em_surround('fromage à raclette')} added",
             resp.data.decode("utf-8"),
         )
         self.assertRegex(
             resp.data.decode("utf-8"),
             r"Bill %s:\s* Amount changed\s* from %s\s* to %s"
             % (
-                em_surround("25.0 for fromage à raclette", regex_escape=True),
+                em_surround("fromage à raclette", regex_escape=True),
                 em_surround("25.0", regex_escape=True),
                 em_surround("10.0", regex_escape=True),
             ),
         )
         self.assertIn(
             "Bill %s renamed to %s"
-            % (em_surround("25.0 for fromage à raclette"), em_surround("new thing"),),
+            % (em_surround("fromage à raclette"), em_surround("new thing"),),
             resp.data.decode("utf-8"),
         )
         self.assertLess(
             resp.data.decode("utf-8").index(
-                f"Bill {em_surround('25.0 for fromage à raclette')} renamed to"
+                f"Bill {em_surround('fromage à raclette')} renamed to"
             ),
             resp.data.decode("utf-8").index("Amount changed"),
         )
@@ -2650,8 +2650,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('10.0 for new thing')} removed",
-            resp.data.decode("utf-8"),
+            f"Bill {em_surround('new thing')} removed", resp.data.decode("utf-8"),
         )
 
         # edit user
@@ -2746,7 +2745,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertRegex(
             resp.data.decode("utf-8"),
             r"Bill {}:\s* Amount changed\s* from {}\s* to {}".format(
-                em_surround("25.0 for Bill 1", regex_escape=True),
+                em_surround("Bill 1", regex_escape=True),
                 em_surround("25.0", regex_escape=True),
                 em_surround("88.0", regex_escape=True),
             ),
@@ -2789,11 +2788,9 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data.decode("utf-8").count("<td> -- </td>"), 5)
         self.assertNotIn("127.0.0.1", resp.data.decode("utf-8"))
+        self.assertIn(f"Bill {em_surround('Bill 1')} added", resp.data.decode("utf-8"))
         self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} added", resp.data.decode("utf-8")
-        )
-        self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} removed", resp.data.decode("utf-8"),
+            f"Bill {em_surround('Bill 1')} removed", resp.data.decode("utf-8"),
         )
 
         # Add a new bill
@@ -2812,20 +2809,13 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data.decode("utf-8").count("<td> -- </td>"), 6)
         self.assertNotIn("127.0.0.1", resp.data.decode("utf-8"))
-        self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} added", resp.data.decode("utf-8")
-        )
+        self.assertIn(f"Bill {em_surround('Bill 1')} added", resp.data.decode("utf-8"))
         self.assertEqual(
-            resp.data.decode("utf-8").count(
-                f"Bill {em_surround('25.0 for Bill 1')} added"
-            ),
-            1,
+            resp.data.decode("utf-8").count(f"Bill {em_surround('Bill 1')} added"), 1,
         )
+        self.assertIn(f"Bill {em_surround('Bill 2')} added", resp.data.decode("utf-8"))
         self.assertIn(
-            f"Bill {em_surround('20.0 for Bill 2')} added", resp.data.decode("utf-8")
-        )
-        self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} removed", resp.data.decode("utf-8"),
+            f"Bill {em_surround('Bill 1')} removed", resp.data.decode("utf-8"),
         )
 
     def test_double_bill_double_person_edit_second_no_web(self):