Add notification status for returned letters

We need to update letter notifications with a new status when DVLA
gives us a list of references for returned letters.

This adds the new status to the models and the DB.

DVLA call this 'returned mail', so I'm using it as the status name
since it seems less ambiguous than 'returned'.
This commit is contained in:
Alexey Bezhan
2018-08-21 16:45:10 +01:00
parent db64423ca8
commit 0dcf04def9
5 changed files with 42 additions and 4 deletions

View File

@@ -1050,12 +1050,14 @@ NOTIFICATION_TEMPORARY_FAILURE = 'temporary-failure'
NOTIFICATION_PERMANENT_FAILURE = 'permanent-failure'
NOTIFICATION_PENDING_VIRUS_CHECK = 'pending-virus-check'
NOTIFICATION_VIRUS_SCAN_FAILED = 'virus-scan-failed'
NOTIFICATION_RETURNED_LETTER = 'returned-letter'
NOTIFICATION_STATUS_TYPES_FAILED = [
NOTIFICATION_TECHNICAL_FAILURE,
NOTIFICATION_TEMPORARY_FAILURE,
NOTIFICATION_PERMANENT_FAILURE,
NOTIFICATION_VIRUS_SCAN_FAILED,
NOTIFICATION_RETURNED_LETTER,
]
NOTIFICATION_STATUS_TYPES_COMPLETED = [
@@ -1065,6 +1067,7 @@ NOTIFICATION_STATUS_TYPES_COMPLETED = [
NOTIFICATION_TECHNICAL_FAILURE,
NOTIFICATION_TEMPORARY_FAILURE,
NOTIFICATION_PERMANENT_FAILURE,
NOTIFICATION_RETURNED_LETTER,
]
NOTIFICATION_STATUS_SUCCESS = [
@@ -1079,6 +1082,7 @@ NOTIFICATION_STATUS_TYPES_BILLABLE = [
NOTIFICATION_FAILED,
NOTIFICATION_TEMPORARY_FAILURE,
NOTIFICATION_PERMANENT_FAILURE,
NOTIFICATION_RETURNED_LETTER,
]
NOTIFICATION_STATUS_TYPES = [
@@ -1094,6 +1098,7 @@ NOTIFICATION_STATUS_TYPES = [
NOTIFICATION_PERMANENT_FAILURE,
NOTIFICATION_PENDING_VIRUS_CHECK,
NOTIFICATION_VIRUS_SCAN_FAILED,
NOTIFICATION_RETURNED_LETTER,
]
NOTIFICATION_STATUS_TYPES_NON_BILLABLE = list(set(NOTIFICATION_STATUS_TYPES) - set(NOTIFICATION_STATUS_TYPES_BILLABLE))
@@ -1286,7 +1291,8 @@ class Notification(db.Model):
'technical-failure': 'Technical failure',
'sending': 'Accepted',
'created': 'Accepted',
'delivered': 'Received'
'delivered': 'Received',
'returned-letter': 'Returned',
}
}[self.template.template_type].get(self.status, self.status)