mattia/birthdaybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: sort birthdays by remaining time until next birthday

Browse Source 
This commit refactors the `list_birthday` function in `main.py` to sort the birthdays by the remaining time until the next birthday. It introduces a new helper function `sort_close` that calculates the remaining time until the next birthday for each birthday in the list. The birthdays are then sorted based on this calculated value.
This commit is contained in:
Mattia Mascarello 2024-05-16 11:30:42 +02:00
parent d08713c359
commit 133f789c64
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.py
View File

@ -255,13 +255,21 @@ async def end(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
await start(update, context) await start(update, context)
return ConversationHandler.END return ConversationHandler.END
def sort_close(b: Birthday) -> int:
now = datetime.datetime.now()
datetime_bd = datetime.datetime(now.year, b.birth.month, b.birth.day)
if datetime_bd < now:
datetime_bd = datetime.datetime(now.year + 1, b.birth.month, b.birth.day)
return (datetime_bd - now).days
async def list_birthday(update: Update, context: ContextTypes.DEFAULT_TYPE): async def list_birthday(update: Update, context: ContextTypes.DEFAULT_TYPE):
db_user_ping(update) db_user_ping(update)
"""List all the birthdays in the database""" """List all the birthdays in the database"""
global session global session
birthdays = session.query(Birthday).filter(Birthday.user_id == update.message.from_user.id).order_by( today = datetime.datetime.now().date()
Birthday.last_name).all() birthdays = session.query(Birthday).filter(Birthday.user_id == update.message.from_user.id).all()
# now order the birthdays by the remaining time until the next birthday
birthdays = sorted(birthdays, key=sort_close)
reply_keyboard = [[ reply_keyboard = [[
InlineKeyboardButton("🏠 Home", callback_data="home") # go back to the main menu InlineKeyboardButton("🏠 Home", callback_data="home") # go back to the main menu
]] ]]