Merge "Rewrite Notification subsystem"

1 files changed, 2 insertions, 7 deletions

diff --git a/src/dashboard/tasks.py b/src/dashboard/tasks.py
index 0f7af1c..d4b4189 100644
--- a/src/dashboard/tasks.py
+++ b/src/dashboard/tasks.py
@@ -13,18 +13,12 @@ from celery import shared_task
 from django.utils import timezone
 from django.db.models import Q
 from booking.models import Booking
-from notifier.manager import *
-from notifier.models import *
+from notifier.manager import NotificationHandler
 from api.models import *
 from resource_inventory.resource_manager import ResourceManager
 
 
 @shared_task
-def conjure_aggregate_notifiers():
-    NotifyPeriodic.task()
-
-
-@shared_task
 def booking_poll():
     def cleanup_hardware(qs):
         for hostrelation in qs:
@@ -90,6 +84,7 @@ def booking_poll():
             cleanup_access(AccessRelation.objects.filter(job=job))
             job.complete = True
             job.save()
+            NotificationHandler.notify_booking_end(booking)
 
 
 @shared_task