Merge pull request #109 from monzo/mattrco/incident-close-nudge

Periodically remind incident lead to close incident

Author: mattrco

response/slack/decorators/incident_notification.py

@@ -1,11 +1,8 @@
-import time
-import requests
 import logging
 
 from datetime import datetime
 
 from response.core.models import Incident
-from response.slack.models.comms_channel import CommsChannel
 from response.slack.models.notification import Notification
 
 logger = logging.getLogger(__name__)
@@ -62,7 +59,8 @@ def _wrapper(fn):
 
 
 def handle_notifications():
-    # notifications are only sent to open incidents with comms channels
+
+    # Only notify open incidents with a comms channel
     open_incidents = Incident.objects.filter(
         end_time__isnull=True,
         commschannel__incident__isnull=False
@@ -84,8 +82,8 @@ def handle_notifications():
                 if mins_since_last_notify >= handler.interval_mins:
                     try:
                         handler.callback(incident)
-                    except:
-                        logger.error(f"Error calling notification handler {handler}")
+                    except Exception as e:
+                        logger.error(f"Error calling notification handler {handler}: {e}")
 
                     notification.time = datetime.now()
                     notification.repeat_count = notification.repeat_count + 1
@@ -98,8 +96,8 @@ def handle_notifications():
                 if mins_since_started >= handler.interval_mins:
                     try:
                         handler.callback(incident)
-                    except:
-                        logger.error(f"Error calling notification handler {handler}")
+                    except Exception as e:
+                        logger.error(f"Error calling notification handler {handler}: {e}")
 
                     notification = Notification(
                         incident=incident,

response/slack/incident_notifications.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from response.core.models import Incident
 from response.slack.models import CommsChannel
 from response.slack .decorators import recurring_notification, single_notification
@@ -8,7 +10,8 @@ def remind_severity(incident: Incident):
     try:
         comms_channel = CommsChannel.objects.get(incident=incident)
         if not incident.severity:
-            comms_channel.post_in_channel("🌤️ This incident doesn't have a severity.  Please set one with `@incident severity ...`")
+            comms_channel.post_in_channel(
+                "🌤️ This incident doesn't have a severity. Please set one with `@incident severity ...`")
     except CommsChannel.DoesNotExist:
         pass
 
@@ -18,15 +21,25 @@ def remind_incident_lead(incident: Incident):
     try:
         comms_channel = CommsChannel.objects.get(incident=incident)
         if not incident.lead:
-            comms_channel.post_in_channel("👩‍🚒 This incident hasn't got a lead.  Please set one with `@incident lead ...`")
+            comms_channel.post_in_channel(
+                "👩‍🚒 This incident hasn't got a lead. Please set one with `@incident lead ...`")
     except CommsChannel.DoesNotExist:
         pass
 
-@recurring_notification(interval_mins=720, max_notifications=6)
+
+@recurring_notification(interval_mins=1440, max_notifications=5)
 def remind_close_incident(incident: Incident):
+
+    # Only remind on weekdays (weekday returns an ordinal indexed from 0 on Monday)
+    if datetime.now().weekday() in (5, 6):
+        return
+
     try:
         comms_channel = CommsChannel.objects.get(incident=incident)
         if not incident.is_closed():
-            comms_channel.post_in_channel(":timer_clock: This incident has been running a long time.  Can it be closed now?  Remember to pin important messages in order to create the timeline.")
+            user_to_notify = incident.lead or incident.reporter
+            comms_channel.post_in_channel(
+                f":timer_clock: <@{user_to_notify.external_id}>, this incident has been running a long time."
+                " Can it be closed now? Remember to pin important messages in order to create the timeline.")
     except CommsChannel.DoesNotExist:
-        pass
+        pass