Skip to content

fix-pets-3 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgerni merged 1 commit into from
May 28, 2025
Merged

fix-pets-3 #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions task_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,32 +524,27 @@ def get_task_lists(username):


for boss_pet_task in tasklists.boss_pet:
if completed_bossPet_ids:
for id in completed_bossPet_ids:
if boss_pet_task.id == id['taskId']:
boss_pet_task.isCompleted = True

if any(x.get("taskId") == boss_pet_task.id for x in completed_bossPet_ids):
boss_pet_task.isCompleted = True
else:
boss_pet_task.isCompleted = False
bossPets.append(boss_pet_task)

for skill_pet_task in tasklists.skill_pet:
if completed_skillPet_ids:
for id in completed_skillPet_ids:
if skill_pet_task.id == id['taskId']:
skill_pet_task.isCompleted = True


if any(x.get("taskId") == skill_pet_task.id for x in completed_skillPet_ids):
skill_pet_task.isCompleted = True
else:
skill_pet_task.isCompleted = False
skillPets.append(skill_pet_task)

for other_pet_task in tasklists.other_pet:
if completed_otherPet_ids:
for id in completed_otherPet_ids:
if other_pet_task.id == id['taskId']:
other_pet_task.isCompleted = True


if any(x.get("taskId") == other_pet_task.id for x in completed_otherPet_ids):
other_pet_task.isCompleted = True
else:
other_pet_task.isCompleted = False
otherPets.append(other_pet_task)

return bossPets, tasklists.skill_pet, tasklists.other_pet
return bossPets, skillPets, otherPets
# task_query_easy = coll.find({'username': username}, {'easyTasks': 1})
# task_query_medium = coll.find({'username': username}, {'mediumTasks': 1})
# task_query_hard = coll.find({'username': username}, {'hardTasks': 1})
Expand Down