minor fixes

Author: cmdelatorre

src/pycamp_bot/commands/wizard.py

@@ -3,6 +3,7 @@
 from datetime import datetime, timedelta
 
 from telegram.ext import CommandHandler
+from telegram.error import BadRequest
 from pycamp_bot.models import Pycampista, WizardAtPycamp
 from pycamp_bot.commands.auth import admin_needed
 from pycamp_bot.commands.manage_pycamp import get_active_pycamp
@@ -56,7 +57,7 @@ def compute_wizards_slots(pycamp):
     wizard_end = pycamp.end
     slots = []
     current_period = wizard_start
-    while current_period < wizard_end:
+    while current_period < wizard_end:  # TODO: check fields None
         slot_start = current_period
         slot_end = current_period + timedelta(minutes=pycamp.wizard_slot_duration)
         slots.append(
@@ -94,6 +95,7 @@ def define_wizards_schedule(pycamp):
         idx += 1
     return wizard_per_slot
 
+
 async def become_wizard(update, context):
     current_wizards = Pycampista.select().where(Pycampista.wizard is True)
 
@@ -172,7 +174,11 @@ async def notify_schedule_to_wizards(update, context, pycamp):
             (WizardAtPycamp.pycamp == pycamp) & (WizardAtPycamp.wizard == wizard)
         ).order_by(WizardAtPycamp.init)
 
-        await notify_scheduled_slots_to_wizard(update, context, pycamp, wizard, wizard_agenda)
+        try:
+            await notify_scheduled_slots_to_wizard(update, context, pycamp, wizard, wizard_agenda)
+            logger.debug("Notified wizard schedule to {}".format(wizard.username))
+        except BadRequest:
+            logger.warn("Coulnd't notify its wizzard schedule to {}".format(wizard.username))
 
 
 def persist_wizards_schedule_in_db(pycamp):
@@ -190,7 +196,6 @@ def persist_wizards_schedule_in_db(pycamp):
             init=start,
             end=end
         )
-        logger.debug("From {} to {} the wizard is {}".format(start, end, wizard.username))
 
 
 @admin_needed
@@ -201,6 +206,8 @@ async def schedule_wizards(update, context):
     logger.info("Deleted wizards schedule ({} records)".format(n))
 
     persist_wizards_schedule_in_db(pycamp)
+    logger.info("Wizards schedule persisted in the DB.")
+
 
     await notify_schedule_to_wizards(update, context, pycamp)
 
@@ -215,7 +222,6 @@ async def schedule_wizards(update, context):
     )
 
 
-
 def format_wizards_schedule(agenda):
     """Aux function to render the wizards schedule as a friendly  message."""
     per_day = defaultdict(list)
@@ -265,7 +271,7 @@ async def show_wizards_schedule(update, context):
     if not show_all:
         agenda = agenda.where(WizardAtPycamp.end > datetime.now())
     agenda = agenda.order_by(WizardAtPycamp.init)
-    
+
     msg = format_wizards_schedule(agenda)
 
     await context.bot.send_message(

src/pycamp_bot/models.py

@@ -10,7 +10,6 @@
 
 
 class BaseModel(pw.Model):
-
     class Meta:
         database = db
 
@@ -138,7 +137,7 @@ class Slot(BaseModel):
     '''
     code = pw.CharField()  # For example A1 for first slot first day
     start = pw.DateTimeField()
-    current_wizard = pw.ForeignKeyField(Pycampista)
+    current_wizard = pw.ForeignKeyField(Pycampista, null=True)
 
     def get_end_time(self):
         return self.start + timedelta(minutes=DEFAULT_SLOT_PERIOD)
@@ -185,4 +184,5 @@ def models_db_connection():
         WizardAtPycamp,
         Project,
         Slot,
-        Vote])
+        Vote], safe=True)
+    db.close()

test/test_wizard.py

@@ -96,3 +96,7 @@ def test_no_slot_after_last_day_lunch(self):
             print(start)
             if start.day == self.pycamp.end.day:
                 assert start >= lunch_time_end
+
+
+class TestDefineWizardsSchedule:
+    pass