Merge pull request #2293 from alphagov/choose_postage_for_precompiled

Choose postage on POST request for precompiled letters

app/celery/tasks.py

@@ -307,6 +307,7 @@ def save_letter(
         saved_notification = persist_notification(
             template_id=notification['template'],
             template_version=notification['template_version'],
+            template_postage=template.postage,
             recipient=recipient,
             service=service,
             personalisation=notification['personalisation'],

app/notifications/process_letter_notifications.py

@@ -7,6 +7,7 @@ def create_letter_notification(letter_data, template, api_key, status, reply_to_
     notification = persist_notification(
         template_id=template.id,
         template_version=template.version,
+        template_postage=template.postage,
         # we only accept addresses_with_underscores from the API (from CSV we also accept dashes, spaces etc)
         recipient=letter_data['personalisation']['address_line_1'],
         service=template.service,
@@ -20,6 +21,7 @@ def create_letter_notification(letter_data, template, api_key, status, reply_to_
         client_reference=letter_data.get('reference'),
         status=status,
         reply_to_text=reply_to_text,
-        billable_units=billable_units
+        billable_units=billable_units,
+        postage=letter_data.get('postage')
     )
     return notification

app/notifications/process_notifications.py

@@ -32,8 +32,6 @@ from app.dao.notifications_dao import (
     dao_created_scheduled_notification
 )
 
-from app.dao.templates_dao import dao_get_template_by_id
-
 from app.v2.errors import BadRequestError
 from app.utils import (
     cache_key_for_service_template_counter,
@@ -75,7 +73,9 @@ def persist_notification(
     created_by_id=None,
     status=NOTIFICATION_CREATED,
     reply_to_text=None,
-    billable_units=None
+    billable_units=None,
+    postage=None,
+    template_postage=None
 ):
     notification_created_at = created_at or datetime.utcnow()
     if not notification_id:
@@ -112,11 +112,13 @@ def persist_notification(
     elif notification_type == EMAIL_TYPE:
         notification.normalised_to = format_email_address(notification.to)
     elif notification_type == LETTER_TYPE:
-        template = dao_get_template_by_id(template_id, template_version)
-        if service.has_permission(CHOOSE_POSTAGE) and template.postage:
-            notification.postage = template.postage
+        if postage:
+            notification.postage = postage
         else:
-            notification.postage = service.postage
+            if service.has_permission(CHOOSE_POSTAGE) and template_postage:
+                notification.postage = template_postage
+            else:
+                notification.postage = service.postage
 
     # if simulated create a Notification model to return but do not persist the Notification to the dB
     if not simulated:

app/notifications/rest.py

@@ -124,6 +124,7 @@ def send_notification(notification_type):
     simulated = simulated_recipient(notification_form['to'], notification_type)
     notification_model = persist_notification(template_id=template.id,
                                               template_version=template.version,
+                                              template_postage=template.postage,
                                               recipient=request.get_json()['to'],
                                               service=authenticated_service,
                                               personalisation=notification_form.get('personalisation', None),

app/schema_validation/__init__.py

@@ -8,41 +8,54 @@ from notifications_utils.recipients import (validate_phone_number, validate_emai
                                             InvalidEmailError)
 
 
+format_checker = FormatChecker()
+
+
+@format_checker.checks("validate_uuid", raises=Exception)
+def validate_uuid(instance):
+    if isinstance(instance, str):
+        UUID(instance)
+    return True
+
+
+@format_checker.checks('phone_number', raises=InvalidPhoneError)
+def validate_schema_phone_number(instance):
+    if isinstance(instance, str):
+        validate_phone_number(instance, international=True)
+    return True
+
+
+@format_checker.checks('email_address', raises=InvalidEmailError)
+def validate_schema_email_address(instance):
+    if isinstance(instance, str):
+        validate_email_address(instance)
+    return True
+
+
+@format_checker.checks('postage', raises=ValidationError)
+def validate_schema_postage(instance):
+    if isinstance(instance, str):
+        if instance not in ["first", "second"]:
+            raise ValidationError("invalid. It must be either first or second.")
+    return True
+
+
+@format_checker.checks('datetime_within_next_day', raises=ValidationError)
+def validate_schema_date_with_hour(instance):
+    if isinstance(instance, str):
+        try:
+            dt = iso8601.parse_date(instance).replace(tzinfo=None)
+            if dt < datetime.utcnow():
+                raise ValidationError("datetime can not be in the past")
+            if dt > datetime.utcnow() + timedelta(hours=24):
+                raise ValidationError("datetime can only be 24 hours in the future")
+        except ParseError:
+            raise ValidationError("datetime format is invalid. It must be a valid ISO8601 date time format, "
+                                  "https://en.wikipedia.org/wiki/ISO_8601")
+    return True
+
+
 def validate(json_to_validate, schema):
-    format_checker = FormatChecker()
-
-    @format_checker.checks("validate_uuid", raises=Exception)
-    def validate_uuid(instance):
-        if isinstance(instance, str):
-            UUID(instance)
-        return True
-
-    @format_checker.checks('phone_number', raises=InvalidPhoneError)
-    def validate_schema_phone_number(instance):
-        if isinstance(instance, str):
-            validate_phone_number(instance, international=True)
-        return True
-
-    @format_checker.checks('email_address', raises=InvalidEmailError)
-    def validate_schema_email_address(instance):
-        if isinstance(instance, str):
-            validate_email_address(instance)
-        return True
-
-    @format_checker.checks('datetime_within_next_day', raises=ValidationError)
-    def validate_schema_date_with_hour(instance):
-        if isinstance(instance, str):
-            try:
-                dt = iso8601.parse_date(instance).replace(tzinfo=None)
-                if dt < datetime.utcnow():
-                    raise ValidationError("datetime can not be in the past")
-                if dt > datetime.utcnow() + timedelta(hours=24):
-                    raise ValidationError("datetime can only be 24 hours in the future")
-            except ParseError:
-                raise ValidationError("datetime format is invalid. It must be a valid ISO8601 date time format, "
-                                      "https://en.wikipedia.org/wiki/ISO_8601")
-        return True
-
     validator = Draft7Validator(schema, format_checker=format_checker)
     errors = list(validator.iter_errors(json_to_validate))
     if errors.__len__() > 0:

app/service/send_notification.py

@@ -77,6 +77,7 @@ def send_one_off_notification(service_id, post_data):
     notification = persist_notification(
         template_id=template.id,
         template_version=template.version,
+        template_postage=template.postage,
         recipient=post_data['to'],
         service=service,
         personalisation=personalisation,

app/v2/notifications/notification_schemas.py

@@ -239,7 +239,8 @@ post_precompiled_letter_request = {
     "title": "POST v2/notifications/letter",
     "properties": {
         "reference": {"type": "string"},
-        "content": {"type": "string"}
+        "content": {"type": "string"},
+        "postage": {"type": "string", "format": "postage"}
     },
     "required": ["reference", "content"],
     "additionalProperties": False