Commit Graph

969 Commits

Author SHA1 Message Date
Martyn Inglis
a520dcef47 Fixed some more pep8 2016-05-13 17:22:03 +01:00
Martyn Inglis
829d862739 Fixed pep8 issues and hostname in the test environment. 2016-05-13 17:20:29 +01:00
Martyn Inglis
3f7559b286 Added statsd integration into the API
- new client for statsd, follows conventions used elsewhere for configuration
- client wraps underlying library so we can use a config property to send/not send statsd

Added statsd metrics for:
- count of API successful calls SMS/Email
- count of successful task execution for SMS/Email
- count of errors from Client libraries
- timing of API calls to third party clients
- timing of how long messages live on the SQS queue
2016-05-13 17:15:39 +01:00
Rebecca Law
894ec80e0e fix db migration to use the right previous version 2016-05-13 16:44:06 +01:00
Rebecca Law
faff5fff55 Merge branch 'master' into add-template-version 2016-05-13 16:32:57 +01:00
Rebecca Law
917110870d Use the template version at the time the notification is created or at the time the job is created.
Update notifications/sms|email endpoint to send the template version to the queue.
Update the process_job celery talk to send the template version to the queue.
When the send_sms|send_email task runs it will get the template by id and version.

Created a data migration script to add the template_vesion column for jobs and notifications.
The existing jobs and notifications are given the template_version of the current template.
There is a chance this is the wrong template version, but deemed okay since the application is not live.

Create unit test for the dao_get_template_versions method.
Rename /template/<id>/version to /template/<id>/versions which returns all versions for that template id and service id.
2016-05-13 16:25:05 +01:00
minglis
3c8e45093c Merge pull request #305 from alphagov/record-request-time
Log start of request so requests can be timed
2016-05-13 08:59:50 +01:00
Martyn Inglis
b12918d3ea Merge branch 'master' into record-request-time
Conflicts:
	requirements.txt
2016-05-12 16:39:20 +01:00
Martyn Inglis
9fb3569291 bumped request version 2016-05-12 16:37:01 +01:00
Chris Hill-Scott
3cf2e12d95 Merge pull request #302 from alphagov/govuk-email-footer
Make email template more GOV.UK-y
2016-05-12 16:34:23 +01:00
Martyn Inglis
19d65772c7 Log start of request so requests can be timed 2016-05-12 13:56:27 +01:00
minglis
d302b6f234 Merge pull request #304 from alphagov/loadtest-provider-3
Load testing client added
2016-05-12 11:00:08 +01:00
Martyn Inglis
06bfe81329 Load testing client added 2016-05-12 10:46:35 +01:00
Rebecca Law
c8c0f95dd2 Merge branch 'master' into add-template-version
Conflicts:
	tests/app/dao/test_notification_dao.py
2016-05-12 09:49:35 +01:00
Rebecca Law
cc9fcb42d9 Migration script to add template version to jobs and notifications. 2016-05-12 09:22:35 +01:00
Rebecca Law
f223da04df [WIP] Fix for dao test 2016-05-12 09:20:49 +01:00
Chris Hill-Scott
b2f15314cd Make email template more GOV.UK-y
Implements https://github.com/alphagov/notifications-utils/pull/30
2016-05-12 09:03:52 +01:00
Rebecca Law
f72f5aba05 [WIP]
Start to add template_version to jobs and notification
2016-05-11 17:04:51 +01:00
minglis
52c627c6f1 Merge pull request #295 from alphagov/primary-provider
Primary provider
2016-05-11 16:37:56 +01:00
Martyn Inglis
b22c52131d Fixing up a couple of pull request comments
- python style if
- renamed the relationships
2016-05-11 15:36:17 +01:00
Martyn Inglis
668f311a1a Merge branch 'primary-provider' of github.com:alphagov/notifications-api into primary-provider 2016-05-11 15:26:21 +01:00
Martyn Inglis
5c0dae9586 Added twilio into rebuilding the provider enum 2016-05-11 15:25:45 +01:00
Rebecca Law
5858861bb2 Remove constraints from downgrade so that it will work. 2016-05-11 14:15:53 +01:00
Martyn Inglis
09b3313ce3 Merge branch 'master' into primary-provider
Conflicts:
	tests/app/dao/test_provider_rates_dao.py
