test problem solved

bin/python

@@ -0,0 +1 @@
+python3

bin/python3

@@ -0,0 +1 @@
+/usr/bin/python3

bin/python3.10

@@ -0,0 +1 @@
+python3

ihatemoney/tests/main_test.py

@@ -4,6 +4,7 @@ import socket
 import unittest
 from unittest.mock import MagicMock, patch
 
+from flask import g, request, url_for
 from sqlalchemy import orm
 from werkzeug.security import check_password_hash
 
@@ -164,6 +165,91 @@ class ModelsTestCase(IhatemoneyTestCase):
                 pay_each_expected = 10 / 3
                 self.assertEqual(bill.amount / weight, pay_each_expected)
 
+    def test_remove_member(self):
+        # make project
+        self.post_project("raclette")
+
+        # add members
+        self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2})
+        self.client.post("/raclette/members/add", data={"name": "fred"})
+        self.client.post("/raclette/members/add", data={"name": "tata"})
+
+        # make bills
+        self.client.post(
+            "/raclette/add",
+            data={
+                "date": "2011-08-10",
+                "what": "red wine",
+                "payer": 1,
+                "payed_for": [2],
+                "amount": "20",
+            },
+        )
+
+        project = models.Project.query.get_by_name(name="raclette")
+
+        zorglub = models.Person.query.get_by_name(name="zorglub", project=project)
+        tata = models.Person.query.get_by_name(name="tata", project=project)
+        fred = models.Person.query.get_by_name(name="fred", project=project)
+
+        g.project.remove_member(tata.id)
+        # tata should be fully removed because they are not connected to a bill
+        self.assertEqual(project.members, [zorglub, fred])
+
+        g.project.remove_member(zorglub.id)
+
+        # zorglub is connected to a bill so they should be deactivated
+        self.assertEqual(project.members, [zorglub, fred])
+        self.assertEqual(zorglub.activated, False)
+
+    def test_deactivated_user_bill(self):
+
+        self.post_project("raclette")
+
+        # add members
+        self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2})
+        self.client.post("/raclette/members/add", data={"name": "fred"})
+        self.client.post("/raclette/members/add", data={"name": "tata"})
+
+        project = models.Project.query.get_by_name(name="raclette")
+        zorglub = models.Person.query.get_by_name(name="zorglub", project=project)
+
+        self.client.post(
+            "/raclette/add",
+            data={
+                "date": "2011-08-10",
+                "what": "red wine",
+                "payer": 1,
+                "payed_for": [2],
+                "amount": "20",
+            },
+        )
+
+        g.project.remove_member(zorglub.id)
+
+        self.client.post(
+            "/raclette/edit",
+            data={
+                "date": "2011-08-10",
+                "what": "red wine",
+                "payer": 1,
+                "payed_for": [2],
+                "amount": "30",
+            },
+        )
+
+        zorglub_bill = models.Bill.query.options(
+            orm.subqueryload(models.Bill.owers)
+        ).filter(models.Bill.owers.contains(zorglub))
+        for bill in zorglub_bill:
+            id = bill.id
+            resp = self.client.post("/<raclette/edit/" + str(id), follow_redirects=True)
+            self.assertEqual(resp.status_code, 200)
+            assert request.path == url_for(".list_bills")
+
+        # user edits a form, redirect + error should occur
+        # Check that we were redirected to the list of bills page
+
     def test_bill_pay_each(self):
 
         self.post_project("raclette")

ihatemoney/web.py

@@ -773,6 +773,9 @@ def edit_bill(bill_id):
     bill = Bill.query.get(g.project, bill_id)
     if not bill:
         raise NotFound()
+    payer_id = bill.payer_id
+    payer = Person.query.get(payer_id)
+    if payer.activated:
 
         form = get_billform_for(g.project, set_default=False)
 
@@ -787,6 +790,9 @@ def edit_bill(bill_id):
             form.fill(bill, g.project)
 
         return render_template("add_bill.html", form=form, edit=True)
+    else:
+        flash(_("The payer is deactivated. You cannot edit the bill."))
+        return redirect(url_for(".list_bills"))
 
 
 @main.route("/lang/<lang>")

lib64

@@ -0,0 +1 @@
+lib

pyvenv.cfg

@@ -0,0 +1,3 @@
+home = /usr/bin
+include-system-site-packages = false
+version = 3.10.6