Merge remote-tracking branch 'origin/master'

This commit is contained in:
nikolaswollenberg 2024-01-16 11:16:37 +01:00
commit 3b0d68338e
2 changed files with 4 additions and 4 deletions

View File

@ -63,8 +63,8 @@ def get_habit(id: int):
return habits return habits
def get_habits(): def get_habits(user_id: int):
query = f"SELECT * FROM habits;" query = f"SELECT * FROM habits WHERE user_id = {user_id};"
conn = con3() conn = con3()
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute(query) cursor.execute(query)

View File

@ -27,8 +27,8 @@ class Habit:
return Habit(habit[0], habit[1], habit[2], habit[3], habit[4], habit[5]) if habit else None return Habit(habit[0], habit[1], habit[2], habit[3], habit[4], habit[5]) if habit else None
@staticmethod @staticmethod
def get_all(): def get_all(user_id):
raw_habits = get_habits() raw_habits = get_habits(user_id)
habits = [] habits = []
for habit in raw_habits: for habit in raw_habits:
habit = Habit(habit[0], habit[1], habit[2], habit[3], habit[4], habit[5]) habit = Habit(habit[0], habit[1], habit[2], habit[3], habit[4], habit[5])