Fix name of task

onepercentclub · Aug 11, 2022 · e4a3232 · e4a3232
1 parent cfca4e3
commit e4a3232
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 23 deletions.
diff --git a/bluebottle/time_based/effects.py b/bluebottle/time_based/effects.py
@@ -363,8 +363,6 @@ class CreateRecurringSlotEffect(Effect):
     def post_save(self, **kwargs):
         start = self.instance.end + timedelta(days=1)
 
-        print(f'Creating new slot {start}')
-
         PeriodActivitySlot.objects.create(
             activity=self.instance.activity,
             start=start,

diff --git a/bluebottle/time_based/periodic_tasks.py b/bluebottle/time_based/periodic_tasks.py
@@ -141,16 +141,6 @@ def period_activity_slot_has_no_participants(effect):
 class PeriodActivitySlotFinishedTask(ModelPeriodicTask):
 
     def get_queryset(self):
-
-        if len(PeriodActivitySlot.objects.all()):
-            print('finishing slots')
-            print(
-                PeriodActivitySlot.objects.filter(
-                    end__lt=timezone.now().date(),
-                    status='running',
-                    activity__status__in=['open', 'full']
-                )
-            )
         return PeriodActivitySlot.objects.filter(
             end__lt=timezone.now().date(),
             status='running',

diff --git a/bluebottle/time_based/tasks.py b/bluebottle/time_based/tasks.py
@@ -90,7 +90,7 @@ def time_contribution_tasks():
 
 @periodic_task(
     run_every=(crontab(minute='*/15')),
-    name="time_contribution_tasks",
+    name="period_activity_slot_tasks",
     ignore_result=True
 )
 def period_activity_slot_tasks():

diff --git a/bluebottle/time_based/tests/test_periodic_tasks.py b/bluebottle/time_based/tests/test_periodic_tasks.py
@@ -30,10 +30,6 @@
     DateSlotParticipantFactory, TeamSlotFactory
 )
 
-import logging
-
-logger = logging.getLogger(__name__)
-
 
 class TimeBasedActivityPeriodicTasksTestCase():
 
@@ -576,19 +572,17 @@ def run_task(self, when):
                 mock_date.today.return_value = when.date()
                 mock_date.side_effect = lambda *args, **kw: date(*args, **kw)
 
-                with mock.patch('bluebottle.time_based.triggers.now') as mock_now:
-                    mock_now.today.return_value = when
-                    mock_now.side_effect = lambda *args, **kw: when
-
+                with mock.patch(
+                    'bluebottle.time_based.triggers.now',
+                    return_value=when
+                ):
                     period_activity_slot_tasks()
                     time_contribution_tasks()
 
     def test_create_new_slot(self):
         self.assertEqual(len(self.activity.slots.all()), 1)
 
-        logger.error('Running tasks')
         self.run_task(now() + timedelta(days=7))
-        logger.error('Running tasks again')
         self.run_task(now() + timedelta(days=7))
         self.assertEqual(len(self.activity.slots.all()), 2)