Merge branch 'master' of https://github.com/alphagov/notifications-api into letter-S3zipchange-deskpro

app/celery/scheduled_tasks.py

@@ -337,6 +337,7 @@ def delete_dvla_response_files_older_than_seven_days():
 @notify_celery.task(name="raise-alert-if-letter-notifications-still-sending")
 @statsd(namespace="tasks")
 def raise_alert_if_letter_notifications_still_sending():
+
     today = datetime.utcnow().date()
 
     # Do nothing on the weekend
@@ -356,15 +357,21 @@ def raise_alert_if_letter_notifications_still_sending():
     ).count()
 
     if still_sending:
-        deskpro_client.create_ticket(
+        message = "There are {} letters in the 'sending' state from {}".format(
-            subject="Letters still sending",
+            still_sending,
-            message="There are {} letters in the 'sending' state from {}".format(
+            (today - timedelta(days=offset_days)).strftime('%A %d %B')
-                still_sending,
-                (today - timedelta(days=offset_days)).strftime('%A %d %B')
-            ),
-            ticket_type="alert"
         )
 
+        # Only send alerts in production
+        if current_app.config['NOTIFY_ENVIRONMENT'] in ['production', 'test']:
+            deskpro_client.create_ticket(
+                subject="[{}] Letters still sending".format(current_app.config['NOTIFY_ENVIRONMENT']),
+                message=message,
+                ticket_type="alert"
+            )
+        else:
+            current_app.logger.info(message)
+
 
 @notify_celery.task(name="populate_monthly_billing")
 @statsd(namespace="tasks")

migrations/versions/0159_add_historical_redact.py

@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 0159_add_historical_redact
+Revises: 0158_remove_rate_limit_default
+Create Date: 2017-01-17 15:00:00.000000
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0159_add_historical_redact'
+down_revision = '0158_remove_rate_limit_default'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+from flask import current_app
+
+def upgrade():
+    op.execute(
+        """
+        INSERT INTO template_redacted
+        (
+            template_id,
+            redact_personalisation,
+            updated_at,
+            updated_by_id
+        )
+        SELECT
+            templates.id,
+            false,
+            now(),
+            '{notify_user}'
+        FROM
+            templates
+        LEFT JOIN template_redacted on template_redacted.template_id = templates.id
+        WHERE template_redacted.template_id IS NULL
+        """.format(notify_user=current_app.config['NOTIFY_USER_ID'])
+    )
+
+
+def downgrade():
+    pass

tests/app/celery/test_scheduled_tasks.py

@@ -642,7 +642,7 @@ def test_alert_if_letter_notifications_still_sending(sample_letter_template, moc
     raise_alert_if_letter_notifications_still_sending()
 
     mock_celery.assert_called_once_with(
-        subject="Letters still sending",
+        subject="[test] Letters still sending",
         message="There are 1 letters in the 'sending' state from Tuesday 16 January",
         ticket_type='alert'
     )
@@ -660,7 +660,7 @@ def test_alert_if_letter_notifications_still_sending_only_alerts_sending(sample_
     raise_alert_if_letter_notifications_still_sending()
 
     mock_celery.assert_called_once_with(
-        subject="Letters still sending",
+        subject="[test] Letters still sending",
         message="There are 1 letters in the 'sending' state from Tuesday 16 January",
         ticket_type='alert'
     )
@@ -703,7 +703,7 @@ def test_monday_alert_if_letter_notifications_still_sending_reports_friday_lette
     raise_alert_if_letter_notifications_still_sending()
 
     mock_celery.assert_called_once_with(
-        subject="Letters still sending",
+        subject="[test] Letters still sending",
         message="There are 2 letters in the 'sending' state from Friday 12 January",
         ticket_type='alert'
     )