darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 10:28:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix test data and how we parse the JSON

Browse Source
This commit is contained in:
Imdad Ahad
2017-05-19 10:16:48 +01:00
parent e2b5bb613b
commit 0e0c18583f
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/notifications/notifications_letter_callback.py
+4 -1
View File
@@ -1,3 +1,5 @@
import json
from functools import wraps from functools import wraps
from flask import ( from flask import (
@@ -48,7 +50,8 @@ def process_letter_response():
current_app.logger.info('Received SNS callback: {}'.format(req_json)) current_app.logger.info('Received SNS callback: {}'.format(req_json))
if not autoconfirm_subscription(req_json): if not autoconfirm_subscription(req_json):
# The callback should have one record for an S3 Put Event. # The callback should have one record for an S3 Put Event.
filename = req_json['Message']['Records'][0]['s3']['object']['key'] message = json.loads(req_json['Message'])
filename = message['Records'][0]['s3']['object']['key']
current_app.logger.info('Received file from DVLA: {}'.format(filename)) current_app.logger.info('Received file from DVLA: {}'.format(filename))
current_app.logger.info('DVLA callback: Calling task to update letter notifications') current_app.logger.info('DVLA callback: Calling task to update letter notifications')
update_letter_notifications_statuses.apply_async([filename], queue='notify') update_letter_notifications_statuses.apply_async([filename], queue='notify')
tests/app/notifications/rest/test_callbacks.py
+1 -29
View File
@@ -531,33 +531,5 @@ def _sample_sns_s3_callback():
"MessageId": "6adbfe0a-d610-509a-9c47-af894e90d32d", "MessageId": "6adbfe0a-d610-509a-9c47-af894e90d32d",
"Subject": "Amazon S3 Notification", "Subject": "Amazon S3 Notification",
"TopicArn": "sample-topic-arn", "TopicArn": "sample-topic-arn",
"Message": { "Message": '{"Records":[{"eventVersion":"2.0","eventSource":"aws:s3","awsRegion":"eu-west-1","eventTime":"2017-05-16T11:38:41.073Z","eventName":"ObjectCreated:Put","userIdentity":{"principalId":"some-p-id"},"requestParameters":{"sourceIPAddress":"8.8.8.8"},"responseElements":{"x-amz-request-id":"some-r-id","x-amz-id-2":"some-x-am-id"},"s3":{"s3SchemaVersion":"1.0","configurationId":"some-c-id","bucket":{"name":"some-bucket","ownerIdentity":{"principalId":"some-p-id"},"arn":"some-bucket-arn"},"object":{"key":"bar.txt","size":200,"eTag":"some-e-tag","versionId":"some-v-id","sequencer":"some-seq"}}}]}' # noqa
"Records": [{
"eventVersion": "2.0",
"eventSource": "aws:s3",
"awsRegion": "eu-west-1",
"eventTime": "2017-05-03T08:35:12.826Z",
"eventName": "ObjectCreated:Put",
"userIdentity": {"principalId": "some-p-id"},
"requestParameters": {"sourceIPAddress": "8.8.8.8"},
"responseElements": {"x-amz-request-id": "some-req-id", "x-amz-id-2": "some-amz-id"},
"s3": {
"s3SchemaVersion": "1.0",
"configurationId": "some-config-id",
"bucket": {
"name": "some-bucket",
"ownerIdentity": {"principalId": "some-p-id"},
"arn": "some-bucket-arn"
},
"object": {
"key": "bar.txt",
"size": 200,
"eTag": "some-etag",
"versionId": "some-v-id",
"sequencer": "some-seq"
}
}
}
]
}
}) })