Add meal scheduling functionality and improve slot management

- Introduced meal time definitions in the scheduling process.
- Updated the slot creation logic to accommodate meal types.
- Enhanced the display of scheduled slots to differentiate between meals and projects.
- Modified database export to exclude meal slots from project optimization.

Author: jeremyakd

src/pycamp_bot/commands/schedule.py

@@ -8,19 +8,29 @@
 
 
 DAY_SLOT_TIME = {
-    'day':[], # Guarda el codigo del dia ej: ['A','B']
-    'slot':[], # Guarda la cantidad de slots del dia iterado ej [5] (se sobreescribe)
-    'time':[], # Guarda la hora a la que empieza el dia iterado [15] (se sobreescribe)
+    'day': [],  # Guarda el codigo del dia ej: ['A','B']
+    'slot': [],  # Guarda la cantidad de slots del dia iterado ej [5] (se sobreescribe)
+    'time': [],  # Guarda la hora a la que empieza el dia iterado [15] (se sobreescribe)
+    'meals': []  # Guarda los horarios de las comidas (strings, hora entera)
 }
 
+COMIDAS = ['Desayuno', 'Almuerzo', 'Merienda', 'Cena']
+
+
+def _slots_ordered_query():
+    """Orden A1…A9,A10 sin orden lexicográfico incorrecto."""
+    return sorted(
+        Slot.select(),
+        key=lambda s: (s.code[0], int(s.code[1:])) if len(s.code) > 1 else (s.code[0], 0),
+    )
+
 
 async def cancel(update, context):
     await context.bot.send_message(
         chat_id=update.message.chat_id,
         text="Has cancelado la carga de slots")
     return ConversationHandler.END
 
-
 @admin_needed
 async def define_slot_days(update, context):
     # TODO: filtrar proyectos por pycamp activo.
@@ -52,7 +62,7 @@ async def define_slot_days(update, context):
     return 1
 
 
-async def define_slot_ammount(update, context):
+async def define_meal_times(update, context):
     global DAY_SLOT_TIME
     text = update.message.text
     if text not in ["1", "2", "3", "4", "5", "6", "7"]:
@@ -61,26 +71,42 @@ async def define_slot_ammount(update, context):
             text="mmm eso no parece un numero de dias razonable, de nuevo?"
         )
         return 1
+    DAY_SLOT_TIME['day'] = list(string.ascii_uppercase[0:int(text)])
+    await context.bot.send_message(
+        chat_id=update.message.chat_id,
+        text="Ingresa los horarios de comidas\nEj: 9, 13, 17, 21")
+    return 2
 
-    
-    DAY_SLOT_TIME['day'] =list(string.ascii_uppercase[0:int(text)])
 
+async def define_slot_ammount(update, context):
+    global DAY_SLOT_TIME
+    raw = [item.strip() for item in update.message.text.split(',') if item.strip()]
+    try:
+        DAY_SLOT_TIME['meals'] = [str(int(h)) for h in raw]
+    except ValueError:
+        await context.bot.send_message(
+            chat_id=update.message.chat_id,
+            text="Cada horario debe ser un número entero, ej: 9, 13, 17, 21",
+        )
+        return 2
+    day_name = get_slot_weekday_name(DAY_SLOT_TIME['day'][0])
     await context.bot.send_message(
         chat_id=update.message.chat_id,
-        text="Cuantos slots tiene  tu dia {}".format(DAY_SLOT_TIME['day'][0])
+        text="Cuantos slots tiene  tu dia {}?".format(day_name)
     )
-    return 2
+    return 3
 
 
 async def define_slot_times(update, context):
     text = update.message.text
-    day = DAY_SLOT_TIME['day'][0]
+
+    day_name = get_slot_weekday_name(DAY_SLOT_TIME['day'][0])
     await context.bot.send_message(
         chat_id=update.message.chat_id,
-        text="A que hora empieza tu dia {}".format(day)
+        text="A que hora empieza tu dia {}?".format(day_name)
     )
     DAY_SLOT_TIME['slot'] = [text]
-    return 3
+    return 4
 
 
 async def create_slot(update, context):
@@ -89,29 +115,37 @@ async def create_slot(update, context):
     text = update.message.text
 
     DAY_SLOT_TIME['time'] = [text]
-    slot_amount = DAY_SLOT_TIME['slot'][0]
-    times = list(range(int(slot_amount)+1))[1:]
+    slot_amount = int(DAY_SLOT_TIME['slot'][0])
+    times = list(range(slot_amount + 1))[1:]
     starting_hour = int(text)
+    meals = DAY_SLOT_TIME['meals']
 
