From 204f170de2d689e50f066461f990a287e23cf6c1 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Wed, 25 Oct 2017 15:39:54 +0100
Subject: [PATCH] Use NOTIFICATION_TECHNICAL_FAILURE not NOTIFICATION_FAILED

---
 app/celery/tasks.py                       | 6 +++---
 tests/app/celery/test_ftp_update_tasks.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/celery/tasks.py b/app/celery/tasks.py
index 52a5741f3..a042d7f0a 100644
--- a/app/celery/tasks.py
+++ b/app/celery/tasks.py
@@ -47,7 +47,7 @@ from app.dao.templates_dao import dao_get_template_by_id
 from app.models import (
     Job,
     Notification,
-    DVLA_STATUS_SENT,
+    DVLA_RESPONSE_STATUS_SENT,
     EMAIL_TYPE,
     JOB_STATUS_CANCELLED,
     JOB_STATUS_FINISHED,
@@ -58,7 +58,6 @@ from app.models import (
     KEY_TYPE_NORMAL,
     LETTER_TYPE,
     NOTIFICATION_DELIVERED,
-    NOTIFICATION_FAILED,
     NOTIFICATION_SENDING,
     NOTIFICATION_TECHNICAL_FAILURE,
     SMS_TYPE,
@@ -447,7 +446,8 @@ def update_letter_notifications_statuses(self, filename):
         raise
     else:
         for update in notification_updates:
-            status = NOTIFICATION_DELIVERED if update.status == DVLA_STATUS_SENT else NOTIFICATION_FAILED
+            status = NOTIFICATION_DELIVERED if update.status == DVLA_RESPONSE_STATUS_SENT \
+                else NOTIFICATION_TECHNICAL_FAILURE
             notification = update_notification_status_by_reference(
                 update.reference,
                 status
diff --git a/tests/app/celery/test_ftp_update_tasks.py b/tests/app/celery/test_ftp_update_tasks.py
index 639e18c9e..eef0c8c36 100644
--- a/tests/app/celery/test_ftp_update_tasks.py
+++ b/tests/app/celery/test_ftp_update_tasks.py
@@ -9,7 +9,7 @@ from app.models import (
     Notification,
     NOTIFICATION_CREATED,
     NOTIFICATION_DELIVERED,
-    NOTIFICATION_FAILED,
+    NOTIFICATION_TECHNICAL_FAILURE,
     NOTIFICATION_SENDING,
     NOTIFICATION_STATUS_LETTER_RECEIVED,
     NOTIFICATION_TECHNICAL_FAILURE
@@ -106,7 +106,7 @@ def test_update_letter_notifications_statuses_persisted(notify_api, mocker, samp
     update_letter_notifications_statuses(filename='foo.txt')
 
     assert sent_letter.status == NOTIFICATION_DELIVERED
-    assert failed_letter.status == NOTIFICATION_FAILED
+    assert failed_letter.status == NOTIFICATION_TECHNICAL_FAILURE
 
 
 def test_update_letter_notifications_to_sent_to_dvla_updates_based_on_notification_references(