From 707ba186f35bcd46160ecefc3f43cba7c27ac7b3 Mon Sep 17 00:00:00 2001
From: Zhongqi Ma <59981957+mzhongqi@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:46:58 -0500
Subject: [PATCH 1/3] Updated checks for validate_name() in MemberForm()

The database allows users to deactivate an account with a non-zero value, and create a new user with the same name, reactivating the previous user will allow two users of the same name. This change assures that new user names can not be the same as deactivated users with associated bills (Users that are not deleted from deactivation).
---
 ihatemoney/forms.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ihatemoney/forms.py b/ihatemoney/forms.py
index e9973fdd3..c9ab7db8e 100644
--- a/ihatemoney/forms.py
+++ b/ihatemoney/forms.py
@@ -414,7 +414,6 @@ def validate_name(self, field):
             and Person.query.filter(
                 Person.name == field.data,
                 Person.project == self.project,
-                Person.activated,
             ).all()
         ):  # NOQA
             raise ValidationError(_("This project already have this participant"))

From 43807fb7f1996c0b4765d8115e23eab6da1fecca Mon Sep 17 00:00:00 2001
From: Zhongqi Ma <59981957+mzhongqi@users.noreply.github.com>
Date: Sun, 11 Dec 2022 16:43:51 -0500
Subject: [PATCH 2/3] Update budget_test.py

Added 2 tests checking for validate_name() in MemberForm()
---
 ihatemoney/tests/budget_test.py | 64 +++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/ihatemoney/tests/budget_test.py b/ihatemoney/tests/budget_test.py
index 06681f06c..507557302 100644
--- a/ihatemoney/tests/budget_test.py
+++ b/ihatemoney/tests/budget_test.py
@@ -1654,6 +1654,70 @@ def test_amount_too_high(self):
         # No bills, the previous one was not added
         self.assertIn("No bills", resp.data.decode("utf-8"))
 
+        
+    def test_add_duplicate_user(self):
+
+        '''
+        Adding a user with same name as a deactivated user with 0 balance 
+        and no associated bills should success
+        '''
+        self.post_project("raclette")
+        self.login("raclette")
+
+        # adds a member to this project
+        self.client.post("/raclette/members/add", data={"name": "zorglub"})
+
+        # delete user using POST method
+        self.client.post("/raclette/members/1/delete")
+        self.assertEqual(len(self.get_project("raclette").active_members), 0)
+        self.assertEqual(len(self.get_project("raclette").members), 0)
+        # try to add this deleted user should be successful
+        response = self.client.get("/raclette/members/add", data={"name": "zorglub"})
+        self.assertEqual(len(self.get_project("raclette").members), 1)
+        self.assertEqual(response.status_code, 200)
+    
+    
+    def test_add_duplicate_user_with_balance(self):
+        '''
+        Adding a user with same name as a deactivated user with non-zero balance 
+        and associated bills should fail
+        '''
+        self.post_project("raclette")
+
+        # add two participants
+        self.client.post("/raclette/members/add", data={"name": "Alice"})
+        self.client.post("/raclette/members/add", data={"name": "Bob"})
+
+        members_ids = [m.id for m in self.get_project("raclette").members]
+
+        # create one bill
+        self.client.post(
+            "/raclette/add",
+            data={
+                "date": "2011-08-10",
+                "what": "fromage à raclette",
+                "payer": members_ids[0],
+                "payed_for": members_ids,
+                "amount": "100",
+            },
+        )
+
+        # deactivate Bob
+        self.client.post(
+            "/raclette/members/%s/delete" % self.get_project("raclette").members[-1].id
+        )
+
+        self.assertEqual(len(self.get_project("raclette").members), 2)
+        self.client.post("/raclette/members/add", data={"name": "Bob"})
+
+        # adding a user with the same name should fail
+        self.assertEqual(len(self.get_project("raclette").members), 2)
+        # The only active_member is Alice, this means adding a new Bob failed
+        self.assertEqual(len(self.get_project("raclette").active_members), 1)
+
+        # Can't get this part to work
+        # response = self.client.get("/raclette/members/add", data={"name": "Bob"})
+        # self.assertEqual(response.status_code, 405)
 
 if __name__ == "__main__":
     unittest.main()

From f5000d46da6bc2f948cb5347c28fe84e50379d63 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Fri, 3 Feb 2023 20:50:24 +0100
Subject: [PATCH 3/3] Remove unused test

---
 ihatemoney/tests/budget_test.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ihatemoney/tests/budget_test.py b/ihatemoney/tests/budget_test.py
index 507557302..a6e397cb9 100644
--- a/ihatemoney/tests/budget_test.py
+++ b/ihatemoney/tests/budget_test.py
@@ -1715,9 +1715,6 @@ def test_add_duplicate_user_with_balance(self):
         # The only active_member is Alice, this means adding a new Bob failed
         self.assertEqual(len(self.get_project("raclette").active_members), 1)
 
-        # Can't get this part to work
-        # response = self.client.get("/raclette/members/add", data={"name": "Bob"})
-        # self.assertEqual(response.status_code, 405)
 
 if __name__ == "__main__":
     unittest.main()