From 4e93a2473c3d21afd0dfbb2ad52b3e6583693f39 Mon Sep 17 00:00:00 2001
From: Yapollon <75550334+Yapollon@users.noreply.github.com>
Date: Wed, 14 Feb 2024 21:03:11 +0100
Subject: [PATCH] User Deletion

Addition to the last commit.
Adds the improved user deletion.
---
 db/SQLiteClient.py  | 4 +---
 models/HabitList.py | 2 +-
 models/User.py      | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/db/SQLiteClient.py b/db/SQLiteClient.py
index 9f05e01..390c94d 100644
--- a/db/SQLiteClient.py
+++ b/db/SQLiteClient.py
@@ -58,12 +58,10 @@ def update_user(id: int, name: str, email: str, password: str = None):
 
 
 def delete_user(id: int):
-    query = f"DELETE FROM habit_lists WHERE (SELECT list_id FROM habit_users WHERE user_id = {id}) = id;"
-    query2 = f"DELETE FROM users WHERE id = {id};"
+    query = f"DELETE FROM users WHERE id = {id};"
     conn = con3()
     cursor = conn.cursor()
     cursor.execute(query)
-    cursor.execute(query2)
     conn.commit()
     conn.close()
     return cursor.lastrowid
diff --git a/models/HabitList.py b/models/HabitList.py
index 6fd3df5..64fa292 100644
--- a/models/HabitList.py
+++ b/models/HabitList.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from datetime import date, datetime
+from datetime import datetime
 
 from models.Habit import Habit
 from models.User import User
diff --git a/models/User.py b/models/User.py
index 365d586..e058fc3 100644
--- a/models/User.py
+++ b/models/User.py
@@ -31,6 +31,9 @@ class User(UserMixin):
         update_user(self.id, self.name, self.email, self.password if self.password else None)
 
     def delete(self):
+        habitLists = self.get_habitLists()
+        for habitList in habitLists:
+            habitList.delete(self.id)
         delete_user(self.id)
 
     def get_habitLists(self) -> list: