diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2012-03-30 17:02:52 -0700 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2012-03-30 17:02:52 -0700 |
| commit | a9d9f1e6fdc8e1981bdbf864332ddac746e53667 (patch) | |
| tree | c375e89ded434f44afd1de34270a3da1e16730c4 | |
| parent | 757e86baa1ae3b2bc980fc7a1af2a085b702224c (diff) | |
| parent | 192ca41b0a7b294029a7a836f556f8f1863dd91a (diff) | |
| download | ihatemoney-mirror-a9d9f1e6fdc8e1981bdbf864332ddac746e53667.zip ihatemoney-mirror-a9d9f1e6fdc8e1981bdbf864332ddac746e53667.tar.gz ihatemoney-mirror-a9d9f1e6fdc8e1981bdbf864332ddac746e53667.tar.bz2 | |
Merge pull request #75 from fredericsureau/master
Fix bug #73.
| -rw-r--r-- | budget/models.py | 2 | ||||
| -rw-r--r-- | budget/tests.py | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/budget/models.py b/budget/models.py index 5783703..76c3cab 100644 --- a/budget/models.py +++ b/budget/models.py @@ -114,7 +114,7 @@ class Person(db.Model): def has_bills(self): """return if the user do have bills or not""" bills_as_ower_number = db.session.query(billowers)\ - .filter(billowers.columns.get("bill_id") == self.id)\ + .filter(billowers.columns.get("person_id") == self.id)\ .count() return bills_as_ower_number != 0 or len(self.bills) != 0 diff --git a/budget/tests.py b/budget/tests.py index 0dcd8a1..5e03cde 100644 --- a/budget/tests.py +++ b/budget/tests.py @@ -214,6 +214,31 @@ class BudgetTestCase(TestCase): self.assertEqual( len(models.Project.query.get("randomid").active_members), 1) + def test_person_model(self): + self.post_project("raclette") + self.login("raclette") + + # adds a member to this project + self.app.post("/raclette/members/add", data={'name': 'alexis' }) + alexis = models.Project.query.get("raclette").members[-1] + + # should not have any bills + self.assertFalse(alexis.has_bills()) + + # bound him to a bill + self.app.post("/raclette/add", data={ + 'date': '2011-08-10', + 'what': u'fromage à raclette', + 'payer': alexis.id, + 'payed_for': [alexis.id,], + 'amount': '25', + }) + + # should have a bill now + alexis = models.Project.query.get("raclette").members[-1] + self.assertTrue(alexis.has_bills()) + + def test_member_delete_method(self): self.post_project("raclette") self.login("raclette") |
