Merge pull request #2643 from alphagov/set-postage

Set postage

app/service/rest.py

@@ -93,6 +93,7 @@ from app.models import (
 from app.notifications.process_notifications import persist_notification, send_notification_to_queue
 from app.schema_validation import validate
 from app.service import statistics
+from app.service.send_pdf_letter_schema import send_pdf_letter_request
 from app.service.service_data_retention_schema import (
     add_service_data_retention_request,
     update_service_data_retention_request
@@ -650,7 +651,8 @@ def create_one_off_notification(service_id):
 
 @service_blueprint.route('/<uuid:service_id>/send-pdf-letter', methods=['POST'])
 def create_pdf_letter(service_id):
-    resp = send_pdf_letter_notification(service_id, request.get_json())
+    data = validate(request.get_json(), send_pdf_letter_request)
+    resp = send_pdf_letter_notification(service_id, data)
     return jsonify(resp), 201
 
 

app/service/send_notification.py

@@ -167,7 +167,6 @@ def send_pdf_letter_notification(service_id, post_data):
         'address_line_1': post_data['filename']
     }
 
-    # TODO: stop hard-coding postage as 'second' once we get postage from the admin
     notification = persist_notification(
         notification_id=post_data['file_id'],
         template_id=template.id,
@@ -183,7 +182,7 @@ def send_pdf_letter_notification(service_id, post_data):
         client_reference=post_data['filename'],
         created_by_id=post_data['created_by'],
         billable_units=billable_units,
-        postage='second',
+        postage=post_data['postage'],
     )
 
     upload_filename = get_letter_pdf_filename(

app/service/send_pdf_letter_schema.py

@@ -0,0 +1,13 @@
+send_pdf_letter_request = {
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "POST send uploaded pdf letter",
+    "type": "object",
+    "title": "Send an uploaded pdf letter",
+    "properties": {
+        "postage": {"type": "string", "format": "postage"},
+        "filename": {"type": "string"},
+        "created_by": {"type": "string"},
+        "file_id": {"type": "string"},
+    },
+    "required": ["postage", "filename", "created_by", "file_id"]
+}