-    while len(times) > 0:
-        new_slot = Slot(code=str(DAY_SLOT_TIME['day'][0]+str(times[0])))
-        new_slot.start = starting_hour
+    pycampista = Pycampista.get_or_create(username=username, chat_id=chat_id)[0]
 
-        pycampista = Pycampista.get_or_create(username=username, chat_id=chat_id)[0]
+    for t in times:
+        new_slot = Slot(code=str(DAY_SLOT_TIME['day'][0] + str(t)))
+        new_slot.start = starting_hour
         new_slot.current_wizard = pycampista
 
+        hkey = str(starting_hour)
+        if hkey in meals:
+            idx = meals.index(hkey)
+            new_slot.meal_type = COMIDAS[idx]
+        else:
+            new_slot.meal_type = None
+
         new_slot.save()
-        times.pop(0)
         starting_hour += 1
 
     DAY_SLOT_TIME['day'].pop(0)
 
     if len(DAY_SLOT_TIME['day']) > 0:
+        day_name = get_slot_weekday_name(DAY_SLOT_TIME['day'][0])
         await context.bot.send_message(
             chat_id=update.message.chat_id,
-            text="Cuantos slots tiene tu dia {}".format(DAY_SLOT_TIME['day'][0])
+            text="Cuantos slots tiene tu dia {}?".format(day_name)
         )
-        return 2
+        return 3
     else:
         await context.bot.send_message(
             chat_id=update.message.chat_id,
@@ -130,9 +164,11 @@ async def make_schedule(update, context):
     data_json = export_db_2_json()
     my_schedule = export_scheduled_result(data_json)
 
-    for relationship in my_schedule:
-        slot = Slot.get(Slot.code == relationship[1])
-        project = Project.get(Project.name == relationship[0])
+    for project_name, slot_code in my_schedule:
+        slot = Slot.get(Slot.code == slot_code)
+        if slot.meal_type:
+            continue
+        project = Project.get(Project.name == project_name)
         project.slot = slot.id
         project.save()
 
@@ -144,7 +180,7 @@ async def make_schedule(update, context):
 
 async def check_day_tab(slot, prev_slot, cronograma):
     def append_day_name():
-        cronograma.append(f'*{get_slot_weekday_name(slot.code[0])}:*')
+        cronograma.append(f'*{escape_markdown(get_slot_weekday_name(slot.code[0]))}:*')
 
     if prev_slot is None:
         append_day_name()
@@ -154,19 +190,30 @@ def append_day_name():
 
 
 async def show_schedule(update, context):
-    slots = Slot.select()
-    projects = Project.select()
+    slots = _slots_ordered_query()
+    projects = list(Project.select())
     cronograma = []
 
     prev_slot = None
 
-    for i, slot in enumerate(slots):
+    for slot in slots:
         await check_day_tab(slot, prev_slot, cronograma)
 
-        for project in projects:
-            if project.slot_id == slot.id:
-                cronograma.append(f'{slot.start}:00 *{escape_markdown(project.name)}*')
-                cronograma.append(f'Owner: @{escape_markdown(project.owner.username)}')
+        if slot.meal_type:
+            h = slot.start_hour_display()
+            cronograma.append(
+                f'*{h}:00hs* — *{escape_markdown(slot.meal_type)}*'
+            )
+        else:
+            for project in projects:
+                if project.slot_id == slot.id:
+                    h = slot.start_hour_display()
+                    cronograma.append(
+                        f'*{h}:00hs* — *{escape_markdown(project.name.capitalize())}*'
+                    )
+                    cronograma.append(
+                        f'A cargo de @{escape_markdown(project.owner.username)}'
+                    )
 
         prev_slot = slot
 
@@ -199,6 +246,12 @@ async def change_slot(update, context):
         if project.name == project_name:
             for slot in slots:
                 if slot.code == text[-1]:
+                    if slot.meal_type:
+                        await context.bot.send_message(
+                            chat_id=update.message.chat_id,
+                            text="Ese slot está reservado para comidas; elegí otro código."
+                        )
+                        return
                     found = True
                     project.slot = slot.id
                     project.save()
@@ -217,9 +270,10 @@ async def change_slot(update, context):
 load_schedule_handler = ConversationHandler(
     entry_points=[CommandHandler('cronogramear', define_slot_days)],
     states={
-        1: [MessageHandler(filters.TEXT, define_slot_ammount)],
-        2: [MessageHandler(filters.TEXT, define_slot_times)],
-        3: [MessageHandler(filters.TEXT, create_slot)]},
+        1: [MessageHandler(filters.TEXT, define_meal_times)],
+        2: [MessageHandler(filters.TEXT, define_slot_ammount)],
+        3: [MessageHandler(filters.TEXT, define_slot_times)],
+        4: [MessageHandler(filters.TEXT, create_slot)]},
     fallbacks=[CommandHandler('cancel', cancel)])