2016-05-11 14:04:15 +01:00
Martyn Inglis
42c42bfdc9 Added tests to ensure pick correct provider from the database in the celery tasks. 2016-05-11 14:03:12 +01:00
Martyn Inglis
6493e4db9c Made the downgrades work 2016-05-11 12:56:28 +01:00
Adam Shimali
ba874cfd43 Only trigger dependent build for master, staging and live 2016-05-11 12:39:39 +01:00
Rebecca Law
829922e61f Merge pull request #298 from alphagov/add-user-to-job
Add created_by for jobs
2016-05-11 12:18:29 +01:00
NIcholas Staples
35bc2e6843 Merge pull request #296 from alphagov/update_to_utcnow
Update now to utcnow. All tests passing.
2016-05-11 12:08:58 +01:00
Rebecca Law
eb9f47af68 Merge branch 'master' into add-user-to-job 2016-05-11 12:08:39 +01:00
Rebecca Law
aff0abb78c Add a load only and dump only for the created_by attribute of the JobSchema 2016-05-11 12:03:25 +01:00
Nicholas Staples
03f15d6af9 Update now to utcnow. All tests passing. 2016-05-11 10:56:24 +01:00
Martyn Inglis
b8a3e4a972 default priorities now in 10s not 1s 2016-05-11 09:37:50 +01:00
NIcholas Staples
1b82612ea3 Merge pull request #294 from alphagov/template_schema_response_update
Add user details to template schema dump.
2016-05-10 15:47:32 +01:00
Martyn Inglis
9e71759e57 Added get provider by id 2016-05-10 15:18:41 +01:00
Nicholas Staples
083d3d75ae Add user details to template schema dump. 2016-05-10 14:55:59 +01:00
Adam Shimali
8f8245885e Pass branch name to dependent build 2016-05-10 14:15:38 +01:00
Adam Shimali
fc1345acdf Trigger dependent build for preview 2016-05-10 12:39:35 +01:00
Martyn Inglis
8669a169eb Merge branch 'master' into primary-provider
Conflicts:
	app/dao/notifications_dao.py
	app/dao/provider_statistics_dao.py
	app/schemas.py
	tests/app/conftest.py
2016-05-10 09:13:02 +01:00
Martyn Inglis
571686b638 Ensure that the primary provider is used in all tasks 2016-05-10 09:04:22 +01:00
NIcholas Staples
b8017dcf02 Merge pull request #290 from alphagov/template_versions_api
Get all versions for a template endpoint added.
2016-05-09 16:05:20 +01:00
Nicholas Staples
b28474d74c Get all versions for a template endpoint added. 2016-05-09 15:59:34 +01:00
NIcholas Staples
f06aaa924e Merge pull request #287 from alphagov/statistics_group_by_week_backup
Group by Notification Statistics added and all tests working.
2016-05-09 10:17:37 +01:00
NIcholas Staples
448d1058b8 Merge pull request #288 from alphagov/purge_functional_test_data
Purge functional tests command added with passing test.
2016-05-09 10:17:25 +01:00
NIcholas Staples
7213ea55fa Merge pull request #289 from alphagov/template_history
Template history endpoint added. All tests passing.
2016-05-09 10:17:14 +01:00
Nicholas Staples
9b3d4a6087 Template history endpoint added. All tests passing.
Code quality fix.
2016-05-06 15:47:13 +01:00
Nicholas Staples
d40d9f76d4 Purge functional tests command added with passing test.
Code quality fix.
2016-05-06 11:16:30 +01:00
Martyn Inglis
4f38039e09 Set up clients wrapper to hold all the clients
- tests FAIL if there is a provider in the DB and not in the CODE
- tests PASS is there a provider in the CODE and not in the DB
2016-05-06 09:47:06 +01:00
Martyn Inglis
57e05feafb Updated the Provider stats and rates DAO objects to query based on the identifier in the ProviderDetails object.
- updated all tests
- changed teardown to leave provider details rows on end of individual tests
2016-05-06 09:09:47 +01:00
Nicholas Staples
f465066a69 Group by Notification Statistics added and all tests working.
Fixed tests for upgraded client.
2016-05-05 11:04:20 +01:00